[BOOTDATA-CMAKE]
authorHermès Bélusca-Maïto <hermes.belusca-maito@reactos.org>
Tue, 9 Oct 2012 22:00:47 +0000 (22:00 +0000)
committerHermès Bélusca-Maïto <hermes.belusca-maito@reactos.org>
Tue, 9 Oct 2012 22:00:47 +0000 (22:00 +0000)
Add a bin\data directory for holding data files which can be used for tests.

svn path=/trunk/; revision=57526

reactos/boot/bootdata/hivesys_amd64.inf
reactos/boot/bootdata/hivesys_arm.inf
reactos/boot/bootdata/hivesys_i386.inf
reactos/boot/bootdata/packages/reactos.dff.in
reactos/cmake/CMakeMacros.cmake

index f7acfc7..7e6d9da 100644 (file)
@@ -1200,7 +1200,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","UNC",0x0000
 
 ; System environment settings
 HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","ComSpec",0x00020000,"%SystemRoot%\system32\cmd.exe"
-HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","Path",0x00020000,"%SystemRoot%\bin;%SystemRoot%\system32;%SystemRoot%;%SystemRoot%\system32\wbem"
+HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","Path",0x00020000,"%SystemRoot%\bin;%SystemRoot%\bin\data;%SystemRoot%\system32;%SystemRoot%;%SystemRoot%\system32\wbem"
 HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","windir",0x00020000,"%SystemRoot%"
 HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","TEMP",0x00020000,"%SystemDrive%\TEMP"
 HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","TMP",0x00020000,"%SystemDrive%\TEMP"
index db99899..5ba1aff 100644 (file)
@@ -755,7 +755,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","UNC",0x0000
 
 ; System environment settings
 HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","ComSpec",0x00020000,"%SystemRoot%\system32\cmd.exe"
-HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","Path",0x00020000,"%SystemRoot%\bin;%SystemRoot%\system32;%SystemRoot%;%SystemRoot%\system32\wbem"
+HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","Path",0x00020000,"%SystemRoot%\bin;%SystemRoot%\bin\data;%SystemRoot%\system32;%SystemRoot%;%SystemRoot%\system32\wbem"
 HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","windir",0x00020000,"%SystemRoot%"
 HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","TEMP",0x00020000,"%SystemDrive%\TEMP"
 HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","TMP",0x00020000,"%SystemDrive%\TEMP"
index f7acfc7..7e6d9da 100644 (file)
@@ -1200,7 +1200,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","UNC",0x0000
 
 ; System environment settings
 HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","ComSpec",0x00020000,"%SystemRoot%\system32\cmd.exe"
-HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","Path",0x00020000,"%SystemRoot%\bin;%SystemRoot%\system32;%SystemRoot%;%SystemRoot%\system32\wbem"
+HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","Path",0x00020000,"%SystemRoot%\bin;%SystemRoot%\bin\data;%SystemRoot%\system32;%SystemRoot%;%SystemRoot%\system32\wbem"
 HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","windir",0x00020000,"%SystemRoot%"
 HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","TEMP",0x00020000,"%SystemDrive%\TEMP"
 HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\Environment","TMP",0x00020000,"%SystemDrive%\TEMP"
index 67845e3..37e7b12 100644 (file)
@@ -21,12 +21,13 @@ Signature = "$ReactOS$"
 5 = system32\drivers\etc
 6 = inf
 7 = bin
-8 = media
-9 = Microsoft.NET
-10 = Microsoft.NET\Framework
-11 = Microsoft.NET\Framework\v1.0.3705
-12 = Microsoft.NET\Framework\v1.1.4322
-13 = Microsoft.NET\Framework\v2.0.50727
+8 = bin\data
+9 = media
+10 = Microsoft.NET
+11 = Microsoft.NET\Framework
+12 = Microsoft.NET\Framework\v1.0.3705
+13 = Microsoft.NET\Framework\v1.1.4322
+14 = Microsoft.NET\Framework\v2.0.50727
 
 .InfEnd
 
@@ -59,4 +60,4 @@ modules\optional\vmx_svga.sys                       2  optional
 modules\optional\wine_gecko-1.0.0-x86.cab           4  optional
 boot\bootdata\bootcdregtest\AHKAppTests.cmd         7  optional
 
-modules\wallpaper\Angelus_02_ROSWP.bmp                                     4   optional
+modules\wallpaper\Angelus_02_ROSWP.bmp              4   optional
index 9315a36..34aeebd 100644 (file)
@@ -97,18 +97,20 @@ macro(dir_to_num dir var)
         set(${var} 6)
     elseif(${dir} STREQUAL reactos/bin)
         set(${var} 7)
-    elseif(${dir} STREQUAL reactos/media)
+    elseif(${dir} STREQUAL reactos/bin/data)
         set(${var} 8)
-    elseif(${dir} STREQUAL reactos/Microsoft.NET)
+    elseif(${dir} STREQUAL reactos/media)
         set(${var} 9)
-    elseif(${dir} STREQUAL reactos/Microsoft.NET/Framework)
+    elseif(${dir} STREQUAL reactos/Microsoft.NET)
         set(${var} 10)
-    elseif(${dir} STREQUAL reactos/Microsoft.NET/Framework/v1.0.3705)
+    elseif(${dir} STREQUAL reactos/Microsoft.NET/Framework)
         set(${var} 11)
-    elseif(${dir} STREQUAL reactos/Microsoft.NET/Framework/v1.1.4322)
+    elseif(${dir} STREQUAL reactos/Microsoft.NET/Framework/v1.0.3705)
         set(${var} 12)
-    elseif(${dir} STREQUAL reactos/Microsoft.NET/Framework/v2.0.50727)
+    elseif(${dir} STREQUAL reactos/Microsoft.NET/Framework/v1.1.4322)
         set(${var} 13)
+    elseif(${dir} STREQUAL reactos/Microsoft.NET/Framework/v2.0.50727)
+        set(${var} 14)
     else()
         message(ERROR "Wrong destination: ${dir}")
     endif()