Author: dreimer
Date: Wed Aug 20 14:50:53 2008
New Revision: 35488
URL:
http://svn.reactos.org/svn/reactos?rev=35488&view=rev
Log:
Revert my last change, even if i still think it was a good one.
Modified:
trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd
trunk/tools/RosBE/RosBE-Windows/Root/RosBE.mac
Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Bui…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd [iso-8859-1] Wed Aug 20 14:50:53 2008
@@ -103,20 +103,11 @@
)
::
-:: 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.
-:: -a - Determine the cpu count based on the inherited process affinity mask.
-::
-for /f "usebackq" %%i in (`"%_ROSBE_BASEDIR%\Tools\cpucount.exe"
-x1`) do set CPUCOUNT=%%i
-::
:: Check if we are using -j or not.
::
-if %CPUCOUNT% GTR 2 (
- if not "%1" == "" (
- title 'makex %1' parallel build started: %TIMERAW%
+if "%1" == "multi" (
+ if not "%2" == "" (
+ title 'makex %2' parallel build started: %TIMERAW%
) else (
title 'makex' parallel build started: %TIMERAW%
)
@@ -148,17 +139,27 @@
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.
+ :: -a - Determine the cpu count based on the inherited process affinity mask.
+ ::
+ 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>&1 |
"%_ROSBE_BASEDIR%\Tools\tee.exe"
"%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_GCCVERSION%-%DATENAME%-%TIMENAME%.txt"
+ "%_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% %*
+ "%_ROSBE_BASEDIR%\Tools\buildtime.exe"
"%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %2 %3 %4 %5 %6 %7 %8 %9
)
) else (
if %_ROSBE_WRITELOG% == 1 (
- "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %* 2>&1 |
"%_ROSBE_BASEDIR%\Tools\tee.exe"
"%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_GCCVERSION%-%DATENAME%-%TIMENAME%.txt"
+ "%_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% %*
+ "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %2 %3 %4 %5 %6 %7 %8 %9
)
)
goto :EOF
Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.mac
URL:
http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Ros…
==============================================================================
--- trunk/tools/RosBE/RosBE-Windows/Root/RosBE.mac [iso-8859-1] (original)
+++ trunk/tools/RosBE/RosBE-Windows/Root/RosBE.mac [iso-8859-1] Wed Aug 20 14:50:53 2008
@@ -7,7 +7,7 @@
ENV = set
HELP = "%_ROSBE_BASEDIR%\Help.cmd" $*
MAKE = "%_ROSBE_BASEDIR%\Build.cmd" $*
-MAKEX = "%_ROSBE_BASEDIR%\Build.cmd" $*
+MAKEX = "%_ROSBE_BASEDIR%\Build.cmd" multi $*
RADDR2LINE = "%_ROSBE_BASEDIR%\reladdr2line.cmd" $*
RENV = for /f "usebackq tokens=*" %i in (`set _ROSBE_`) do @echo %i
SCUT = "%_ROSBE_BASEDIR%\scut.cmd" $*