more general module loading; do not use __dict__ directly

[mass-build.git] / build_system.py

diff --git a/build_system.py b/build_system.py
index 63a236ef5431f7a6a781b07b6abed706af4b2ac4..1697dc63813d326b9855a2a7a41dc98c3f5d1909 100644 (file)
--- 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".'''
 
@@ -67,12 +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
-               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,8 +98,7 @@ 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,
                        }
                        # copy some more optional configuration
@@ -111,8 +110,7 @@ try:
                                        autoDebuildConfig[option] = self.config[option]
                        # create Debian files
                        os.chdir(self.sourceFolder)
-                       if os.path.isdir('debian'): # clean previous build attempts
-                               shutil.rmtree('debian')
+                       auto_debuild.deleteDebianFolder()
                        files = auto_debuild.createDebianFiles(autoDebuildConfig)
                        # build package(s)
                        auto_debuild.buildDebianPackage(autoDebuildConfig)