From: Ralf Jung <post@ralfj.de>
Date: Wed, 18 Sep 2013 13:25:32 +0000 (+0200)
Subject: Auto-configure build parallelism
X-Git-Url: https://git.ralfj.de/mass-build.git/commitdiff_plain/073fbf0d51a2a96e2277671d61401bc15698b935?ds=sidebyside;hp=acc616e24b4d936037076f3915d1bc35cb197f2e

Auto-configure build parallelism
---

diff --git a/build_system.py b/build_system.py
index 634f73d..9dceb7d 100644
--- a/build_system.py
+++ b/build_system.py
@@ -15,7 +15,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
-import os, shutil, subprocess
+import os, shutil, subprocess, multiprocessing
 
 '''A build system must have a "build" method with parameters "reconfigure" and "waitAfterConfig".'''
 
@@ -69,10 +69,10 @@ class CMake:
 		if waitAfterConfig:
 			input('Configuration done. Hit "Enter" to build the project. ')
 		# run compilation
-		jobs = int(self.config['jobs'])
+		jobs = multiprocessing.cpu_count()+1
 		subprocess.check_call(self.config.get('buildCmdPrefix', []) + ['make', '-j'+str(jobs)])
 		# run installation
-		subprocess.check_call(self.config.get('installCmdPrefix', []) + ['make', 'install', '-j'+str((jobs+1)/2)]) # jobs/2, rounded up
+		subprocess.check_call(self.config.get('installCmdPrefix', []) + ['make', 'install', '-j'+str((jobs+1)//2)]) # jobs/2, rounded up
 
 # if auto-debuild is available, provide a wrapper for it
 try:
@@ -98,7 +98,6 @@ try:
 				'buildDir': self.buildFolder,
 				'name': self.config['debName'],
 				'email': self.config['debEMail'],
-				'parallelJobs': self.config['jobs'],
 				'version': versionName + self.config.get('versionSuffix', ''),
 				'waitAfterConfig': waitAfterConfig,
 			}