Merge af8f88b into 49168d5

LeonarddeR · web-flow · commit a3d4a2affe51 · 2022-01-14T04:34:42.000+10:00
diff --git a/appveyor/scripts/setSconsArgs.ps1 b/appveyor/scripts/setSconsArgs.ps1
@@ -15,6 +15,8 @@ if(!$env:APPVEYOR_PULL_REQUEST_NUMBER) {
 	$sconsArgs += " certFile=appveyor\authenticode.pfx certTimestampServer=http://timestamp.digicert.com"
 }
 $sconsArgs += " version_build=$env:APPVEYOR_BUILD_NUMBER"
+# Use only 1 concurrent job when building
+$sconsArgs += "-j1"
 # We use cmd to run scons because PowerShell throws exceptions if warnings get dumped to stderr.
 # It's possible to work around this, but the workarounds have annoying side effects.
 Set-AppveyorBuildVariable "sconsOutTargets" $sconsOutTargets
diff --git a/sconstruct b/sconstruct
@@ -7,6 +7,7 @@
 import sys
 import os
 import platform
+import multiprocessing
 
 # Ensure we are inside the Python virtual environment.
 nvdaVenv = os.getenv("NVDA_VENV")
@@ -121,9 +122,14 @@ env = Environment(variables=vars,HOST_ARCH='x86',tools=[
 	"recursiveInstall"
 ])
 
-# speed up subsiquent runs by checking timestamps of targets and dependencies, and only using md5 if timestamps differ.
+# speed up subsequent runs by checking timestamps of targets and dependencies, and only using md5 if timestamps differ.
 env.Decider('MD5-timestamp')
 
+# Make sure to run the build on multiple threads so it runs faster
+env.SetOption('num_jobs', multiprocessing.cpu_count())
+realNumJobs = env.GetOption('num_jobs')
+print(f"Building using {realNumJobs} job{'s' if realNumJobs != 1 else ''}")
+
 #Make our recursiveCopy function available to any script using this environment
 env.AddMethod(recursiveCopy)
 

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,8 @@ if(!$env:APPVEYOR_PULL_REQUEST_NUMBER) {`
`15`	`15`	`$sconsArgs += " certFile=appveyor\authenticode.pfx certTimestampServer=http://timestamp.digicert.com"`
`16`	`16`	`}`
`17`	`17`	`$sconsArgs += " version_build=$env:APPVEYOR_BUILD_NUMBER"`
	`18`	`+# Use only 1 concurrent job when building`
	`19`	`+$sconsArgs += "-j1"`
`18`	`20`	`# We use cmd to run scons because PowerShell throws exceptions if warnings get dumped to stderr.`
`19`	`21`	`# It's possible to work around this, but the workarounds have annoying side effects.`
`20`	`22`	`Set-AppveyorBuildVariable "sconsOutTargets" $sconsOutTargets`