Author: dreimer Date: Tue May 18 01:57:55 2010 New Revision: 47261
URL: http://svn.reactos.org/svn/reactos?rev=47261&view=rev Log: About time that I do it like KDE and release 1,3,5,7,9 Versions as "Finals" and 2,4,6,8,0 as FINALS.
Fixing another Bug noone saw in the RCs or in RosBE 1.5 Update 1 EVER, a bug which exactly shows the bullshit Batch is in real. Adding a enabledelayedexpansion and replacing some % with ! and it works.... Did I already say how much I hate Batch? Use the PS Version! Some sSVN cleanup, too. THis does not fix Olaf's Bug he has because I still cant replicate it.
Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd
Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershel... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 [iso-8859-1] Tue May 18 01:57:55 2010 @@ -67,6 +67,8 @@ } else { if ("$_BUILDBOT_SVNSKIPMAINTRUNK" -ne "1") { IEX "& svn.exe update" + } else { + "Skipping ReactOS Trunk update." } if (Test-Path "modules\rosapps.") { Set-Location "modules\rosapps"
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] Tue May 18 01:57:55 2010 @@ -41,11 +41,15 @@ set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%%ROS_ARCH% set _BUILDBOT_SVNSKIPMAINTRUNK=0
+setlocal enabledelayedexpansion + if "%_ROSBE_NOSYSPATH%" == "1" ( - set _ROSBE_ORIGINALPATH=%_ROSBE_BASEDIR%;%_ROSBE_BASEDIR%\Tools;%_ROSBE_BASEDIR%\samples;%SystemRoot%\system32;%SystemRoot%;%SystemRoot%\System32\Wbem + set _ROSBE_ORIGINALPATH=!_ROSBE_BASEDIR!;!_ROSBE_BASEDIR!\Tools;!_ROSBE_BASEDIR!\samples;!SystemRoot!\system32;!SystemRoot!;!SystemRoot!\System32\Wbem ) else ( - set _ROSBE_ORIGINALPATH=%_ROSBE_BASEDIR%;%_ROSBE_BASEDIR%\Tools;%_ROSBE_BASEDIR%\samples;%PATH% + set _ROSBE_ORIGINALPATH=!_ROSBE_BASEDIR!;!_ROSBE_BASEDIR!\Tools;!_ROSBE_BASEDIR!\samples;!PATH! ) + +endlocal && set _ROSBE_ORIGINALPATH=%_ROSBE_ORIGINALPATH%
:: Fix Bison package path (just in case RosBE is installed in a path which contains spaces) set BISON_PKGDATADIR=%~ds0%~sp0%i386\share\bison
Modified: trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/sSVN... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd [iso-8859-1] Tue May 18 01:57:55 2010 @@ -183,7 +183,6 @@ if not "%1" == "" ( echo Unknown parameter specified. Try 'help ssvn'. ) - goto EOC
:UP @@ -211,7 +210,6 @@
if "!_ROSBE_SSVN_JOB!" == "update" ( if not "%2" == "" ( - if "%2" == "!OFFSVN!" ( echo Your Local Repository is currently %2 ) @@ -241,6 +239,8 @@ ) else ( if not "%_BUILDBOT_SVNSKIPMAINTRUNK%" == "1" ( svn.exe update + ) else ( + echo Skipping ReactOS Trunk update. ) if exist "modules\rosapps." ( cd "modules\rosapps"