[ros-dev] [ros-diffs] [hbelusca] 57526: [BOOTDATA-CMAKE] Add a bin\data directory for holding data files which can be used for tests.

[Timo Kreuzer]

Why is it in the PATH variable?
Why not just put the test data in the bin folder?

Am 10.10.2012 00:00, schrieb hbelusca at svn.reactos.org:
> Author: hbelusca
> Date: Tue Oct  9 22:00:47 2012
> New Revision: 57526
>
> URL: http://svn.reactos.org/svn/reactos?rev=57526&view=rev
> Log:
> [BOOTDATA-CMAKE]
> Add a bin\data directory for holding data files which can be used for tests.
>
> Modified:
>      trunk/reactos/boot/bootdata/hivesys_amd64.inf
>      trunk/reactos/boot/bootdata/hivesys_arm.inf
>      trunk/reactos/boot/bootdata/hivesys_i386.inf
>      trunk/reactos/boot/bootdata/packages/reactos.dff.in
>      trunk/reactos/cmake/CMakeMacros.cmake
>
> Modified: trunk/reactos/boot/bootdata/hivesys_amd64.inf
> URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_amd64.inf?rev=57526&r1=57525&r2=57526&view=diff
> ==============================================================================
> --- trunk/reactos/boot/bootdata/hivesys_amd64.inf [iso-8859-1] (original)
> +++ trunk/reactos/boot/bootdata/hivesys_amd64.inf [iso-8859-1] Tue Oct  9 22:00:47 2012
> @@ -1200,7 +1200,7 @@
>   
>   ; 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"
>
> Modified: trunk/reactos/boot/bootdata/hivesys_arm.inf
> URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_arm.inf?rev=57526&r1=57525&r2=57526&view=diff
> ==============================================================================
> --- trunk/reactos/boot/bootdata/hivesys_arm.inf [iso-8859-1] (original)
> +++ trunk/reactos/boot/bootdata/hivesys_arm.inf [iso-8859-1] Tue Oct  9 22:00:47 2012
> @@ -755,7 +755,7 @@
>   
>   ; 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"
>
> Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf
> URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_i386.inf?rev=57526&r1=57525&r2=57526&view=diff
> ==============================================================================
> --- trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original)
> +++ trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] Tue Oct  9 22:00:47 2012
> @@ -1200,7 +1200,7 @@
>   
>   ; 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"
>
> Modified: trunk/reactos/boot/bootdata/packages/reactos.dff.in
> URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/reactos.dff.in?rev=57526&r1=57525&r2=57526&view=diff
> ==============================================================================
> --- trunk/reactos/boot/bootdata/packages/reactos.dff.in [iso-8859-1] (original)
> +++ trunk/reactos/boot/bootdata/packages/reactos.dff.in [iso-8859-1] Tue Oct  9 22:00:47 2012
> @@ -21,12 +21,13 @@
>   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\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
>
> Modified: trunk/reactos/cmake/CMakeMacros.cmake
> URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/CMakeMacros.cmake?rev=57526&r1=57525&r2=57526&view=diff
> ==============================================================================
> --- trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] (original)
> +++ trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] Tue Oct  9 22:00:47 2012
> @@ -97,18 +97,20 @@
>           set(${var} 6)
>       elseif(${dir} STREQUAL reactos/bin)
>           set(${var} 7)
> +    elseif(${dir} STREQUAL reactos/bin/data)
> +        set(${var} 8)
>       elseif(${dir} STREQUAL reactos/media)
> -        set(${var} 8)
> +        set(${var} 9)
>       elseif(${dir} STREQUAL reactos/Microsoft.NET)
> -        set(${var} 9)
> +        set(${var} 10)
>       elseif(${dir} STREQUAL reactos/Microsoft.NET/Framework)
> -        set(${var} 10)
> +        set(${var} 11)
>       elseif(${dir} STREQUAL reactos/Microsoft.NET/Framework/v1.0.3705)
> -        set(${var} 11)
> +        set(${var} 12)
>       elseif(${dir} STREQUAL reactos/Microsoft.NET/Framework/v1.1.4322)
> -        set(${var} 12)
> +        set(${var} 13)
>       elseif(${dir} STREQUAL reactos/Microsoft.NET/Framework/v2.0.50727)
> -        set(${var} 13)
> +        set(${var} 14)
>       else()
>           message(ERROR "Wrong destination: ${dir}")
>       endif()
>
>
>