[SETUPLIB] Move the files that implement utility functions into their own subdirector...
authorHermès Bélusca-Maïto <hermes.belusca-maito@reactos.org>
Mon, 28 Aug 2017 11:28:08 +0000 (11:28 +0000)
committerHermès Bélusca-Maïto <hermes.belusca-maito@reactos.org>
Sat, 27 Oct 2018 20:09:34 +0000 (22:09 +0200)
svn path=/branches/setup_improvements/; revision=75695

28 files changed:
base/setup/lib/CMakeLists.txt
base/setup/lib/precomp.h
base/setup/lib/setuplib.h
base/setup/lib/utils/arcname.c [moved from base/setup/lib/arcname.c with 100% similarity]
base/setup/lib/utils/arcname.h [moved from base/setup/lib/arcname.h with 100% similarity]
base/setup/lib/utils/arcname_tests.c [moved from base/setup/lib/arcname_tests.c with 100% similarity]
base/setup/lib/utils/bldrsup.c [moved from base/setup/lib/bldrsup.c with 100% similarity]
base/setup/lib/utils/bldrsup.h [moved from base/setup/lib/bldrsup.h with 100% similarity]
base/setup/lib/utils/filesup.c [moved from base/setup/lib/filesup.c with 100% similarity]
base/setup/lib/utils/filesup.h [moved from base/setup/lib/filesup.h with 100% similarity]
base/setup/lib/utils/genlist.c [moved from base/setup/lib/genlist.c with 100% similarity]
base/setup/lib/utils/genlist.h [moved from base/setup/lib/genlist.h with 100% similarity]
base/setup/lib/utils/infsupp.c [moved from base/setup/lib/infsupp.c with 100% similarity]
base/setup/lib/utils/infsupp.h [moved from base/setup/lib/infsupp.h with 100% similarity]
base/setup/lib/utils/inicache.c [moved from base/setup/lib/inicache.c with 100% similarity]
base/setup/lib/utils/inicache.h [moved from base/setup/lib/inicache.h with 100% similarity]
base/setup/lib/utils/linklist.h [moved from base/setup/lib/linklist.h with 100% similarity]
base/setup/lib/utils/ntverrsrc.c [moved from base/setup/lib/ntverrsrc.c with 100% similarity]
base/setup/lib/utils/ntverrsrc.h [moved from base/setup/lib/ntverrsrc.h with 100% similarity]
base/setup/lib/utils/osdetect.c [moved from base/setup/lib/osdetect.c with 100% similarity]
base/setup/lib/utils/osdetect.h [moved from base/setup/lib/osdetect.h with 100% similarity]
base/setup/lib/utils/partlist.c [moved from base/setup/lib/partlist.c with 100% similarity]
base/setup/lib/utils/partlist.h [moved from base/setup/lib/partlist.h with 100% similarity]
base/setup/lib/utils/regutil.c [moved from base/setup/lib/regutil.c with 100% similarity]
base/setup/lib/utils/regutil.h [moved from base/setup/lib/regutil.h with 100% similarity]
base/setup/usetup/genlist.h
base/setup/usetup/inffile.h
base/setup/usetup/partlist.h

index a1b9a90..30b53ff 100644 (file)
@@ -1,18 +1,20 @@
 
+include_directories(utils)
+
 list(APPEND SOURCE
-    arcname.c
-    bldrsup.c
+    utils/arcname.c
+    utils/bldrsup.c
+    utils/filesup.c
+    utils/genlist.c
+    utils/infsupp.c
+    utils/inicache.c
+    utils/ntverrsrc.c
+    utils/osdetect.c
+    utils/partlist.c
+    utils/regutil.c
     bootsup.c
-    filesup.c
     fsutil.c
-    genlist.c
-    infsupp.c
-    inicache.c
-    ntverrsrc.c
-    osdetect.c
-    partlist.c
     registry.c
-    regutil.c
     setuplib.c
     precomp.h)
 
index 0ce5c12..f347044 100644 (file)
@@ -55,4 +55,4 @@
 extern HANDLE ProcessHeap;
 
 #include "errorcode.h"
-#include "linklist.h"
+#include "utils/linklist.h"
index 2d30fd0..4a0f623 100644 (file)
 extern HANDLE ProcessHeap;
 
 #include "errorcode.h"
-#include "linklist.h"
-#include "ntverrsrc.h"
-// #include "arcname.h"
-#include "bldrsup.h"
+#include "utils/linklist.h"
+#include "utils/ntverrsrc.h"
+// #include "utils/arcname.h"
+#include "utils/bldrsup.h"
 #include "bootsup.h"
-#include "filesup.h"
+#include "utils/filesup.h"
 #include "fsutil.h"
-#include "genlist.h"
-#include "infsupp.h"
-#include "inicache.h"
-#include "partlist.h"
-#include "arcname.h"
-#include "osdetect.h"
-#include "regutil.h"
+#include "utils/genlist.h"
+#include "utils/infsupp.h"
+#include "utils/inicache.h"
+#include "utils/partlist.h"
+#include "utils/arcname.h"
+#include "utils/osdetect.h"
+#include "utils/regutil.h"
 #include "registry.h"
 
 
index f6cdde3..0799a63 100644 (file)
@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include "../lib/genlist.h"
+// #include "../lib/utils/genlist.h"
 
 typedef struct _GENERIC_LIST_UI
 {
index 90fb5e7..9d33563 100644 (file)
@@ -43,7 +43,7 @@ extern VOID InfSetHeap(PVOID Heap);
 
 #endif /* __REACTOS__ */
 
-#include <../lib/infsupp.h>
+// #include "../lib/utils/infsupp.h"
 
 
 /* HELPER FUNCTIONS **********************************************************/
index ebb3816..c07b993 100644 (file)
@@ -25,7 +25,7 @@
 
 #pragma once
 
-#include "../lib/partlist.h"
+// #include "../lib/utils/partlist.h"
 
 typedef enum _FORMATMACHINESTATE
 {