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 478503ef9a900fbcc4954018dce5b61fe2d9c397..9dceb7df7e689e7782a69ef3fa9462f2ff5e953e 100644 (file)
--- a/build_system.py
+++ b/build_system.py
@@ -1,4 +1,21 @@
-import os, shutil, subprocess
+# mass-build - Easily Build Software Involving a Large Amount of Source Repositories
+# 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
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# 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, multiprocessing

 
 '''A build system must have a "build" method with parameters "reconfigure" and "waitAfterConfig".'''
 
 
 '''A build system must have a "build" method with parameters "reconfigure" and "waitAfterConfig".'''
 


@@ -50,11 +67,12 @@ class CMake:
                self.restoreEnv('XDG_CONFIG_DIRS', oldXDGConfigDirs)
                # if asked to do so, wait
                if waitAfterConfig:
                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
                # 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
                # 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:
 
 # if auto-debuild is available, provide a wrapper for it
 try:


@@ -68,8 +86,11 @@ try:
                        self.vcs = vcs
 
                def build(self, reconfigure, waitAfterConfig): # reconfigure is ignored (we always do a reconfiguration)
                        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()
                        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'],
                        autoDebuildConfig = {
                                'sourceName': self.config['name'],
                                'buildSystem': self.config['buildSystem'],


@@ -77,15 +98,12 @@ try:
                                'buildDir': self.buildFolder,
                                'name': self.config['debName'],
                                'email': self.config['debEMail'],
                                '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,
                        }
                                '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
                        # 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:
                                        'binaryReplaces', 'binaryBreaksReplaces',
                                        'alternatives', 'cmakeParameters', 'automakeParameters'):
                                if option in self.config: