reactos/RosBE
1
0
Fork 0
mirror of https://github.com/reactos/RosBE.git synced 2025-02-17 09:48:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert my last change, even if i still think it was a good one.

Browse Source 
svn path=/trunk/tools/RosBE/; revision=795
This commit is contained in:
Daniel Reimer 2008-08-20 19:50:53 +00:00
parent 6bfbf1fec2
commit 53f6647074
2 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
RosBE-Windows/Root/Build.cmd
View File

@ -102,21 +102,12 @@ if %_ROSBE_WRITELOG% == 1 (
)
)
::
:: 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 :EOC
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

2
RosBE-Windows/Root/RosBE.mac
View File

@ -7,7 +7,7 @@ CONFIG = "%_ROSBE_BASEDIR%\Config.cmd" $*
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" $*