Build add-ons with jom to speed up the windows binary add-ons builds

popcornmix · Mar 15, 2017 · cf2272f · cf2272f
1 parent 4ce8df8
commit cf2272f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/tools/buildsteps/win32/bootstrap-addons.bat b/tools/buildsteps/win32/bootstrap-addons.bat
@@ -18,7 +18,10 @@ if "%1" == "clean" (
 )
 
 rem set Visual C++ build environment
-call "%VS140COMNTOOLS%..\..\VC\bin\vcvars32.bat"
+if not defined DevEnvDir (
+:: without this if not defined the script can not be run several times in the same cmd.exe
+  call "%VS140COMNTOOLS%..\..\VC\bin\vcvars32.bat"
+)
 
 SET WORKDIR=%WORKSPACE%
 
@@ -32,6 +35,7 @@ IF "%WORKDIR%" == "" (
 )
 
 rem setup some paths that we need later
+SET BUILD_ON_CORES=8
 SET CUR_PATH=%CD%
 SET BASE_PATH=%WORKDIR%\cmake
 SET ADDONS_PATH=%BASE_PATH%\addons
@@ -81,7 +85,7 @@ IF ERRORLEVEL 1 (
 )
 
 rem execute nmake to prepare the buildsystem
-nmake
+"%WORKDIR%\tools\windows\buildtools\jom.exe" -j%BUILD_ON_CORES%
 IF ERRORLEVEL 1 (
   ECHO nmake failed with error level: %ERRORLEVEL%
 )

diff --git a/tools/buildsteps/win32/make-addons.bat b/tools/buildsteps/win32/make-addons.bat
@@ -24,7 +24,10 @@ FOR %%b IN (%*) DO (
 SETLOCAL DisableDelayedExpansion
 
 rem set Visual C++ build environment
-call "%VS140COMNTOOLS%..\..\VC\bin\vcvars32.bat"
+if not defined DevEnvDir (
+:: without this if not defined the script can not be run several times in the same cmd.exe
+  call "%VS140COMNTOOLS%..\..\VC\bin\vcvars32.bat"
+)
 
 SET WORKDIR=%base_dir%
 
@@ -38,6 +41,7 @@ IF "%WORKDIR%" == "" (
 )
 
 rem setup some paths that we need later
+SET BUILD_ON_CORES=8
 SET CUR_PATH=%CD%
 SET BASE_PATH=%WORKDIR%\cmake
 SET SCRIPTS_PATH=%BASE_PATH%\scripts\windows
@@ -134,13 +138,13 @@ rem loop over all addons to build
 FOR %%a IN (%ADDONS_TO_MAKE%) DO (
   ECHO Building %%a...
   rem execute nmake to build the addons
-  nmake %%a
+  "%WORKDIR%\tools\windows\buildtools\jom.exe" %%a -j%BUILD_ON_CORES%
   IF ERRORLEVEL 1 (
     ECHO nmake %%a error level: %ERRORLEVEL% > %ERRORFILE%
     ECHO %%a >> %ADDONS_FAILURE_FILE%
   ) ELSE (
     if %package% == true (
-      nmake package-%%a
+      "%WORKDIR%\tools\windows\buildtools\jom.exe" package-%%a -j%BUILD_ON_CORES%
       IF ERRORLEVEL 1 (
         ECHO nmake package-%%a error level: %ERRORLEVEL% > %ERRORFILE%
         ECHO %%a >> %ADDONS_FAILURE_FILE%