Load environment in a separate file, support parallel builds.

mozilla-services · Oct 20, 2014 · d87b0c0 · d87b0c0
1 parent f0f1e44
commit d87b0c0
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -41,6 +41,9 @@ Features
 
 * Added option to disable re-using TCP connections to the ElasticSearch output
 
+* Added separate env loading file and support for NUM_JOBS env var to Windows
+  build (#971).
+
 0.7.3 (2014-MM-DD)
 ==================
 

diff --git a/build.bat b/build.bat
@@ -1,13 +1,9 @@
 @echo off
-set BUILD_DIR=%CD%\build
-set CTEST_OUTPUT_ON_FAILURE=1
+call env.bat
 
-setlocal ENABLEDELAYEDEXPANSION
-set NEWGOPATH=%BUILD_DIR%\heka
-if NOT "%GOBIN%"=="" (set p=!PATH:%GOBIN%;=!) else (set p=!PATH!)
-endlocal & set GOPATH=%NEWGOPATH%& set GOBIN=%NEWGOPATH%\bin& set PATH=%p%;%NEWGOPATH%\bin;
+if "%NUM_JOBS%"=="" (set NUM_JOBS=1)
 
 if NOT exist %BUILD_DIR% mkdir %BUILD_DIR%
 cd %BUILD_DIR%
 cmake -DINCLUDE_MOZSVC=false -DCMAKE_BUILD_TYPE=release -G"MinGW Makefiles" ..
-mingw32-make
+mingw32-make -j %NUM_JOBS%
diff --git a/env.bat b/env.bat
@@ -0,0 +1,8 @@
+@echo off
+set BUILD_DIR=%CD%\build
+set CTEST_OUTPUT_ON_FAILURE=1
+
+setlocal ENABLEDELAYEDEXPANSION
+set NEWGOPATH=%BUILD_DIR%\heka
+if NOT "%GOBIN%"=="" (set p=!PATH:%GOBIN%;=!) else (set p=!PATH!)
+endlocal & set GOPATH=%NEWGOPATH%& set GOBIN=%NEWGOPATH%\bin& set PATH=%p%;%NEWGOPATH%\bin;