Author: peterw Date: Sun Oct 21 20:26:02 2007 New Revision: 29741
URL: http://svn.reactos.org/svn/reactos?rev=29741&view=rev Log: - A little bit more cleanup.
Modified: trunk/tools/RosBE-Windows/Root/Config.cmd trunk/tools/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE-Windows/Root/options.cmd trunk/tools/RosBE-Windows/Root/reladdr2line.cmd trunk/tools/RosBE-Windows/Root/sSVN.cmd trunk/tools/RosBE-Windows/Root/scut.cmd
Modified: trunk/tools/RosBE-Windows/Root/Config.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Config.cmd... ============================================================================== --- trunk/tools/RosBE-Windows/Root/Config.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Config.cmd Sun Oct 21 20:26:02 2007 @@ -16,7 +16,7 @@ if "%1" == "delete" ( echo config.rbuild will be permanently deleted. All your settings will be gone. echo Continue? - SET /P XY="(yes), (no)" + set /P XY="(yes), (no)" if /I "%XY%"=="yes" goto :CONT if /I "%XY%"=="no" goto :NOK goto :NOK @@ -40,7 +40,7 @@ echo old config.rbuild will be deleted and will be updated with a recent, echo default one. You will need to reconfigure it to your wishes later. echo Continue? - SET /P XY="(yes), (no)" + set /P XY="(yes), (no)" if /I "%XY%"=="yes" goto :CONT2 if /I "%XY%"=="no" goto :NOK :CONT2 @@ -71,7 +71,7 @@ echo. echo DID YOU UNDERSTAND?
-SET /P XY="(yes), (no)" +set /P XY="(yes), (no)"
if /I "%XY%"=="yes" goto :OK if /I "%XY%"=="no" goto :NOK @@ -92,7 +92,7 @@ echo *** update to the most recent one? You need to reset all your *** echo *** previously made settings. *** echo. - SET /P XY="(yes), (no)" + set /P XY="(yes), (no)" if /I "%XY%"=="yes" del "%_ROSBE_BASEDIR%*.rbuild" | del "config.rbuild" | copy "config.template.rbuild" "%_ROSBE_BASEDIR%\config.rbuild" | goto :OK if /I "%XY%"=="no" goto :NOK goto :NOK @@ -107,7 +107,7 @@ echo. echo Right now grep "SARCH" "%_ROSBE_BASEDIR%\config.rbuild"|cut -d """ -f 4 -SET /P X="(), (xbox)" +set /P X="(), (xbox)" sed "s/"SARCH" value=""/"SARCH" value="%X%"/g;s/"SARCH" value="xbox"/"SARCH" value="%X%"/g" "%_ROSBE_BASEDIR%\config.rbuild" > "%_ROSBE_BASEDIR%\config2.rbuild" cls
@@ -120,9 +120,9 @@ echo. echo Right now grep "OARCH" "%_ROSBE_BASEDIR%\config.rbuild"|cut -d """ -f 4 -SET /P XX= +set /P XX= if "%XX%" == "" ( - SET XX=pentium + set XX=pentium ) sed "s/"OARCH" value=".*"/"OARCH" value="%XX%"/g" "%_ROSBE_BASEDIR%\config2.rbuild" > "%_ROSBE_BASEDIR%\config3.rbuild" cls @@ -136,9 +136,9 @@ echo. echo Right now grep "OPTIMIZE" "%_ROSBE_BASEDIR%\config.rbuild"|cut -d """ -f 4 -SET /P Y="(0), (1), (2), (3), (4), (5)" +set /P Y="(0), (1), (2), (3), (4), (5)" if "%Y%" == "" ( - SET Y=1 + set Y=1 ) sed "s/"OPTIMIZE" value="[0-5]"/"OPTIMIZE" value="%Y%"/g" "%_ROSBE_BASEDIR%\config3.rbuild" > "%_ROSBE_BASEDIR%\config4.rbuild" cls @@ -148,9 +148,9 @@ echo. echo Right now grep "MP" "%_ROSBE_BASEDIR%\config.rbuild"|cut -d """ -f 4 -SET /P Z="(0), (1)" +set /P Z="(0), (1)" if "%Z%" == "" ( - SET Z=0 + set Z=0 ) sed "s/"MP" value="[0-1]"/"MP" value="%Z%"/g" "%_ROSBE_BASEDIR%\config4.rbuild" > "%_ROSBE_BASEDIR%\config5.rbuild" cls @@ -160,9 +160,9 @@ echo. echo Right now grep "KDBG" "%_ROSBE_BASEDIR%\config.rbuild"|cut -d """ -f 4 -SET /P A="(0), (1)" +set /P A="(0), (1)" if "%A%" == "" ( - SET A=0 + set A=0 ) sed "s/"KDBG" value="[0-1]"/"KDBG" value="%A%"/g" "%_ROSBE_BASEDIR%\config5.rbuild" > "%_ROSBE_BASEDIR%\config6.rbuild" cls @@ -173,9 +173,9 @@ echo. echo Right now grep "DBG" "%_ROSBE_BASEDIR%\config.rbuild"|cut -d """ -f 4 -SET /P B="(0), (1)" +set /P B="(0), (1)" if "%B%" == "" ( - SET B=1 + set B=1 ) sed "s/"DBG" value="[0-1]"/"DBG" value="%B%"/g" "%_ROSBE_BASEDIR%\config6.rbuild" > "%_ROSBE_BASEDIR%\config7.rbuild" cls @@ -186,9 +186,9 @@ echo. echo Right now grep "GDB" "%_ROSBE_BASEDIR%\config.rbuild"|cut -d """ -f 4 -SET /P C="(0), (1)" +set /P C="(0), (1)" if "%C%" == "" ( - SET C=0 + set C=0 ) sed "s/"GDB" value="[0-1]"/"GDB" value="%C%"/g" "%_ROSBE_BASEDIR%\config7.rbuild" > "%_ROSBE_BASEDIR%\config8.rbuild" cls @@ -201,9 +201,9 @@ echo. echo Right now grep "NSWPAT" "%_ROSBE_BASEDIR%\config.rbuild"|cut -d """ -f 4 -SET /P D="(0), (1)" +set /P D="(0), (1)" if "%D%" == "" ( - SET D=0 + set D=0 ) sed "s/"NSWPAT" value="[0-1]"/"NSWPAT" value="%D%"/g" "%_ROSBE_BASEDIR%\config8.rbuild" > "%_ROSBE_BASEDIR%\config9.rbuild" cls @@ -218,9 +218,9 @@ echo. echo Right now grep "_WINKD_" "%_ROSBE_BASEDIR%\config.rbuild"|cut -d """ -f 4 -SET /P F="(0), (1)" +set /P F="(0), (1)" if "%F%" == "" ( - SET F=0 + set F=0 ) sed "s/"_WINKD_" value="[0-1]"/"_WINKD_" value="%F%"/g" "%_ROSBE_BASEDIR%\config9.rbuild" > "%_ROSBE_BASEDIR%\config10.rbuild"
Modified: trunk/tools/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RosBE.cmd?... ============================================================================== --- trunk/tools/RosBE-Windows/Root/RosBE.cmd (original) +++ trunk/tools/RosBE-Windows/Root/RosBE.cmd Sun Oct 21 20:26:02 2007 @@ -17,7 +17,7 @@ color 0A set _ROSBE_VERSION=0.X.X.X set _ROSBE_BASEDIR=%~dp0 -for /f "usebackq" %%i in (`"echo %_ROSBE_BASEDIR%|%_ROSBE_BASEDIR%Tools\sed s/.$//g"`) do @SET _ROSBE_BASEDIR=%%i +for /f "usebackq" %%i in (`"echo %_ROSBE_BASEDIR%|%_ROSBE_BASEDIR%Tools\sed s/.$//g"`) do set _ROSBE_BASEDIR=%%i set _ROSBE_ROSSOURCEDIR=%CD% set _ROSBE_SHOWTIME=1 set _ROSBE_WRITELOG=1 @@ -62,7 +62,7 @@ :: Source Directory and add PATH for Tools Folder. :: set PATH=%_ROSBE_BASEDIR%\Tools;%PATH% -for /f "usebackq" %%i in (`"grep base= "%_ROSBE_BASEDIR%\srclist.xml"|cutz main"`) do @SET scut=%%i +for /f "usebackq" %%i in (`"grep base= "%_ROSBE_BASEDIR%\srclist.xml"|cutz main"`) do set scut=%%i echo Used Shortcut: %scut% echo.
@@ -80,6 +80,7 @@ echo. echo For a list of all included commands, type: "help" echo ------------------------------------------------- +echo.
:: :: Load the doskey macros that serve as our commands.
Modified: trunk/tools/RosBE-Windows/Root/options.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/options.cm... ============================================================================== --- trunk/tools/RosBE-Windows/Root/options.cmd (original) +++ trunk/tools/RosBE-Windows/Root/options.cmd Sun Oct 21 20:26:02 2007 @@ -11,6 +11,6 @@ title Options
"%_ROSBE_BASEDIR%\options.exe" -ECHO Press any Button to reset RosBE with the new Settings. +echo Press any Button to reset RosBE with the new Settings. pause "%_ROSBE_BASEDIR%\RosBE.cmd"
Modified: trunk/tools/RosBE-Windows/Root/reladdr2line.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/reladdr2li... ============================================================================== --- trunk/tools/RosBE-Windows/Root/reladdr2line.cmd (original) +++ trunk/tools/RosBE-Windows/Root/reladdr2line.cmd Sun Oct 21 20:26:02 2007 @@ -45,7 +45,7 @@ :: adress and can be given directly to raddr2line. If not, add it and :: give the result to raddr2line. :: -for /f "tokens=2" %%i in ('"objdump -p %_1% 2>NUL | findstr ImageBase"') do SET baseaddr=0x%%i +for /f "tokens=2" %%i in ('"objdump -p %_1% 2>NUL | findstr ImageBase"') do set baseaddr=0x%%i if %%i LSS %_2% ( raddr2line "%_1%" "%_2%" 2>NUL ) else (
Modified: trunk/tools/RosBE-Windows/Root/sSVN.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/sSVN.cmd?r... ============================================================================== --- trunk/tools/RosBE-Windows/Root/sSVN.cmd (original) +++ trunk/tools/RosBE-Windows/Root/sSVN.cmd Sun Oct 21 20:26:02 2007 @@ -56,8 +56,8 @@ :: if "%1" == "status" ( title Status - for /f "usebackq" %%i IN (`svnversion .`) DO @set OFFSVN=%%i - for /f "usebackq" %%j IN (`"svn info svn://svn.reactos.org/reactos/trunk/reactos|find "Revision:"|cutz svn"`) DO @set ONSVN=%%j + for /f "usebackq" %%i in (`svnversion .`) do set OFFSVN=%%i + for /f "usebackq" %%j in (`"svn info svn://svn.reactos.org/reactos/trunk/reactos|find "Revision:"|cutz svn"`) do set ONSVN=%%j call :UP goto :ExitSVN ) @@ -71,17 +71,17 @@ echo Recent Offline Revision: %OFFSVN% echo Online HEAD Revision: %ONSVN% echo. -if %OFFSVN% LSS %ONSVN% ( +if %OFFSVN% lss %ONSVN% ( echo Your Tree is not Up to date. Do you want to update it? goto :UP2 ) -if %OFFSVN% EQU %ONSVN% ( +if %OFFSVN% equ %ONSVN% ( echo Your Tree is Up to date. goto :ExitSVN )
:UP2 -SET /P XY="(yes), (no)" +set /P XY="(yes), (no)" if /I "%XY%"=="yes" %_ROSBE_BASEDIR%\ssvn update if /I "%XY%"=="no" goto :ExitSVN
Modified: trunk/tools/RosBE-Windows/Root/scut.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/scut.cmd?r... ============================================================================== --- trunk/tools/RosBE-Windows/Root/scut.cmd (original) +++ trunk/tools/RosBE-Windows/Root/scut.cmd Sun Oct 21 20:26:02 2007 @@ -35,7 +35,7 @@ :: :DEF echo Choose your Source Folder: -SET /P XY= +set /P XY= :RUN grep name="%XY%" "%_ROSBE_BASEDIR%\srclist.xml"|cutz dir > "%_ROSBE_BASEDIR%\aaa.tmp" test -s "%_ROSBE_BASEDIR%\aaa.tmp" @@ -69,10 +69,10 @@
:ADD1 echo Choose your Shortcut: -SET /P CUT= +set /P CUT= :ADD2 echo Choose your Source Folder: -SET /P DIR= +set /P DIR= :ADD23 echo ^<property name="%CUT%" value="%DIR%" /^> > "%_ROSBE_BASEDIR%\aaa.tmp" copy "%_ROSBE_BASEDIR%\srclist.xml" + "%_ROSBE_BASEDIR%\aaa.tmp" "%_ROSBE_BASEDIR%\srclist2.xml" @@ -90,7 +90,7 @@ goto :REM1 ) echo Choose your Shortcut: -SET /P CUTREM= +set /P CUTREM= :REM1 grep name="%CUTREM%" "%_ROSBE_BASEDIR%\srclist.xml"|cutz dir > "%_ROSBE_BASEDIR%\aaa.tmp" test -s "%_ROSBE_BASEDIR%\aaa.tmp" @@ -115,7 +115,7 @@ goto :DEF1 ) echo Choose your new Default Shortcut: -SET /P DEF= +set /P DEF= :DEF1 grep name="%DEF%" "%_ROSBE_BASEDIR%\srclist.xml"|cutz dir > "%_ROSBE_BASEDIR%\aaa.tmp" test -s "%_ROSBE_BASEDIR%\aaa.tmp"
-
peterw＠svn.reactos.org