[dreimer] 27556: - SVN is now useable the way you know it. - Cut paths to apps. Useless and looks better.
Author: dreimer Date: Tue Jul 10 13:13:23 2007 New Revision: 27556
URL: http://svn.reactos.org/svn/reactos?rev=27556&view=rev Log: - SVN is now useable the way you know it. - Cut paths to apps. Useless and looks better.
Modified: trunk/tools/RosBE-Windows/Root/Build-Multi.cmd trunk/tools/RosBE-Windows/Root/Build-Shared.cmd trunk/tools/RosBE-Windows/Root/Config.cmd trunk/tools/RosBE-Windows/Root/RAddr.cmd trunk/tools/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE-Windows/Root/TimeDate.cmd trunk/tools/RosBE-Windows/Root/sSVN.cmd trunk/tools/RosBE-Windows/RosBE.nsi
Modified: trunk/tools/RosBE-Windows/Root/Build-Multi.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Build-Mult... ============================================================================== --- trunk/tools/RosBE-Windows/Root/Build-Multi.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Build-Multi.cmd Tue Jul 10 13:13:23 2007 @@ -25,7 +25,7 @@ :: -x1 - Number of CPUs, Plus 1. :: -x2 - Number of CPUs, Doubled. :: -for /f "usebackq" %%i in (`"%ROSBEBASEDIR%\Tools\cpucount.exe" -x1`) do set CPUCOUNT=%%i +for /f "usebackq" %%i in (`cpucount -x1`) do set CPUCOUNT=%%i
:: :: Set the build command
Modified: trunk/tools/RosBE-Windows/Root/Build-Shared.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Build-Shar... ============================================================================== --- trunk/tools/RosBE-Windows/Root/Build-Shared.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Build-Shared.cmd Tue Jul 10 13:13:23 2007 @@ -41,7 +41,7 @@ :: abort the build and inform the user. :: if exist "%_ROSSOURCEDIR%\config.rbuild" ( - "%ROSBEBASEDIR%\Tools\test.exe" "%_ROSSOURCEDIR%\config.template.rbuild" -nt "%_ROSSOURCEDIR%\config.rbuild" + test "%_ROSSOURCEDIR%\config.template.rbuild" -nt "%_ROSSOURCEDIR%\config.rbuild" if not errorlevel 1 ( echo. echo *** config.template.rbuild is newer than config.rbuild *** @@ -60,12 +60,12 @@ :: :: Now use mingw32-make to build ReactOS, passing along options, if any. :: -call "%ROSBEBASEDIR%\Tools\buildtime.exe" %MAKE_COMMAND% 2>&1 | "%ROSBEBASEDIR%\Tools\tee.exe" "%_ROSBELOGDIR%\BuildLog-%_MINGWVERSION%-%DATENAME%-%TIMENAME%.txt" +call buildtime %MAKE_COMMAND% 2>&1 | tee "%_ROSBELOGDIR%\BuildLog-%_MINGWVERSION%-%DATENAME%-%TIMENAME%.txt"
:: :: Highlight the fact that building has ended. :: -call "%ROSBEBASEDIR%\Tools\flash.exe" +call flash
goto :EOB
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 Tue Jul 10 13:13:23 2007 @@ -17,8 +17,8 @@ ) else ( echo Main Configuration File was not found in ReactOS Source Tree. ) - if exist "%ROSBEBASEDIR%\Tools\config.rbuild" ( - del %ROSBEBASEDIR%\Tools\config.rbuild + if exist "%ROSBEBASEDIR%\config.rbuild" ( + del %ROSBEBASEDIR%\config.rbuild echo Working Configuration File was found and deleted. ) else ( echo Working Configuration File was not found in ReactOS Source Tree. @@ -30,8 +30,8 @@ goto :NOK )
-if not exist "%ROSBEBASEDIR%\Tools\config.rbuild" ( - copy "%_ROSSOURCEDIR%\config.template.rbuild" "%ROSBEBASEDIR%\Tools\config.rbuild" +if not exist "%ROSBEBASEDIR%\config.rbuild" ( + copy "%_ROSSOURCEDIR%\config.template.rbuild" "%ROSBEBASEDIR%\config.rbuild" )
echo WARNING: @@ -50,16 +50,16 @@ echo Architecture to build for. Not Editable. echo. echo Right now -call "%ROSBEBASEDIR%\Tools\grep.exe" "ARCH" %ROSBEBASEDIR%\Tools\config.rbuild|"%ROSBEBASEDIR%\Tools\cut.exe" -d """ -f 4 +call grep "ARCH" %ROSBEBASEDIR%\config.rbuild|cut -d """ -f 4 echo.
echo Sub-architecture to build for. echo Default is: none echo. echo Right now -call "%ROSBEBASEDIR%\Tools\grep.exe" "SARCH" %ROSBEBASEDIR%\Tools\config.rbuild|"%ROSBEBASEDIR%\Tools\cut.exe" -d """ -f 4 +call grep "SARCH" %ROSBEBASEDIR%\config.rbuild|cut -d """ -f 4 SET /P X= (), (xbox) -call "%ROSBEBASEDIR%\Tools\sed.exe" "s/"SARCH" value=""/"SARCH" value="%X%"/g;s/"SARCH" value="xbox"/"SARCH" value="%X%"/g" %ROSBEBASEDIR%\Tools\config.rbuild > %ROSBEBASEDIR%\Tools\config2.rbuild +call sed "s/"SARCH" value=""/"SARCH" value="%X%"/g;s/"SARCH" value="xbox"/"SARCH" value="%X%"/g" %ROSBEBASEDIR%\config.rbuild > %ROSBEBASEDIR%\config2.rbuild cls
echo Which CPU ReactOS should be optimized for. @@ -70,9 +70,9 @@ echo Default is: pentium echo. echo Right now -call "%ROSBEBASEDIR%\Tools\grep.exe" "OARCH" %ROSBEBASEDIR%\Tools\config.rbuild|"%ROSBEBASEDIR%\Tools\cut.exe" -d """ -f 4 +call grep "OARCH" %ROSBEBASEDIR%\config.rbuild|cut -d """ -f 4 SET /P XX= -call "%ROSBEBASEDIR%\Tools\sed.exe" "s/"OARCH" value=".*"/"OARCH" value="%XX%"/g" %ROSBEBASEDIR%\Tools\config2.rbuild > %ROSBEBASEDIR%\Tools\config21.rbuild +call sed "s/"OARCH" value=".*"/"OARCH" value="%XX%"/g" %ROSBEBASEDIR%\config2.rbuild > %ROSBEBASEDIR%\config21.rbuild cls
echo What level do you want ReactOS to be optimized at. @@ -83,27 +83,27 @@ echo warning : 2,3,4,5 is not tested on ReactOS. Change at own risk. echo. echo Right now -call "%ROSBEBASEDIR%\Tools\grep.exe" "OPTIMIZE" %ROSBEBASEDIR%\Tools\config.rbuild|"%ROSBEBASEDIR%\Tools\cut.exe" -d """ -f 4 +call grep "OPTIMIZE" %ROSBEBASEDIR%\config.rbuild|cut -d """ -f 4 SET /P Y= (0), (1), (2), (3), (4), (5) -call "%ROSBEBASEDIR%\Tools\sed.exe" "s/"OPTIMIZE" value="[0-5]"/"OPTIMIZE" value="%Y%"/g" %ROSBEBASEDIR%\Tools\config21.rbuild > %ROSBEBASEDIR%\Tools\config3.rbuild +call sed "s/"OPTIMIZE" value="[0-5]"/"OPTIMIZE" value="%Y%"/g" %ROSBEBASEDIR%\config21.rbuild > %ROSBEBASEDIR%\config3.rbuild cls
echo Whether to compile for an uniprocessor or multiprocessor machine. echo Default is: 0 echo. echo Right now -call "%ROSBEBASEDIR%\Tools\grep.exe" "MP" %ROSBEBASEDIR%\Tools\config.rbuild|"%ROSBEBASEDIR%\Tools\cut.exe" -d """ -f 4 +call grep "MP" %ROSBEBASEDIR%\config.rbuild|cut -d """ -f 4 SET /P Z= (0), (1) -call "%ROSBEBASEDIR%\Tools\sed.exe" "s/"MP" value="[0-1]"/"MP" value="%Z%"/g" %ROSBEBASEDIR%\Tools\config3.rbuild > %ROSBEBASEDIR%\Tools\config4.rbuild +call sed "s/"MP" value="[0-1]"/"MP" value="%Z%"/g" %ROSBEBASEDIR%\config3.rbuild > %ROSBEBASEDIR%\config4.rbuild cls
echo Whether to compile in the integrated kernel debugger. echo Default is: 0 echo. echo Right now -call "%ROSBEBASEDIR%\Tools\grep.exe" "KDBG" %ROSBEBASEDIR%\Tools\config.rbuild|"%ROSBEBASEDIR%\Tools\cut.exe" -d """ -f 4 +call grep "KDBG" %ROSBEBASEDIR%\config.rbuild|cut -d """ -f 4 SET /P A= (0), (1) -call "%ROSBEBASEDIR%\Tools\sed.exe" "s/"KDBG" value="[0-1]"/"KDBG" value="%A%"/g" %ROSBEBASEDIR%\Tools\config4.rbuild > %ROSBEBASEDIR%\Tools\config5.rbuild +call sed "s/"KDBG" value="[0-1]"/"KDBG" value="%A%"/g" %ROSBEBASEDIR%\config4.rbuild > %ROSBEBASEDIR%\config5.rbuild cls
echo Whether to compile for debugging. No compiler optimizations will be @@ -111,9 +111,9 @@ echo Default is: 1 echo. echo Right now -call "%ROSBEBASEDIR%\Tools\grep.exe" "DBG" %ROSBEBASEDIR%\Tools\config.rbuild|"%ROSBEBASEDIR%\Tools\cut.exe" -d """ -f 4 +call grep "DBG" %ROSBEBASEDIR%\config.rbuild|cut -d """ -f 4 SET /P B= (0), (1) -call "%ROSBEBASEDIR%\Tools\sed.exe" "s/"DBG" value="[0-1]"/"DBG" value="%B%"/g" %ROSBEBASEDIR%\Tools\config5.rbuild > %ROSBEBASEDIR%\Tools\config6.rbuild +call sed "s/"DBG" value="[0-1]"/"DBG" value="%B%"/g" %ROSBEBASEDIR%\config5.rbuild > %ROSBEBASEDIR%\config6.rbuild cls
echo Whether to compile for debugging with GDB. If you don't use GDB, @@ -121,9 +121,9 @@ echo Default is: 0 echo. echo Right now -call "%ROSBEBASEDIR%\Tools\grep.exe" "GDB" %ROSBEBASEDIR%\Tools\config.rbuild|"%ROSBEBASEDIR%\Tools\cut.exe" -d """ -f 4 +call grep "GDB" %ROSBEBASEDIR%\config.rbuild|cut -d """ -f 4 SET /P C= (0), (1) -call "%ROSBEBASEDIR%\Tools\sed.exe" "s/"GDB" value="[0-1]"/"GDB" value="%C%"/g" %ROSBEBASEDIR%\Tools\config6.rbuild > %ROSBEBASEDIR%\Tools\config7.rbuild +call sed "s/"GDB" value="[0-1]"/"GDB" value="%C%"/g" %ROSBEBASEDIR%\config6.rbuild > %ROSBEBASEDIR%\config7.rbuild cls
echo Whether to compile apps/libs with features covered software patents @@ -133,18 +133,18 @@ echo Default is: 0 echo. echo Right now -call "%ROSBEBASEDIR%\Tools\grep.exe" "NSWPAT" %ROSBEBASEDIR%\Tools\config.rbuild|"%ROSBEBASEDIR%\Tools\cut.exe" -d """ -f 4 +call grep "NSWPAT" %ROSBEBASEDIR%\config.rbuild|cut -d """ -f 4 SET /P D= (0), (1) -call "%ROSBEBASEDIR%\Tools\sed.exe" "s/"NSWPAT" value="[0-1]"/"NSWPAT" value="%D%"/g" %ROSBEBASEDIR%\Tools\config7.rbuild > %ROSBEBASEDIR%\Tools\config8.rbuild +call sed "s/"NSWPAT" value="[0-1]"/"NSWPAT" value="%D%"/g" %ROSBEBASEDIR%\config7.rbuild > %ROSBEBASEDIR%\config8.rbuild cls
echo Whether to compile with NT-compatible LPC Semantics. This should echo always be 1. echo. echo Right now -call "%ROSBEBASEDIR%\Tools\grep.exe" "NTLPC" %ROSBEBASEDIR%\Tools\config.rbuild|"%ROSBEBASEDIR%\Tools\cut.exe" -d """ -f 4 +call grep "NTLPC" %ROSBEBASEDIR%\config.rbuild|cut -d """ -f 4 SET /P E= (0), (1) -call "%ROSBEBASEDIR%\Tools\sed.exe" "s/"NTLPC" value="[0-1]"/"NTLPC" value="%E%"/g" %ROSBEBASEDIR%\Tools\config8.rbuild > %ROSBEBASEDIR%\Tools\config9.rbuild +call sed "s/"NTLPC" value="[0-1]"/"NTLPC" value="%E%"/g" %ROSBEBASEDIR%\config8.rbuild > %ROSBEBASEDIR%\config9.rbuild cls
echo Whether to compile with the KD protocol. This will disable support for @@ -156,15 +156,15 @@ echo Default is: 0 echo. echo Right now -call "%ROSBEBASEDIR%\Tools\grep.exe" "_WINKD_" %ROSBEBASEDIR%\Tools\config.rbuild|"%ROSBEBASEDIR%\Tools\cut.exe" -d """ -f 4 +call grep "_WINKD_" %ROSBEBASEDIR%\config.rbuild|cut -d """ -f 4 SET /P F= (0), (1) -call "%ROSBEBASEDIR%\Tools\sed.exe" "s/"_WINKD_" value="[0-1]"/"_WINKD_" value="%F%"/g" %ROSBEBASEDIR%\Tools\config9.rbuild > %ROSBEBASEDIR%\Tools\config10.rbuild +call sed "s/"_WINKD_" value="[0-1]"/"_WINKD_" value="%F%"/g" %ROSBEBASEDIR%\config9.rbuild > %ROSBEBASEDIR%\config10.rbuild
-copy %ROSBEBASEDIR%\Tools\config10.rbuild %ROSBEBASEDIR%\Tools\config.tmp -del %ROSBEBASEDIR%\Tools*.rbuild -copy %ROSBEBASEDIR%\Tools\config.tmp %ROSBEBASEDIR%\Tools\config.rbuild -del %ROSBEBASEDIR%\Tools*.tmp -copy %ROSBEBASEDIR%\Tools\config.rbuild %_ROSSOURCEDIR%\config.rbuild +copy %ROSBEBASEDIR%\config10.rbuild %ROSBEBASEDIR%\config.tmp +del %ROSBEBASEDIR%*.rbuild +copy %ROSBEBASEDIR%\config.tmp %ROSBEBASEDIR%\config.rbuild +del %ROSBEBASEDIR%*.tmp +copy %ROSBEBASEDIR%\config.rbuild %_ROSSOURCEDIR%\config.rbuild
goto :NOK
Modified: trunk/tools/RosBE-Windows/Root/RAddr.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RAddr.cmd?... ============================================================================== --- trunk/tools/RosBE-Windows/Root/RAddr.cmd (original) +++ trunk/tools/RosBE-Windows/Root/RAddr.cmd Tue Jul 10 13:13:23 2007 @@ -35,15 +35,15 @@ SET /P ADDR= echo. echo. -"%ROSBEBASEDIR%\Tools\raddr2line.exe" %EXE% %ADDR% +raddr2line %EXE% %ADDR% goto :EOF
:AUTO1 echo Set the Address you wanna analyze inside the Executable. SET /P ADDR= -"%ROSBEBASEDIR%\Tools\raddr2line.exe" %1 %ADDR% +raddr2line %1 %ADDR% goto :EOF
:AUTO2 -"%ROSBEBASEDIR%\Tools\raddr2line.exe" %1 %2 +raddr2line %1 %2 goto :EOF
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 Tue Jul 10 13:13:23 2007 @@ -27,10 +27,12 @@ :EndCommandParse
:: -:: Save our initial directory (should be the ReactOS source directory) +:: Save our initial directory (should be the ReactOS source directory) +:: and add PATH for Tools Folder. :: set _ROSSOURCEDIR=%CD% set _ROSSRCDIRBCK=%CD% +set PATH=%ROSBEBASEDIR%\Tools;%PATH%
:: :: Display the current version of GCC, NASM, ld and make. @@ -55,7 +57,7 @@ :: :: Look if the Source Folder is empty. If so, ask for using "svn create". :: -dir /b %_ROSSOURCEDIR% 2>nul|"%ROSBEBASEDIR%\Tools\grep.exe" -e ".*" >nul +dir /b %_ROSSOURCEDIR% 2>nul|grep -e ".*" >nul if errorlevel 1 ( echo No ReactOS Source detected. Please use "svn create" to download it. goto :ExitRosBE
Modified: trunk/tools/RosBE-Windows/Root/TimeDate.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/TimeDate.c... ============================================================================== --- trunk/tools/RosBE-Windows/Root/TimeDate.cmd (original) +++ trunk/tools/RosBE-Windows/Root/TimeDate.cmd Tue Jul 10 13:13:23 2007 @@ -20,7 +20,7 @@ :: :: Get the raw date and time. :: -for /f "usebackq tokens=1" %%u in (`"%ROSBEBASEDIR%\Tools\getdate.exe"`) do set DATERAW=%%u +for /f "usebackq tokens=1" %%u in (`getdate`) do set DATERAW=%%u for /f "usebackq tokens=1" %%u in (`time /t`) do set TIMERAW=%%u
::
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 Tue Jul 10 13:13:23 2007 @@ -18,15 +18,15 @@ if "%1" == "update" ( title Updating... if not "%2" == "" ( - %ROSBEBASEDIR%\Tools\svn.exe update %_ROSSOURCEDIR% -r %2 + svn update %_ROSSOURCEDIR% -r %2 ) else ( - %ROSBEBASEDIR%\Tools\svn.exe update %_ROSSOURCEDIR% + svn update %_ROSSOURCEDIR% ) goto :ExitSVN ) if "%1" == "cleanup" ( title Cleaning... - %ROSBEBASEDIR%\Tools\svn.exe cleanup %_ROSSOURCEDIR% + svn cleanup %_ROSSOURCEDIR% goto :ExitSVN ) :: @@ -39,9 +39,9 @@ echo Folder already cotains a Reposority. Exiting goto :ExitSVN ) - dir /b %_ROSSOURCEDIR% 2>nul|"%ROSBEBASEDIR%\Tools\grep.exe" -e ".*" >nul + dir /b %_ROSSOURCEDIR% 2>nul|grep -e ".*" >nul if errorlevel 1 ( - %ROSBEBASEDIR%\Tools\svn.exe checkout svn://svn.reactos.org/reactos/trunk/reactos %_ROSSOURCEDIR% + svn checkout svn://svn.reactos.org/reactos/trunk/reactos %_ROSSOURCEDIR% ) else ( echo Folder is not empty. Continuing is dangerous and can cause errors. ABORTED ) @@ -49,14 +49,14 @@ ) if "%1" == "status" ( title Status - call "%ROSBEBASEDIR%\Tools\svn.exe" info %_ROSSOURCEDIR% > "%ROSBEBASEDIR%\x.tmp" + call svn info %_ROSSOURCEDIR% > "%ROSBEBASEDIR%\x.tmp" echo Recent Offline Revision: - call "%ROSBEBASEDIR%\Tools\grep.exe" Revision: %ROSBEBASEDIR%\x.tmp|"%ROSBEBASEDIR%\Tools\cut.exe" -d " " -f 2 + call grep Revision: %ROSBEBASEDIR%\x.tmp|cut -d " " -f 2 del "%ROSBEBASEDIR%\x.tmp"
- call "%ROSBEBASEDIR%\Tools\svn.exe" info svn://svn.reactos.org/reactos/trunk/reactos > "%ROSBEBASEDIR%\x.tmp" + call svn info svn://svn.reactos.org/reactos/trunk/reactos > "%ROSBEBASEDIR%\x.tmp" echo Online HEAD Revision: - call "%ROSBEBASEDIR%\Tools\grep.exe" Revision: %ROSBEBASEDIR%\x.tmp|"%ROSBEBASEDIR%\Tools\cut.exe" -d " " -f 2 + call grep Revision: %ROSBEBASEDIR%\x.tmp|cut -d " " -f 2 del "%ROSBEBASEDIR%\x.tmp" goto :ExitSVN )
Modified: trunk/tools/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/RosBE.nsi?rev=2... ============================================================================== --- trunk/tools/RosBE-Windows/RosBE.nsi (original) +++ trunk/tools/RosBE-Windows/RosBE.nsi Tue Jul 10 13:13:23 2007 @@ -197,6 +197,7 @@ Delete /REBOOTOK "$INSTDIR\readme.pdf" Delete /REBOOTOK "$INSTDIR\reactos.ico" Delete /REBOOTOK "$INSTDIR\RosBE.mac" + Delete /REBOOTOK "$INSTDIR\config.rbuild" Delete /REBOOTOK "$INSTDIR\Uninstall-${PRODUCT_VERSION}.exe" IfFileExists "$DESKTOP\ReactOS Build Environment.lnk" 0 +2 Delete /REBOOTOK "$DESKTOP\ReactOS Build Environment.lnk"
-
dreimer＠svn.reactos.org