Author: peterw Date: Fri Dec 7 13:10:02 2007 New Revision: 31053
URL: http://svn.reactos.org/svn/reactos?rev=31053&view=rev Log: - Some formatting changes and cleanup.
Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd trunk/tools/RosBE/RosBE-Windows/Root/README.odt trunk/tools/RosBE/RosBE-Windows/Root/chdefdir.cmd trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd trunk/tools/RosBE/RosBE-Windows/Root/reladdr2line.cmd trunk/tools/RosBE/RosBE-Windows/RosBE.nsi trunk/tools/RosBE/RosBE-Windows/Tools/makefile
Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Buil... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd Fri Dec 7 13:10:02 2007 @@ -104,44 +104,44 @@ goto :EOC
:BUILD -if %_ROSBE_SHOWTIME% == 1 ( - if %_ROSBE_WRITELOG% == 1 ( - "%_ROSBE_BASEDIR%\Tools\buildtime.exe" "%_ROSBE_MINGWMAKE%" %* 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_GCCVERSION%-%DATENAME%-%TIMENAME%.txt" + if %_ROSBE_SHOWTIME% == 1 ( + if %_ROSBE_WRITELOG% == 1 ( + "%_ROSBE_BASEDIR%\Tools\buildtime.exe" "%_ROSBE_MINGWMAKE%" %* 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_GCCVERSION%-%DATENAME%-%TIMENAME%.txt" + ) else ( + "%_ROSBE_BASEDIR%\Tools\buildtime.exe" "%_ROSBE_MINGWMAKE%" %* + ) ) else ( - "%_ROSBE_BASEDIR%\Tools\buildtime.exe" "%_ROSBE_MINGWMAKE%" %* + if %_ROSBE_WRITELOG% == 1 ( + "%_ROSBE_MINGWMAKE%" %* 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_GCCVERSION%-%DATENAME%-%TIMENAME%.txt" + ) else ( + "%_ROSBE_MINGWMAKE%" %* + ) ) -) else ( - if %_ROSBE_WRITELOG% == 1 ( - "%_ROSBE_MINGWMAKE%" %* 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_GCCVERSION%-%DATENAME%-%TIMENAME%.txt" - ) else ( - "%_ROSBE_MINGWMAKE%" %* - ) -) goto :EOF
:BUILDMULTI -:: -:: Get the number of CPUs in the system so we know how many jobs to execute. -:: To modify the number used alter the options used with cpucount: -:: No Option - Number of CPUs. -:: -x1 - Number of CPUs, plus 1. -:: -x2 - Number of CPUs, doubled. -:: -for /f "usebackq" %%i in (`"%_ROSBE_BASEDIR%\Tools\cpucount.exe" -x1`) do set CPUCOUNT=%%i + :: + :: Get the number of CPUs in the system so we know how many jobs to execute. + :: To modify the number used alter the options used with cpucount: + :: No Option - Number of CPUs. + :: -x1 - Number of CPUs, plus 1. + :: -x2 - Number of CPUs, doubled. + :: + for /f "usebackq" %%i in (`"%_ROSBE_BASEDIR%\Tools\cpucount.exe" -x1`) do set CPUCOUNT=%%i
-if %_ROSBE_SHOWTIME% == 1 ( - if %_ROSBE_WRITELOG% == 1 ( - "%_ROSBE_BASEDIR%\Tools\buildtime.exe" "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %2 %3 %4 %5 %6 %7 %8 %9 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_GCCVERSION%-%DATENAME%-%TIMENAME%.txt" + if %_ROSBE_SHOWTIME% == 1 ( + if %_ROSBE_WRITELOG% == 1 ( + "%_ROSBE_BASEDIR%\Tools\buildtime.exe" "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %2 %3 %4 %5 %6 %7 %8 %9 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_GCCVERSION%-%DATENAME%-%TIMENAME%.txt" + ) else ( + "%_ROSBE_BASEDIR%\Tools\buildtime.exe" "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %2 %3 %4 %5 %6 %7 %8 %9 + ) ) else ( - "%_ROSBE_BASEDIR%\Tools\buildtime.exe" "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %2 %3 %4 %5 %6 %7 %8 %9 + if %_ROSBE_WRITELOG% == 1 ( + "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %2 %3 %4 %5 %6 %7 %8 %9 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_GCCVERSION%-%DATENAME%-%TIMENAME%.txt" + ) else ( + "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %2 %3 %4 %5 %6 %7 %8 %9 + ) ) -) else ( - if %_ROSBE_WRITELOG% == 1 ( - "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %2 %3 %4 %5 %6 %7 %8 %9 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_GCCVERSION%-%DATENAME%-%TIMENAME%.txt" - ) else ( - "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %2 %3 %4 %5 %6 %7 %8 %9 - ) -) goto :EOF
:EOC
Modified: trunk/tools/RosBE/RosBE-Windows/Root/README.odt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/READ... ============================================================================== Binary files - no diff available.
Modified: trunk/tools/RosBE/RosBE-Windows/Root/chdefdir.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/chde... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/chdefdir.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/chdefdir.cmd Fri Dec 7 13:10:02 2007 @@ -36,11 +36,11 @@ :: If Parameters were set, parse them, if not, ask the user to add them. :: :INTERACTIVE -set /p _1="Please enter a ReactOS source directory, or 'previous': " -if "%_1%" == "" ( - echo ERROR: You must enter a ReactOS source directory, or 'previous'. - goto :EOC -) + set /p _1="Please enter a ReactOS source directory, or 'previous': " + if "%_1%" == "" ( + echo ERROR: You must enter a ReactOS source directory, or 'previous'. + goto :EOC + ) goto :EOF
:EOC
Modified: trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/chde... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd Fri Dec 7 13:10:02 2007 @@ -35,11 +35,11 @@ goto :EOC
:INTERACTIVE -set /p _1="Please enter a MinGW/GCC directory (don't use quotes): " -if "%_1%" == "" ( - echo ERROR: You must enter a MinGW/GCC directory. - goto :EOC -) + set /p _1="Please enter a MinGW/GCC directory (don't use quotes): " + if "%_1%" == "" ( + echo ERROR: You must enter a MinGW/GCC directory. + goto :EOC + ) goto :EOF
:EOC
Modified: trunk/tools/RosBE/RosBE-Windows/Root/reladdr2line.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/rela... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/reladdr2line.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/reladdr2line.cmd Fri Dec 7 13:10:02 2007 @@ -28,43 +28,43 @@ ) call :INTERACTIVE
-:RADD2RLINE :: :: First get the ImageBase of the File. If its smaller than the given :: Parameter, everything is ok, because it was already added onto the :: adress and can be given directly to raddr2line. If not, add it and :: give the result to raddr2line. :: -if "%_1%" == "" ( - echo ERROR: You must specify a path/file to examine. - goto :EOC -) -if "%_2%" == "" ( - echo ERROR: You must specify a address to analyze. - goto :EOC -) -echo %_1% -for /f "tokens=2" %%i in ('"objdump -p %_1% 2>NUL | findstr ImageBase"') do set baseaddr=0x%%i -if %%i lss %_2% ( - "%_ROSBE_BASEDIR%\Tools\raddr2line.exe" "%_1%" "%_2%" -) else ( - set /a baseaddr+=0x%_2% - for /f %%i in ('""%_ROSBE_BASEDIR%\Tools\echoh.exe" %baseaddr%"') do set relbase=%%i - "%_ROSBE_BASEDIR%\Tools\raddr2line.exe" "%_1%" "%relbase%" -) +:RADD2RLINE + if "%_1%" == "" ( + echo ERROR: You must specify a path/file to examine. + goto :EOC + ) + if "%_2%" == "" ( + echo ERROR: You must specify a address to analyze. + goto :EOC + ) + echo %_1% + for /f "tokens=2" %%i in ('"objdump -p %_1% 2>NUL | findstr ImageBase"') do set baseaddr=0x%%i + if %%i lss %_2% ( + "%_ROSBE_BASEDIR%\Tools\raddr2line.exe" "%_1%" "%_2%" + ) else ( + set /a baseaddr+=0x%_2% + for /f %%i in ('""%_ROSBE_BASEDIR%\Tools\echoh.exe" %baseaddr%"') do set relbase=%%i + "%_ROSBE_BASEDIR%\Tools\raddr2line.exe" "%_1%" "%relbase%" + ) goto :EOC
:: :: If Parameters were set, parse them, if not, ask the user to add them. :: :INTERACTIVE -if "%_1%" == "" ( - set /p _1="Please enter the path/file to be examined: " - call :CHECKPATH -) -if "%_2%" == "" ( - set /p _2="Please enter the address you would like to analyze: " -) + if "%_1%" == "" ( + set /p _1="Please enter the path/file to be examined: " + call :CHECKPATH + ) + if "%_2%" == "" ( + set /p _2="Please enter the address you would like to analyze: " + ) goto :EOF
::
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 (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE.nsi Fri Dec 7 13:10:02 2007 @@ -36,10 +36,9 @@ !include "LogicLib.nsh" !include "x64.nsh"
-;; MUI begin. - -;; -;; Read our custom page ini, remove previous version. +;; +;; Read our custom page ini, remove previous version and make sure only +;; one instance of the installer is running. ;; Function .onInit System::Call 'kernel32::CreateMutexA(i 0, i 0, t "RosBE-v${PRODUCT_VERSION}-Installer") i .r1 ?e' @@ -91,7 +90,7 @@ !insertmacro MUI_PAGE_INSTFILES
!define MUI_FINISHPAGE_TITLE_3LINES -!define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\readme.pdf" +!define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\README.pdf" !define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED !insertmacro MUI_PAGE_FINISH
@@ -105,8 +104,6 @@ ;; ReserveFile "${NSISDIR}\Plugins\InstallOptions.dll" !insertmacro MUI_LANGUAGE "English" - -;; MUI end.
Section -BaseFiles SEC01 SetShellVarContext current
Modified: trunk/tools/RosBE/RosBE-Windows/Tools/makefile URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/mak... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/makefile (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/makefile Fri Dec 7 13:10:02 2007 @@ -47,4 +47,4 @@ $(STRIP) tee$(SUFFIX)
clean: - del /f buildtime.exe chknewer.exe chkslash.exe echoh.exe flash.exe getdate.exe scut.exe tee.exe + del /f buildtime.exe chknewer.exe chkslash.exe echoh.exe flash.exe getdate.exe rquote.exe scut.exe tee.exe