[dreimer] 48612: - Remove the old ccache from the RosBE-Windows Tree. - First try to make every external config file version specific. This should make it possible to install several RosBE Versions...
Author: dreimer Date: Mon Aug 23 21:22:55 2010 New Revision: 48612
URL: http://svn.reactos.org/svn/reactos?rev=48612&view=rev Log: - Remove the old ccache from the RosBE-Windows Tree. - First try to make every external config file version specific. This should make it possible to install several RosBE Versions parallel from now on... (should)
Removed: trunk/tools/RosBE/RosBE-Windows/Tools/ccache-2.4/ Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/charch.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd trunk/tools/RosBE/RosBE-Windows/Root/options.cmd trunk/tools/RosBE/RosBE-Windows/RosBE-ARM.nsi trunk/tools/RosBE/RosBE-Windows/RosBE.nsi trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.c
Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershel... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 [iso-8859-1] Mon Aug 23 21:22:55 2010 @@ -8,8 +8,8 @@
$host.ui.RawUI.WindowTitle = "ReactOS Build Configurator"
-if (!(Test-Path "$ENV:APPDATA\RosBE\RBUILDFLAGS.FLG")) { - "-da" > "$ENV:APPDATA\RosBE\RBUILDFLAGS.FLG" +if (!(Test-Path "$ENV:APPDATA\RosBE\RBUILDFLAGS-$_ROSBE_VERSION.FLG")) { + "-da" > "$ENV:APPDATA\RosBE\RBUILDFLAGS-$_ROSBE_VERSION.FLG" }
function settitle { @@ -21,7 +21,7 @@ "Be verbose." "Default is: no" "" - $VERBOSE_B = (select-string -path "$ENV:APPDATA\RosBE\RBUILDFLAGS.FLG" -pattern "-v") + $VERBOSE_B = (select-string -path "$ENV:APPDATA\RosBE\RBUILDFLAGS-$_ROSBE_VERSION.FLG" -pattern "-v") if ("$VERBOSE_B" -eq "") { $VERBOSE_B = "no" } else { @@ -40,7 +40,7 @@ "Delete generated files as soon as they are not needed anymore." "Default is: no" "" - $CLEAN_B = (select-string -path "$ENV:APPDATA\RosBE\RBUILDFLAGS.FLG" -pattern "-c") + $CLEAN_B = (select-string -path "$ENV:APPDATA\RosBE\RBUILDFLAGS-$_ROSBE_VERSION.FLG" -pattern "-c") if ("$CLEAN_B" -eq "") { $CLEAN_B = "no" } else { @@ -59,8 +59,8 @@ "Disable/Enable automatic dependencies." "Default is: yes" "" - $DEPENDS_B = (select-string -path "$ENV:APPDATA\RosBE\RBUILDFLAGS.FLG" -pattern "-df") - $DEPENDS_B2 = (select-string -path "$ENV:APPDATA\RosBE\RBUILDFLAGS.FLG" -pattern "-dd") + $DEPENDS_B = (select-string -path "$ENV:APPDATA\RosBE\RBUILDFLAGS-$_ROSBE_VERSION.FLG" -pattern "-df") + $DEPENDS_B2 = (select-string -path "$ENV:APPDATA\RosBE\RBUILDFLAGS-$_ROSBE_VERSION.FLG" -pattern "-dd") if (!("$DEPENDS_B" -eq "")) { $DEPENDS_B = "full" } elseif (!("$DEPENDS_B2" -eq "")) { @@ -85,7 +85,7 @@ "Use precompiled headers." "Default is: yes" "" - $PRECHEADER_B = (select-string -path "$ENV:APPDATA\RosBE\RBUILDFLAGS.FLG" -pattern "-hd") + $PRECHEADER_B = (select-string -path "$ENV:APPDATA\RosBE\RBUILDFLAGS-$_ROSBE_VERSION.FLG" -pattern "-hd") if ("$PRECHEADER_B" -eq "") { $PRECHEADER_B = "yes" } else { @@ -105,7 +105,7 @@ "the directories." "Default is: no" "" - $MAKEDIR_B = (select-string -path "$ENV:APPDATA\RosBE\RBUILDFLAGS.FLG" -pattern "-mi") + $MAKEDIR_B = (select-string -path "$ENV:APPDATA\RosBE\RBUILDFLAGS-$_ROSBE_VERSION.FLG" -pattern "-mi") if ("$MAKEDIR_B" -eq "") { $MAKEDIR_B = "no" } else { @@ -124,7 +124,7 @@ "Generate proxy makefiles in source tree instead of the output tree." "Default is: no" "" - $PROXYMAKE_B = (select-string -path "$ENV:APPDATA\RosBE\RBUILDFLAGS.FLG" -pattern "-ps") + $PROXYMAKE_B = (select-string -path "$ENV:APPDATA\RosBE\RBUILDFLAGS-$_ROSBE_VERSION.FLG" -pattern "-ps") if ("$PROXYMAKE_B" -eq "") { $PROXYMAKE_B = "no" } else { @@ -143,7 +143,7 @@ "Use compilation units." "Default is: yes" "" - $COMPUNITS_B = (select-string -path "$ENV:APPDATA\RosBE\RBUILDFLAGS.FLG" -pattern "-ud") + $COMPUNITS_B = (select-string -path "$ENV:APPDATA\RosBE\RBUILDFLAGS-$_ROSBE_VERSION.FLG" -pattern "-ud") if ("$COMPUNITS_B" -eq "") { $COMPUNITS_B = "yes" } else { @@ -162,7 +162,7 @@ "Input XML." "Default is: no" "" - $XML_B = (select-string -path "$ENV:APPDATA\RosBE\RBUILDFLAGS.FLG" -pattern "-r") + $XML_B = (select-string -path "$ENV:APPDATA\RosBE\RBUILDFLAGS-$_ROSBE_VERSION.FLG" -pattern "-r") if ("$XML_B" -eq "") { $XML_B = "no" } else { @@ -177,7 +177,7 @@ $RBUILDFLAGS = "$RBUILDFLAGS" + " -r" } clear-host - "$RBUILDFLAGS" > "$ENV:APPDATA\RosBE\RBUILDFLAGS.FLG" + "$RBUILDFLAGS" > "$ENV:APPDATA\RosBE\RBUILDFLAGS-$_ROSBE_VERSION.FLG" $ENV:ROS_RBUILDFLAGS = $RBUILDFLAGS }
@@ -193,14 +193,14 @@ } else { "Main Configuration File was not found in ReactOS Source Tree." } - if (Test-Path "$ENV:APPDATA\RosBE\config.rbuild") { - remove-item "$ENV:APPDATA\RosBE\config.rbuild" + if (Test-Path "$ENV:APPDATA\RosBE\config-$_ROSBE_VERSION.rbuild") { + remove-item "$ENV:APPDATA\RosBE\config-$_ROSBE_VERSION.rbuild" "Working Configuration File was found and deleted." } else { "Working Configuration File was not found in ReactOS Source Tree." } - if (Test-Path "$ENV:APPDATA\RosBE\RBUILDFLAGS.FLG") { - remove-item "$ENV:APPDATA\RosBE\RBUILDFLAGS.FLG" + if (Test-Path "$ENV:APPDATA\RosBE\RBUILDFLAGS-$_ROSBE_VERSION.FLG") { + remove-item "$ENV:APPDATA\RosBE\RBUILDFLAGS-$_ROSBE_VERSION.FLG" $ENV:ROS_RBUILDFLAGS = "" "RBuild Flags File was found and deleted." } else { @@ -217,7 +217,7 @@ if (("$YESNO" -eq "yes") -or ("$YESNO" -eq "y")) { remove-item "$_ROSBE_BASEDIR*.rbuild" remove-item ".\config.rbuild" - copy-item ".\config.template.rbuild" "$ENV:APPDATA\RosBE\config.rbuild" + copy-item ".\config.template.rbuild" "$ENV:APPDATA\RosBE\config-$_ROSBE_VERSION.rbuild" "Successfully Updated." } settitle @@ -232,8 +232,8 @@ }
# Check if config.rbuild already exists. If not, get a working copy. -if (!(Test-Path "$ENV:APPDATA\RosBE\config.rbuild")) { - copy-item ".\config.template.rbuild" "$ENV:APPDATA\RosBE\config.rbuild" +if (!(Test-Path "$ENV:APPDATA\RosBE\config-$_ROSBE_VERSION.rbuild")) { + copy-item ".\config.template.rbuild" "$ENV:APPDATA\RosBE\config-$_ROSBE_VERSION.rbuild" }
# Help prevent non-useful bug reports/questions. @@ -258,13 +258,13 @@ "*** previously made settings. ***" "" $YESNO = Read-Host "(yes), (no)" - if (("$YESNO" -eq "yes") -or ("$YESNO" -eq "y")) {remove-item "$ENV:APPDATA\RosBE*.rbuild" | remove-item ".\config.rbuild" | copy-item ".\config.template.rbuild" "$ENV:APPDATA\RosBE\config.rbuild"} + if (("$YESNO" -eq "yes") -or ("$YESNO" -eq "y")) {remove-item "$ENV:APPDATA\RosBE\config-$_ROSBE_VERSION.rbuild" | remove-item ".\config.rbuild" | copy-item ".\config.template.rbuild" "$ENV:APPDATA\RosBE\config-$_ROSBE_VERSION.rbuild"} else {settitle} } }
# Prepare XML Parser. -[xml]$xml = get-content "$ENV:APPDATA\RosBE\config.rbuild" +[xml]$xml = get-content "$ENV:APPDATA\RosBE\config-$_ROSBE_VERSION.rbuild"
# Start with reading settings from config.rbuild and let the user edit them. "Sub-Architecture to build for." @@ -422,8 +422,8 @@ $xml.group.property | ? { $_.Name -eq "_WINKD_" } | % { $_.Value = "$WINKD_CH"} $xml.group.property | ? { $_.Name -eq "_ELF_" } | % { $_.Value = "$ELF_CH"} $xml.group.property | ? { $_.Name -eq "BUILD_MP" } | % { $_.Value = "$BUILD_MP_CH"} -$xml.save("$ENV:APPDATA\RosBE\config.rbuild") -copy-item "$ENV:APPDATA\RosBE\config.rbuild" ".\config.rbuild" +$xml.save("$ENV:APPDATA\RosBE\config-$_ROSBE_VERSION.rbuild") +copy-item "$ENV:APPDATA\RosBE\config-$_ROSBE_VERSION.rbuild" ".\config.rbuild"
$host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION"
Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershel... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] Mon Aug 23 21:22:55 2010 @@ -191,8 +191,8 @@
# Load the user's options if any if ("$args" -eq "") { - if (Test-Path "$ENV:APPDATA\RosBE\rosbe-options.ps1") { - & "$ENV:APPDATA\RosBE\rosbe-options.ps1" + if (Test-Path "$ENV:APPDATA\RosBE\rosbe-options-$_ROSBE_VERSION.ps1") { + & "$ENV:APPDATA\RosBE\rosbe-options-$_ROSBE_VERSION.ps1" } }
@@ -200,8 +200,8 @@ & "$ENV:APPDATA\RosBE\rosbe-options-$ENV:ROS_ARCH.ps1" }
-if (Test-Path "$ENV:APPDATA\RosBE\RBUILDFLAGS.FLG") { - $ENV:ROS_RBUILDFLAGS = get-content "$ENV:APPDATA\RosBE\RBUILDFLAGS.FLG" +if (Test-Path "$ENV:APPDATA\RosBE\RBUILDFLAGS-$_ROSBE_VERSION.FLG") { + $ENV:ROS_RBUILDFLAGS = get-content "$ENV:APPDATA\RosBE\RBUILDFLAGS-$_ROSBE_VERSION.FLG" }
# Load the doskey macros that serve as our commands.
Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/charch.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershel... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/charch.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/charch.ps1 [iso-8859-1] Mon Aug 23 21:22:55 2010 @@ -23,8 +23,8 @@
# Refresh all needed Params by recalling the main Path setting CMD File. if ("$ENV:ROS_ARCH" -eq "i386") { - if (Test-Path "$ENV:APPDATA\RosBE\rosbe-options.ps1") { - IEX "& '$ENV:APPDATA\RosBE\rosbe-options.ps1'" + if (Test-Path "$ENV:APPDATA\RosBE\rosbe-options-$_ROSBE_VERSION.ps1") { + IEX "& '$ENV:APPDATA\RosBE\rosbe-options-$_ROSBE_VERSION.ps1'" } } else { if (Test-Path "$ENV:APPDATA\RosBE\rosbe-options-$ENV:ROS_ARCH.ps1") {
Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershel... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 [iso-8859-1] Mon Aug 23 21:22:55 2010 @@ -13,7 +13,7 @@ $cfgfile ="$ENV:APPDATA\RosBE\rosbe-options-$ENV:ROS_ARCH.ps1" } else { $param = $null - $cfgfile="$ENV:APPDATA\RosBE\rosbe-options.ps1" + $cfgfile="$ENV:APPDATA\RosBE\rosbe-options-$_ROSBE_VERSION.ps1" }
# Run options.exe
Modified: trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Conf... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd [iso-8859-1] Mon Aug 23 21:22:55 2010 @@ -15,8 +15,8 @@ setlocal enabledelayedexpansion title ReactOS Build Configurator
-if not exist "%APPDATA%\RosBE\RBUILDFLAGS.FLG" ( - echo -da> "%APPDATA%\RosBE\RBUILDFLAGS.FLG" +if not exist "%APPDATA%\RosBE\RBUILDFLAGS-%_ROSBE_VERSION%.FLG" ( + echo -da> "%APPDATA%\RosBE\RBUILDFLAGS-%_ROSBE_VERSION%.FLG" )
:: Receive the first Parameter and decide what to do. @@ -36,15 +36,15 @@ echo Main Configuration File was not found in ReactOS Source Tree. )
- if exist "%APPDATA%\RosBE\config.rbuild" ( - del "%APPDATA%\RosBE\config.rbuild" + if exist "%APPDATA%\RosBE\config-%_ROSBE_VERSION%.rbuild" ( + del "%APPDATA%\RosBE\config-%_ROSBE_VERSION%.rbuild" echo Working Configuration File was found and deleted. ) else ( echo Working Configuration File was not found in ReactOS Source Tree. )
- if exist "%APPDATA%\RosBE\RBUILDFLAGS.FLG" ( - del "%APPDATA%\RosBE\RBUILDFLAGS.FLG" + if exist "%APPDATA%\RosBE\RBUILDFLAGS-%_ROSBE_VERSION%.FLG" ( + del "%APPDATA%\RosBE\RBUILDFLAGS-%_ROSBE_VERSION%.FLG" echo RBuild Flags File was found and deleted. ) else ( echo RBuild Flags File was not found in ReactOS Source Tree. @@ -65,7 +65,7 @@ :CONT2 del "%_ROSBE_BASEDIR%*.rbuild" del "config.rbuild" - copy "config.template.rbuild" "%APPDATA%\RosBE\config.rbuild" + copy "config.template.rbuild" "%APPDATA%\RosBE\config-%_ROSBE_VERSION%.rbuild" echo Successfully Updated. goto :NOK ) @@ -228,7 +228,7 @@ set RBUILDFLAGS=!RBUILDFLAGS! -r ) cls - echo !RBUILDFLAGS! > "%APPDATA%\RosBE\RBUILDFLAGS.FLG" + echo !RBUILDFLAGS! > "%APPDATA%\RosBE\RBUILDFLAGS-%_ROSBE_VERSION%.FLG" set ROS_RBUILDFLAGS=!RBUILDFLAGS! goto :NOK ) @@ -239,8 +239,8 @@ )
:: Check if config.rbuild already exists. If not, get a working copy. -if not exist "%APPDATA%\RosBE\config.rbuild" ( - copy "config.template.rbuild" "%APPDATA%\RosBE\config.rbuild" +if not exist "%APPDATA%\RosBE\config-%_ROSBE_VERSION%.rbuild" ( + copy "config.template.rbuild" "%APPDATA%\RosBE\config-%_ROSBE_VERSION%.rbuild" )
:: Help prevent non-useful bug reports/questions. @@ -273,9 +273,9 @@ if /i "!YESNO!"=="y" goto :YES goto :NOK :YES - del "%APPDATA%\RosBE*.rbuild" + del "%APPDATA%\RosBE\config-%_ROSBE_VERSION%.rbuild" del "config.rbuild" - copy "config.template.rbuild" "%APPDATA%\RosBE\config.rbuild" + copy "config.template.rbuild" "%APPDATA%\RosBE\config-%_ROSBE_VERSION%.rbuild" goto :OK ) ) @@ -285,7 +285,7 @@ echo Sub-Architecture to build for. echo Default is: none echo. -for /f "usebackq tokens=3" %%i in (`"type "%APPDATA%\RosBE\config.rbuild" | find "SARCH" | find "property name""`) do set SARCH=%%i +for /f "usebackq tokens=3" %%i in (`"type "%APPDATA%\RosBE\config-%_ROSBE_VERSION%.rbuild" | find "SARCH" | find "property name""`) do set SARCH=%%i set SARCH=%SARCH:~7,-1% echo Right now: %SARCH% set /p SARCH_CH="(), (xbox)" @@ -302,7 +302,7 @@ echo VIA: c3, c3-2 echo Default is: pentium echo. -for /f "usebackq tokens=3" %%i in (`"type "%APPDATA%\RosBE\config.rbuild" | find "OARCH" | find "property name""`) do set OARCH=%%i +for /f "usebackq tokens=3" %%i in (`"type "%APPDATA%\RosBE\config-%_ROSBE_VERSION%.rbuild" | find "OARCH" | find "property name""`) do set OARCH=%%i set OARCH=%OARCH:~7,-1% echo Right now: %OARCH% set /p OARCH_CH= @@ -316,7 +316,7 @@ echo specified by OARCH. echo Default is: i686 echo. -for /f "usebackq tokens=3" %%i in (`"type "%APPDATA%\RosBE\config.rbuild" | find "TUNE" | find "property name""`) do set TUNE=%%i +for /f "usebackq tokens=3" %%i in (`"type "%APPDATA%\RosBE\config-%_ROSBE_VERSION%.rbuild" | find "TUNE" | find "property name""`) do set TUNE=%%i set TUNE=%TUNE:~7,-1% echo Right now: %TUNE% set /p TUNE_CH= @@ -332,7 +332,7 @@ echo official release builds and debug builds. echo warning : 2,3,4,5 is not tested on ReactOS. Change at own risk. echo. -for /f "usebackq tokens=3" %%i in (`"type "%APPDATA%\RosBE\config.rbuild" | find "OPTIMIZE" | find "property name""`) do set OPTIMIZE=%%i +for /f "usebackq tokens=3" %%i in (`"type "%APPDATA%\RosBE\config-%_ROSBE_VERSION%.rbuild" | find "OPTIMIZE" | find "property name""`) do set OPTIMIZE=%%i set OPTIMIZE=%OPTIMIZE:~7,-1% echo Right now: %OPTIMIZE% set /p OPTIMIZE_CH="(0), (1), (2), (3), (4), (5)" @@ -344,7 +344,7 @@ echo Whether to compile in the integrated kernel debugger. echo Default is: 1 echo. -for /f "usebackq tokens=3" %%i in (`"type "%APPDATA%\RosBE\config.rbuild" | find "KDBG" | find "property name""`) do set KDBG=%%i +for /f "usebackq tokens=3" %%i in (`"type "%APPDATA%\RosBE\config-%_ROSBE_VERSION%.rbuild" | find "KDBG" | find "property name""`) do set KDBG=%%i set KDBG=%KDBG:~7,-1% echo Right now: %KDBG% set /p KDBG_CH="(0), (1)" @@ -357,7 +357,7 @@ echo performed. echo Default is: 1 echo. -for /f "usebackq tokens=3" %%i in (`"type "%APPDATA%\RosBE\config.rbuild" | find "DBG" | find "property name" | find /V "KDBG""`) do set DBG=%%i +for /f "usebackq tokens=3" %%i in (`"type "%APPDATA%\RosBE\config-%_ROSBE_VERSION%.rbuild" | find "DBG" | find "property name" | find /V "KDBG""`) do set DBG=%%i set DBG=%DBG:~7,-1% echo Right now: %DBG% set /p DBG_CH="(0), (1)" @@ -370,7 +370,7 @@ echo don't enable this. echo Default is: 0 echo. -for /f "usebackq tokens=3" %%i in (`"type "%APPDATA%\RosBE\config.rbuild" | find "GDB" | find "property name""`) do set GDB=%%i +for /f "usebackq tokens=3" %%i in (`"type "%APPDATA%\RosBE\config-%_ROSBE_VERSION%.rbuild" | find "GDB" | find "property name""`) do set GDB=%%i set GDB=%GDB:~7,-1% echo Right now: %GDB% set /p GDB_CH="(0), (1)" @@ -385,7 +385,7 @@ echo from the patent owner). echo Default is: 0 echo. -for /f "usebackq tokens=3" %%i in (`"type "%APPDATA%\RosBE\config.rbuild" | find "NSWPAT" | find "property name""`) do set NSWPAT=%%i +for /f "usebackq tokens=3" %%i in (`"type "%APPDATA%\RosBE\config-%_ROSBE_VERSION%.rbuild" | find "NSWPAT" | find "property name""`) do set NSWPAT=%%i set NSWPAT=%NSWPAT:~7,-1% echo Right now: %NSWPAT% set /p NSWPAT_CH="(0), (1)" @@ -402,7 +402,7 @@ echo unless you know what you're doing. echo Default is: 0 echo. -for /f "usebackq tokens=3" %%i in (`"type "%APPDATA%\RosBE\config.rbuild" | find "_WINKD_" | find "property name""`) do set WINKD=%%i +for /f "usebackq tokens=3" %%i in (`"type "%APPDATA%\RosBE\config-%_ROSBE_VERSION%.rbuild" | find "_WINKD_" | find "property name""`) do set WINKD=%%i set WINKD=%WINKD:~7,-1% echo Right now: %WINKD% set /p WINKD_CH="(0), (1)" @@ -415,7 +415,7 @@ echo you're doing. echo Default is: 0 echo. -for /f "usebackq tokens=3" %%i in (`"type "%APPDATA%\RosBE\config.rbuild" | find "_ELF_" | find "property name""`) do set ELF=%%i +for /f "usebackq tokens=3" %%i in (`"type "%APPDATA%\RosBE\config-%_ROSBE_VERSION%.rbuild" | find "_ELF_" | find "property name""`) do set ELF=%%i set ELF=%ELF:~7,-1% echo Right now: %ELF% set /p ELF_CH="(0), (1)" @@ -427,7 +427,7 @@ echo Whether to compile the multi processor versions for ntoskrnl and hal. echo Default is: 1 echo. -for /f "usebackq tokens=3" %%i in (`"type "%APPDATA%\RosBE\config.rbuild" | find "BUILD_MP" | find "property name""`) do set BUILD_MP=%%i +for /f "usebackq tokens=3" %%i in (`"type "%APPDATA%\RosBE\config-%_ROSBE_VERSION%.rbuild" | find "BUILD_MP" | find "property name""`) do set BUILD_MP=%%i set BUILD_MP=%BUILD_MP:~7,-1% echo Right now: %BUILD_MP% set /p BUILD_MP_CH="(0), (1)" @@ -453,9 +453,9 @@ echo ^<property name="BUILD_MP" value="%BUILD_MP_CH%" /^>>>%TEMP%\config.tmp echo ^</group^>>>%TEMP%\config.tmp
-copy "%TEMP%\config.tmp" "%APPDATA%\RosBE\config.rbuild" >NUL +copy "%TEMP%\config.tmp" "%APPDATA%\RosBE\config-%_ROSBE_VERSION%.rbuild" >NUL del %TEMP%\config.tmp -copy "%APPDATA%\RosBE\config.rbuild" "config.rbuild" >NUL +copy "%APPDATA%\RosBE\config-%_ROSBE_VERSION%.rbuild" "config.rbuild" >NUL
:NOK title ReactOS Build Environment %_ROSBE_VERSION%
Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/RosB... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] Mon Aug 23 21:22:55 2010 @@ -74,8 +74,8 @@ ) :: Load the user's options if any if "%ROS_ARCH%" == "i386" ( - if exist "%APPDATA%\RosBE\rosbe-options.cmd" ( - call "%APPDATA%\RosBE\rosbe-options.cmd" + if exist "%APPDATA%\RosBE\rosbe-options-%_ROSBE_VERSION%.cmd" ( + call "%APPDATA%\RosBE\rosbe-options-%_ROSBE_VERSION%.cmd" ) )
@@ -83,8 +83,8 @@ call "%APPDATA%\RosBE\rosbe-options-%1.cmd" )
-if exist "%APPDATA%\RosBE\RBUILDFLAGS.FLG" ( - for /f "usebackq tokens=* delims= " %%i in (`"type "%APPDATA%\RosBE\RBUILDFLAGS.FLG""`) do set ROS_RBUILDFLAGS=%%i +if exist "%APPDATA%\RosBE\RBUILDFLAGS-%_ROSBE_VERSION%.FLG" ( + for /f "usebackq tokens=* delims= " %%i in (`"type "%APPDATA%\RosBE\RBUILDFLAGS-%_ROSBE_VERSION%.FLG""`) do set ROS_RBUILDFLAGS=%%i )
:: Check if RosBE data directory exists, if not, create it.
Modified: trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/char... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd [iso-8859-1] Mon Aug 23 21:22:55 2010 @@ -33,8 +33,8 @@
:: Refresh all needed Params by recalling the main Path setting CMD File. if /i "%ROS_ARCH%" == "i386" ( - if exist "%APPDATA%\RosBE\rosbe-options.cmd" ( - call "%APPDATA%\RosBE\rosbe-options.cmd" + if exist "%APPDATA%\RosBE\rosbe-options-%_ROSBE_VERSION%.cmd" ( + call "%APPDATA%\RosBE\rosbe-options-%_ROSBE_VERSION%.cmd" ) ) else ( if exist "%APPDATA%\RosBE\rosbe-options-%ROS_ARCH%.cmd" (
Modified: trunk/tools/RosBE/RosBE-Windows/Root/options.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/opti... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/options.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/options.cmd [iso-8859-1] Mon Aug 23 21:22:55 2010 @@ -19,7 +19,7 @@ set cfgfile=%APPDATA%\RosBE\rosbe-options-%ROS_ARCH%.cmd ) else ( set param= - set cfgfile=%APPDATA%\RosBE\rosbe-options.cmd + set cfgfile=%APPDATA%\RosBE\rosbe-options-%_ROSBE_VERSION%.cmd )
:: Run options.exe
Modified: trunk/tools/RosBE/RosBE-Windows/RosBE-ARM.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE-ARM... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE-ARM.nsi [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE-ARM.nsi [iso-8859-1] Mon Aug 23 21:22:55 2010 @@ -129,13 +129,13 @@ CreateDirectory "$SMPROGRAMS$ICONS_GROUP" SetOutPath $REACTOS_SOURCE_DIRECTORY IfFileExists "$INSTDIR\RosBE.cmd" 0 +2 - CreateShortCut "$SMPROGRAMS$ICONS_GROUP\ReactOS Build Environment - ARM.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd" arm' "$INSTDIR\rosbe.ico" + CreateShortCut "$SMPROGRAMS$ICONS_GROUP\ReactOS Build Environment - ARM - ${PRODUCT_VERSION}.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd" arm' "$INSTDIR\rosbe.ico" IfFileExists "$INSTDIR\RosBE.ps1" 0 +2 - CreateShortCut "$SMPROGRAMS$ICONS_GROUP\ReactOS Build Environment - ARM - Powershell.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\RosBE.ps1' arm" "$INSTDIR\rosbe.ico" + CreateShortCut "$SMPROGRAMS$ICONS_GROUP\ReactOS Build Environment - ARM - ${PRODUCT_VERSION} - PS.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\RosBE.ps1' arm" "$INSTDIR\rosbe.ico" IfFileExists "$INSTDIR\Tools\options.exe" 0 +2 - CreateShortCut "$SMPROGRAMS$ICONS_GROUP\Options - ARM.lnk" "$INSTDIR\Tools\options.exe" arm + CreateShortCut "$SMPROGRAMS$ICONS_GROUP\Options - ARM - ${PRODUCT_VERSION}.lnk" "$INSTDIR\Tools\options.exe" arm SetOutPath $INSTDIR - CreateShortCut "$SMPROGRAMS$ICONS_GROUP\Uninstall RosBE - ARM Target.lnk" \ + CreateShortCut "$SMPROGRAMS$ICONS_GROUP\Uninstall RosBE - ARM - ${PRODUCT_VERSION}.lnk" \ "$INSTDIR\Uninstall-ARM-${PRODUCT_VERSION}.exe" !insertmacro MUI_STARTMENU_WRITE_END SectionEnd @@ -148,9 +148,9 @@ ;; SetOutPath $REACTOS_SOURCE_DIRECTORY IfFileExists "$INSTDIR\RosBE.cmd" 0 +2 - CreateShortCut "$DESKTOP\ReactOS Build Environment - ARM.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd" arm' "$INSTDIR\rosbe.ico" + CreateShortCut "$DESKTOP\ReactOS Build Environment - ARM - ${PRODUCT_VERSION}.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd" arm' "$INSTDIR\rosbe.ico" IfFileExists "$INSTDIR\RosBE.ps1" 0 +2 - CreateShortCut "$DESKTOP\ReactOS Build Environment - ARM - Powershell.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\RosBE.ps1' arm" "$INSTDIR\rosbe.ico" + CreateShortCut "$DESKTOP\ReactOS Build Environment - ARM - ${PRODUCT_VERSION} - PS.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\RosBE.ps1' arm" "$INSTDIR\rosbe.ico" SectionEnd
Section /o "Quick Launch Shortcuts" SEC04 @@ -161,9 +161,9 @@ ;; SetOutPath $REACTOS_SOURCE_DIRECTORY IfFileExists "$INSTDIR\RosBE.cmd" 0 +2 - CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment - ARM.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd" arm' "$INSTDIR\rosbe.ico" + CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment - ARM - ${PRODUCT_VERSION}.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd" arm' "$INSTDIR\rosbe.ico" IfFileExists "$INSTDIR\RosBE.ps1" 0 +2 - CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment - ARM - Powershell.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\RosBE.ps1' arm" "$INSTDIR\rosbe.ico" + CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment - ARM - ${PRODUCT_VERSION} - PS.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\RosBE.ps1' arm" "$INSTDIR\rosbe.ico" SectionEnd
Section -Post SEC06 @@ -198,10 +198,10 @@ Delete /REBOOTOK "$INSTDIR\Uninstall-${PRODUCT_VERSION}.exe" ;; Whoever dares to change this back into: RMDir /r /REBOOTOK "$INSTDIR" will be KILLED!!! RMDir /REBOOTOK "$INSTDIR" - Delete /REBOOTOK "$DESKTOP\ReactOS Build Environment - ARM.lnk" - Delete /REBOOTOK "$QUICKLAUNCH\ReactOS Build Environment - ARM.lnk" - Delete /REBOOTOK "$DESKTOP\ReactOS Build Environment - ARM - Powershell.lnk" - Delete /REBOOTOK "$QUICKLAUNCH\ReactOS Build Environment - ARM - Powershell.lnk" + Delete /REBOOTOK "$DESKTOP\ReactOS Build Environment - ARM - ${PRODUCT_VERSION}.lnk" + Delete /REBOOTOK "$QUICKLAUNCH\ReactOS Build Environment - ARM - ${PRODUCT_VERSION}.lnk" + Delete /REBOOTOK "$DESKTOP\ReactOS Build Environment - ARM - ${PRODUCT_VERSION} - PS.lnk" + Delete /REBOOTOK "$QUICKLAUNCH\ReactOS Build Environment - ARM - ${PRODUCT_VERSION} - PS.lnk"
;; ;; Clean up the registry.
Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE.nsi... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] Mon Aug 23 21:22:55 2010 @@ -177,7 +177,7 @@ !insertmacro MUI_STARTMENU_WRITE_BEGIN Application CreateDirectory "$SMPROGRAMS$ICONS_GROUP" SetOutPath $INSTDIR - CreateShortCut "$SMPROGRAMS$ICONS_GROUP\Options.lnk" \ + CreateShortCut "$SMPROGRAMS$ICONS_GROUP\Options - ${PRODUCT_VERSION}.lnk" \ "$INSTDIR\Tools\options.exe" !insertmacro MUI_STARTMENU_WRITE_END SectionEnd @@ -311,16 +311,16 @@ ;; ;; Add our start menu shortcuts. ;; - IfFileExists "$SMPROGRAMS$ICONS_GROUP\ReactOS Build Environment.lnk" +13 0 + IfFileExists "$SMPROGRAMS$ICONS_GROUP\ReactOS Build Environment - ${PRODUCT_VERSION}.lnk" +13 0 !insertmacro MUI_STARTMENU_WRITE_BEGIN Application CreateDirectory "$SMPROGRAMS$ICONS_GROUP" SetOutPath $REACTOS_SOURCE_DIRECTORY IfFileExists "$INSTDIR\RosBE.cmd" 0 +2 - CreateShortCut "$SMPROGRAMS$ICONS_GROUP\ReactOS Build Environment.lnk" "$SYSDIR\cmd.exe" '/t:0A /k "$INSTDIR\RosBE.cmd"' "$INSTDIR\rosbe.ico" + CreateShortCut "$SMPROGRAMS$ICONS_GROUP\ReactOS Build Environment - ${PRODUCT_VERSION}.lnk" "$SYSDIR\cmd.exe" '/t:0A /k "$INSTDIR\RosBE.cmd"' "$INSTDIR\rosbe.ico" IfFileExists "$INSTDIR\RosBE.ps1" 0 +2 - CreateShortCut "$SMPROGRAMS$ICONS_GROUP\ReactOS Build Environment - Powershell.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\RosBE.ps1'" "$INSTDIR\rosbe.ico" + CreateShortCut "$SMPROGRAMS$ICONS_GROUP\ReactOS Build Environment - ${PRODUCT_VERSION} - PS.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\RosBE.ps1'" "$INSTDIR\rosbe.ico" SetOutPath $INSTDIR - CreateShortCut "$SMPROGRAMS$ICONS_GROUP\Uninstall RosBE.lnk" \ + CreateShortCut "$SMPROGRAMS$ICONS_GROUP\Uninstall RosBE - ${PRODUCT_VERSION}.lnk" \ "$INSTDIR\Uninstall-${PRODUCT_VERSION}.exe" CreateShortCut "$SMPROGRAMS$ICONS_GROUP\Readme.lnk" \ "$INSTDIR\README.pdf" @@ -333,12 +333,12 @@ ;; ;; Add our desktop shortcuts. ;; - IfFileExists "$DESKTOP\ReactOS Build Environment.lnk" +6 0 + IfFileExists "$DESKTOP\ReactOS Build Environment - ${PRODUCT_VERSION}.lnk" +6 0 SetOutPath $REACTOS_SOURCE_DIRECTORY IfFileExists "$INSTDIR\RosBE.cmd" 0 +2 - CreateShortCut "$DESKTOP\ReactOS Build Environment.lnk" "$SYSDIR\cmd.exe" '/t:0A /k "$INSTDIR\RosBE.cmd"' "$INSTDIR\rosbe.ico" + CreateShortCut "$DESKTOP\ReactOS Build Environment - ${PRODUCT_VERSION}.lnk" "$SYSDIR\cmd.exe" '/t:0A /k "$INSTDIR\RosBE.cmd"' "$INSTDIR\rosbe.ico" IfFileExists "$INSTDIR\RosBE.ps1" 0 +2 - CreateShortCut "$DESKTOP\ReactOS Build Environment - Powershell.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\RosBE.ps1'" "$INSTDIR\rosbe.ico" + CreateShortCut "$DESKTOP\ReactOS Build Environment - ${PRODUCT_VERSION} - PS.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\RosBE.ps1'" "$INSTDIR\rosbe.ico" SectionEnd
Section /o "Quick Launch Shortcuts" SEC14 @@ -347,12 +347,12 @@ ;; ;; Add our quick launch shortcuts. ;; - IfFileExists "$QUICKLAUNCH\ReactOS Build Environment.lnk" +6 0 + IfFileExists "$QUICKLAUNCH\ReactOS Build Environment - ${PRODUCT_VERSION}.lnk" +6 0 SetOutPath $REACTOS_SOURCE_DIRECTORY IfFileExists "$INSTDIR\RosBE.cmd" 0 +2 - CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment.lnk" "$SYSDIR\cmd.exe" '/t:0A /k "$INSTDIR\RosBE.cmd"' "$INSTDIR\rosbe.ico" + CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment - ${PRODUCT_VERSION}.lnk" "$SYSDIR\cmd.exe" '/t:0A /k "$INSTDIR\RosBE.cmd"' "$INSTDIR\rosbe.ico" IfFileExists "$INSTDIR\RosBE.ps1" 0 +2 - CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment - Powershell.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\RosBE.ps1'" "$INSTDIR\rosbe.ico" + CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment - ${PRODUCT_VERSION} - PS.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\RosBE.ps1'" "$INSTDIR\rosbe.ico" SectionEnd
Section -Post SEC15 @@ -387,10 +387,10 @@ MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 \ "Do you want to remove the Shortcuts? If you just want to Update to a new Version of RosBE, keep them. This keeps your previous settings." \ IDNO +5 - Delete /REBOOTOK "$DESKTOP\ReactOS Build Environment.lnk" - Delete /REBOOTOK "$QUICKLAUNCH\ReactOS Build Environment.lnk" - Delete /REBOOTOK "$DESKTOP\ReactOS Build Environment - Powershell.lnk" - Delete /REBOOTOK "$QUICKLAUNCH\ReactOS Build Environment - Powershell.lnk" + Delete /REBOOTOK "$DESKTOP\ReactOS Build Environment - ${PRODUCT_VERSION}.lnk" + Delete /REBOOTOK "$QUICKLAUNCH\ReactOS Build Environment - ${PRODUCT_VERSION}.lnk" + Delete /REBOOTOK "$DESKTOP\ReactOS Build Environment - ${PRODUCT_VERSION} - PS.lnk" + Delete /REBOOTOK "$QUICKLAUNCH\ReactOS Build Environment - ${PRODUCT_VERSION} - PS.lnk" FunctionEnd
Section Uninstall
Modified: trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE64.n... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE64.nsi [iso-8859-1] Mon Aug 23 21:22:55 2010 @@ -129,13 +129,13 @@ CreateDirectory "$SMPROGRAMS$ICONS_GROUP" SetOutPath $REACTOS_SOURCE_DIRECTORY IfFileExists "$INSTDIR\RosBE.cmd" 0 +2 - CreateShortCut "$SMPROGRAMS$ICONS_GROUP\ReactOS Build Environment 64-bit.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd" amd64' "$INSTDIR\rosbe.ico" + CreateShortCut "$SMPROGRAMS$ICONS_GROUP\ReactOS Build Environment 64-bit - ${PRODUCT_VERSION}.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd" amd64' "$INSTDIR\rosbe.ico" IfFileExists "$INSTDIR\RosBE.ps1" 0 +2 - CreateShortCut "$SMPROGRAMS$ICONS_GROUP\ReactOS Build Environment 64-bit - Powershell.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\RosBE.ps1' amd64" "$INSTDIR\rosbe.ico" + CreateShortCut "$SMPROGRAMS$ICONS_GROUP\ReactOS Build Environment 64-bit - ${PRODUCT_VERSION} - PS.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\RosBE.ps1' amd64" "$INSTDIR\rosbe.ico" IfFileExists "$INSTDIR\Tools\options.exe" 0 +2 - CreateShortCut "$SMPROGRAMS$ICONS_GROUP\Options 64-bit.lnk" "$INSTDIR\Tools\options.exe" amd64 + CreateShortCut "$SMPROGRAMS$ICONS_GROUP\Options 64-bit - ${PRODUCT_VERSION}.lnk" "$INSTDIR\Tools\options.exe" amd64 SetOutPath $INSTDIR - CreateShortCut "$SMPROGRAMS$ICONS_GROUP\Uninstall RosBE - 64 Bit Target.lnk" \ + CreateShortCut "$SMPROGRAMS$ICONS_GROUP\Uninstall RosBE - 64-Bit - ${PRODUCT_VERSION}.lnk" \ "$INSTDIR\Uninstall64-${PRODUCT_VERSION}.exe" !insertmacro MUI_STARTMENU_WRITE_END SectionEnd @@ -148,9 +148,9 @@ ;; SetOutPath $REACTOS_SOURCE_DIRECTORY IfFileExists "$INSTDIR\RosBE.cmd" 0 +2 - CreateShortCut "$DESKTOP\ReactOS Build Environment 64-bit.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd" amd64' "$INSTDIR\rosbe.ico" + CreateShortCut "$DESKTOP\ReactOS Build Environment 64-bit - ${PRODUCT_VERSION}.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd" amd64' "$INSTDIR\rosbe.ico" IfFileExists "$INSTDIR\RosBE.ps1" 0 +2 - CreateShortCut "$DESKTOP\ReactOS Build Environment 64-bit - Powershell.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\RosBE.ps1' amd64" "$INSTDIR\rosbe.ico" + CreateShortCut "$DESKTOP\ReactOS Build Environment 64-bit - ${PRODUCT_VERSION} - PS.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\RosBE.ps1' amd64" "$INSTDIR\rosbe.ico" SectionEnd
Section /o "Quick Launch Shortcuts" SEC04 @@ -161,9 +161,9 @@ ;; SetOutPath $REACTOS_SOURCE_DIRECTORY IfFileExists "$INSTDIR\RosBE.cmd" 0 +2 - CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment 64-bit.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd" amd64' "$INSTDIR\rosbe.ico" + CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment 64-bit - ${PRODUCT_VERSION}.lnk" "$SYSDIR\cmd.exe" '/k "$INSTDIR\RosBE.cmd" amd64' "$INSTDIR\rosbe.ico" IfFileExists "$INSTDIR\RosBE.ps1" 0 +2 - CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment 64-bit - Powershell.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\RosBE.ps1' amd64" "$INSTDIR\rosbe.ico" + CreateShortCut "$QUICKLAUNCH\ReactOS Build Environment 64-bit - ${PRODUCT_VERSION} - PS.lnk" "$SYSDIR\WindowsPowerShell\v1.0\powershell.exe" "-noexit &'$INSTDIR\RosBE.ps1' amd64" "$INSTDIR\rosbe.ico" SectionEnd
Section -Post SEC06 @@ -198,10 +198,10 @@ Delete /REBOOTOK "$INSTDIR\Uninstall-${PRODUCT_VERSION}.exe" ;; Whoever dares to change this back into: RMDir /r /REBOOTOK "$INSTDIR" will be KILLED!!! RMDir /REBOOTOK "$INSTDIR" - Delete /REBOOTOK "$DESKTOP\ReactOS Build Environment 64-bit.lnk" - Delete /REBOOTOK "$QUICKLAUNCH\ReactOS Build Environment 64-bit.lnk" - Delete /REBOOTOK "$DESKTOP\ReactOS Build Environment 64-bit - Powershell.lnk" - Delete /REBOOTOK "$QUICKLAUNCH\ReactOS Build Environment 64-bit - Powershell.lnk" + Delete /REBOOTOK "$DESKTOP\ReactOS Build Environment 64-bit - ${PRODUCT_VERSION}.lnk" + Delete /REBOOTOK "$QUICKLAUNCH\ReactOS Build Environment 64-bit - ${PRODUCT_VERSION}.lnk" + Delete /REBOOTOK "$DESKTOP\ReactOS Build Environment 64-bit - ${PRODUCT_VERSION} - PS.lnk" + Delete /REBOOTOK "$QUICKLAUNCH\ReactOS Build Environment 64-bit - ${PRODUCT_VERSION} - PS.lnk"
;; ;; Clean up the registry.
Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/con... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.c [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/x86/options.c [iso-8859-1] Mon Aug 23 21:22:55 2010 @@ -62,9 +62,9 @@ } else { - if ((wcslen(filename) + wcslen(L"\RosBE\rosbe-options.cmd")) < MAX_PATH) - { - wcscat(filename, L"\RosBE\rosbe-options.cmd"); + if ((wcslen(filename) + wcslen(L"\RosBE\rosbe-options-1.6.cmd")) < MAX_PATH) + { + wcscat(filename, L"\RosBE\rosbe-options-1.6.cmd"); } } } @@ -80,7 +80,7 @@ } else { - wcscpy(filename, L"rosbe-options.cmd"); + wcscpy(filename, L"rosbe-options-1.6.cmd"); } } return filename; @@ -110,9 +110,9 @@ } else { - if ((wcslen(filename) + wcslen(L"\RosBE\rosbe-options.ps1")) < MAX_PATH) - { - wcscat(filename, L"\RosBE\rosbe-options.ps1"); + if ((wcslen(filename) + wcslen(L"\RosBE\rosbe-options-1.6.ps1")) < MAX_PATH) + { + wcscat(filename, L"\RosBE\rosbe-options-1.6.ps1"); } } } @@ -128,7 +128,7 @@ } else { - wcscpy(filename, L"rosbe-options.ps1"); + wcscpy(filename, L"rosbe-options-1.6.ps1"); } } return filename;
-
dreimer＠svn.reactos.org