[BOOTDATA]

Create additional install directories.
Patch by Lee Schroeder. Thank you for updating the directory list!
CORE-8365 #resolve

svn path=/trunk/; revision=63717

diff --git a/reactos/boot/bootdata/packages/reactos.dff.in b/reactos/boot/bootdata/packages/reactos.dff.in
index a924400..5a7ff48 100644 (file)
--- a/reactos/boot/bootdata/packages/reactos.dff.in
+++ b/reactos/boot/bootdata/packages/reactos.dff.in
@@ -44,16 +44,28 @@ Signature = "$ReactOS$"
 28 = system32\spool\drivers\w32x86\3
 29 = system32\spool\prtprocs
 30 = system32\spool\prtprocs\w32x86
 28 = system32\spool\drivers\w32x86\3
 29 = system32\spool\prtprocs
 30 = system32\spool\prtprocs\w32x86

-31 = system32\wbem\Repository
-32 = system32\wbem\Repository\FS
-33 = system32\wbem\mof\good
-34 = system32\wbem\mof\bad
-35 = system32\wbem\AdStatus
-36 = system32\wbem\xml
-37 = system32\wbem\Logs
-38 = system32\wbem\AutoRecover
-39 = twain_32
-40 = repair
+31 = system32\spool\PRINTERS
+32 = system32\wbem\Repository
+33 = system32\wbem\Repository\FS
+34 = system32\wbem\mof\good
+35 = system32\wbem\mof\bad
+36 = system32\wbem\AdStatus
+37 = system32\wbem\xml
+38 = system32\wbem\Logs
+39 = system32\wbem\AutoRecover
+40 = system32\wbem\snmp
+41 = system32\wbem\Performance
+42 = twain_32
+43 = repair
+44 = Web
+45 = Web\Wallpaper
+46 = Prefetch
+47 = security
+48 = security\Database
+49 = security\logs
+50 = security\templates
+51 = system32\CatRoot
+52 = system32\CatRoot2

 
 .InfEnd
 
 
 .InfEnd
 

diff --git a/reactos/cmake/CMakeMacros.cmake b/reactos/cmake/CMakeMacros.cmake
index 0f34c22..54e918b 100644 (file)
--- a/reactos/cmake/CMakeMacros.cmake
+++ b/reactos/cmake/CMakeMacros.cmake
@@ -215,26 +215,50 @@ macro(dir_to_num dir var)
         set(${var} 29)
     elseif(${dir} STREQUAL reactos/system32/spool/prtprocs/w32x86)
         set(${var} 30)
         set(${var} 29)
     elseif(${dir} STREQUAL reactos/system32/spool/prtprocs/w32x86)
         set(${var} 30)

-    elseif(${dir} STREQUAL reactos/system32/wbem/Repository)
+    elseif(${dir} STREQUAL reactos/system32/spool/PRINTERS)

         set(${var} 31)
         set(${var} 31)

-    elseif(${dir} STREQUAL reactos/system32/wbem/Repository/FS)
+    elseif(${dir} STREQUAL reactos/system32/wbem/Repository)

         set(${var} 32)
         set(${var} 32)

-    elseif(${dir} STREQUAL reactos/system32/wbem/mof/good)
+    elseif(${dir} STREQUAL reactos/system32/wbem/Repository/FS)

         set(${var} 33)
         set(${var} 33)

-    elseif(${dir} STREQUAL reactos/system32/wbem/mof/bad)
+    elseif(${dir} STREQUAL reactos/system32/wbem/mof/good)

         set(${var} 34)
         set(${var} 34)

-    elseif(${dir} STREQUAL reactos/system32/wbem/AdStatus)
+    elseif(${dir} STREQUAL reactos/system32/wbem/mof/bad)

         set(${var} 35)
         set(${var} 35)

-    elseif(${dir} STREQUAL reactos/system32/wbem/xml)
+    elseif(${dir} STREQUAL reactos/system32/wbem/AdStatus)

         set(${var} 36)
         set(${var} 36)

-    elseif(${dir} STREQUAL reactos/system32/wbem/Logs)
+    elseif(${dir} STREQUAL reactos/system32/wbem/xml)

         set(${var} 37)
         set(${var} 37)

-    elseif(${dir} STREQUAL reactos/system32/wbem/AutoRecover)
+    elseif(${dir} STREQUAL reactos/system32/wbem/Logs)

         set(${var} 38)
         set(${var} 38)

-    elseif(${dir} STREQUAL reactos/twain_32)
+    elseif(${dir} STREQUAL reactos/system32/wbem/AutoRecover)

         set(${var} 39)
         set(${var} 39)

-    elseif(${dir} STREQUAL reactos/repair)
+    elseif(${dir} STREQUAL reactos/system32/wbem/snmp)

         set(${var} 40)
         set(${var} 40)

+    elseif(${dir} STREQUAL reactos/system32/wbem/Performance)
+        set(${var} 41)
+    elseif(${dir} STREQUAL reactos/twain_32)
+        set(${var} 42)
+    elseif(${dir} STREQUAL reactos/repair)
+        set(${var} 43)
+    elseif(${dir} STREQUAL reactos/Web)
+        set(${var} 44)
+    elseif(${dir} STREQUAL reactos/Web/Wallpaper)
+        set(${var} 45)
+    elseif(${dir} STREQUAL reactos/Prefetch)
+        set(${var} 46)
+    elseif(${dir} STREQUAL reactos/security)
+        set(${var} 47)
+    elseif(${dir} STREQUAL reactos/security/Database)
+        set(${var} 48)
+    elseif(${dir} STREQUAL reactos/security/logs)
+        set(${var} 49)
+    elseif(${dir} STREQUAL reactos/security/templates)
+        set(${var} 50)
+    elseif(${dir} STREQUAL reactos/system32/CatRoot)
+        set(${var} 51)
+    elseif(${dir} STREQUAL reactos/system32/CatRoot2)
+        set(${var} 52)

     else()
         message(FATAL_ERROR "Wrong destination: ${dir}")
     endif()
     else()
         message(FATAL_ERROR "Wrong destination: ${dir}")
     endif()