Merge with 3.5

1 files changed, 9 insertions, 0 deletions

diff --git a/PCbuild/build.bat b/PCbuild/build.bat
index fa9f403..3f8e231 100644
--- a/PCbuild/build.bat
+++ b/PCbuild/build.bat
@@ -9,8 +9,10 @@ rem  -r  Target Rebuild instead of Build
 rem  -t  Set the target manually (Build, Rebuild, Clean, or CleanAll)

 rem  -d  Set the configuration to Debug

 rem  -e  Pull in external libraries using get_externals.bat

+rem  -m  Enable parallel build (enabled by default)

 rem  -M  Disable parallel build

 rem  -v  Increased output messages

+rem  -k  Attempt to kill any running Pythons before building (usually unnecessary)

 

 setlocal

 set platf=Win32

@@ -20,6 +22,7 @@ set target=Build
 set dir=%~dp0

 set parallel=/m

 set verbose=/nologo /v:m

+set kill=

 

 :CheckOpts

 if '%1'=='-c' (set conf=%2) & shift & shift & goto CheckOpts

@@ -28,14 +31,20 @@ if '%1'=='-r' (set target=Rebuild) & shift & goto CheckOpts
 if '%1'=='-t' (set target=%2) & shift & shift & goto CheckOpts

 if '%1'=='-d' (set conf=Debug) & shift & goto CheckOpts

 if '%1'=='-e' call "%dir%get_externals.bat" & shift & goto CheckOpts

+if '%1'=='-m' (set parallel=/m) & shift & goto CheckOpts

 if '%1'=='-M' (set parallel=) & shift & goto CheckOpts

 if '%1'=='-v' (set verbose=/v:n) & shift & goto CheckOpts

+if '%1'=='-k' (set kill=true) & shift & goto CheckOpts

 

 if '%platf%'=='x64' (set vs_platf=x86_amd64)

 

 rem Setup the environment

 call "%dir%env.bat" %vs_platf% >nul

 

+if '%kill%'=='true' (

+    msbuild /v:m /nologo /target:KillPython "%pcbuild%\pythoncore.vcxproj" /p:Configuration=%conf% /p:Platform=%platf% /p:KillPython=true

+)

+

 rem Call on MSBuild to do the work, echo the command.

 rem Passing %1-9 is not the preferred option, but argument parsing in

 rem batch is, shall we say, "lackluster"