Merge pull request #2407 from shoelzer/master

Enable parallel builds with Visual Studio and MSBuild
buildbot · Sep 23, 2016 · a1a93b7 · a1a93b7
2 parents fc42c14 + 7a4270c
commit a1a93b7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/master/buildbot/steps/vstudio.py b/master/buildbot/steps/vstudio.py
@@ -448,7 +448,7 @@ def start(self):
             config.error(
                 'platform is mandatory. Please specify a string such as "Win32"')
 
-        command = ('"%%VCENV_BAT%%" x86 && msbuild "%s" /p:Configuration="%s" /p:Platform="%s"'
+        command = ('"%%VCENV_BAT%%" x86 && msbuild "%s" /p:Configuration="%s" /p:Platform="%s" /maxcpucount'
                    % (self.projectfile, self.config, self.platform))
 
         if self.project is not None:

diff --git a/master/buildbot/test/unit/test_steps_vstudio.py b/master/buildbot/test/unit/test_steps_vstudio.py
@@ -794,7 +794,7 @@ def test_build_project(self):
 
         self.expectCommands(
             ExpectShell(workdir='wkdir',
-                        command='"%VCENV_BAT%" x86 && msbuild "pf" /p:Configuration="cfg" /p:Platform="Win32" /t:"pj"',
+                        command='"%VCENV_BAT%" x86 && msbuild "pf" /p:Configuration="cfg" /p:Platform="Win32" /maxcpucount /t:"pj"',
                         env={'VCENV_BAT': r'${VS110COMNTOOLS}..\..\VC\vcvarsall.bat'})
             + 0
         )
@@ -808,7 +808,7 @@ def test_build_solution(self):
 
         self.expectCommands(
             ExpectShell(workdir='wkdir',
-                        command='"%VCENV_BAT%" x86 && msbuild "pf" /p:Configuration="cfg" /p:Platform="x64" /t:Rebuild',
+                        command='"%VCENV_BAT%" x86 && msbuild "pf" /p:Configuration="cfg" /p:Platform="x64" /maxcpucount /t:Rebuild',
                         env={'VCENV_BAT': r'${VS110COMNTOOLS}..\..\VC\vcvarsall.bat'})
             + 0
         )

diff --git a/master/docs/relnotes/0.9.0.rst b/master/docs/relnotes/0.9.0.rst
@@ -176,7 +176,7 @@ Individual features and improvements to the Data API are not described on this p
 
 * EC2LatentWorker supports VPCs, instance profiles, and advanced volume mounts.
 
-* new steps for Visual Studio 2015 (VS2015, VC14, and MsBuild14).
+* New steps for Visual Studio 2015 (VS2015, VC14, and MsBuild14).
 
 * The :bb:step:`P4` step now obfuscates the password in status logs.
 
@@ -200,6 +200,8 @@ Individual features and improvements to the Data API are not described on this p
 
 * new :bb:step:`GitHub` which correctly checkout the magic branch like ``refs/pull/xx/merge``.
 
+* Enable parallel builds with Visual Studio and MSBuild.
+
 Reporters
 ~~~~~~~~~