Move loading a module by filename into a helper function

[mass-build.git] / build_system.py

diff --git a/build_system.py b/build_system.py
index 83df7e2d466b1fc111ecb0034d051af1d6e3ad2b..9dceb7df7e689e7782a69ef3fa9462f2ff5e953e 100644 (file)
--- a/build_system.py
+++ b/build_system.py
@@ -1,5 +1,5 @@
 # mass-build - Easily Build Software Involving a Large Amount of Source Repositories
-# Copyright (C) 2012 Ralf Jung <post@ralfj.de>
+# Copyright (C) 2012-2013 Ralf Jung <post@ralfj.de>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -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".'''
 
@@ -67,11 +67,12 @@ class CMake:
                self.restoreEnv('XDG_CONFIG_DIRS', oldXDGConfigDirs)
                # if asked to do so, wait
                if waitAfterConfig:
-                       raw_input('Configuration done. Hit "Enter" to build the project. ')
+                       input('Configuration done. Hit "Enter" to build the project. ')
                # run compilation
-               subprocess.check_call(self.config.get('buildCmdPrefix', []) + ['make', '-j'+str(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'])
+               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:
@@ -85,8 +86,11 @@ try:
                        self.vcs = vcs
 
                def build(self, reconfigure, waitAfterConfig): # reconfigure is ignored (we always do a reconfiguration)
-                       # create auto-debuild configuration
+                       # get version name
                        versionName = self.config['versionName'] if 'versionName' in self.config else self.vcs.version()
+                       if versionName is None:
+                               raise Exception("VCS did not provide us with a proper version number, please provide one manually")
+                       # create auto-debuild configuration
                        autoDebuildConfig = {
                                'sourceName': self.config['name'],
                                'buildSystem': self.config['buildSystem'],
@@ -94,15 +98,12 @@ try:
                                'buildDir': self.buildFolder,
                                'name': self.config['debName'],
                                'email': self.config['debEMail'],
-                               'parallelJobs': self.config['jobs'],
-                               'version': versionName,
+                               'version': versionName + self.config.get('versionSuffix', ''),
                                'waitAfterConfig': waitAfterConfig,
                        }
-                       if autoDebuildConfig['version'] is None:
-                               raise Exception("VCS did not provide us with a proper version number, please fix this")
                        # copy some more optional configuration
-                       for option in ('dbgPackage', 'section', 'withPython2', 'binarySkipFiles', 'binaryInstallFiles',
-                                       'buildDepends', 'binaryDepends', 'binaryRecommends', 'binaryProvides', 'binaryConflicts', 'binaryBreaks',
+                       for option in ('epoch', 'dbgPackage', 'section', 'withPython2', 'withSIP', 'binarySkipFiles', 'binaryInstallFiles',
+                                       'buildDepends', 'binaryDepends', 'binaryShims', 'binaryRecommends', 'binaryProvides', 'binaryConflicts', 'binaryBreaks',
                                        'binaryReplaces', 'binaryBreaksReplaces',
                                        'alternatives', 'cmakeParameters', 'automakeParameters'):
                                if option in self.config: