Make config inherited

[mass-build.git] / build_system.py

diff --git a/build_system.py b/build_system.py
index 197d7ac08feb3d84b83cb8aab89d151fa5bb690f..8325aeda98c62e2ddaba9c1d6cc5e71ee0b1eb13 100644 (file)
--- a/build_system.py
+++ b/build_system.py
@@ -4,16 +4,10 @@ import os, shutil, subprocess
 
 # Compile, build, and install cmake projects:
 class CMake:
-       def __init__(self, sourceFolder, buildFolder, projectConfig, globalConfig):
+       def __init__(self, sourceFolder, buildFolder, config):
                self.sourceFolder = os.path.abspath(sourceFolder)
                self.buildFolder = os.path.abspath(buildFolder)
-               self.installDir = globalConfig['installDir']
-               self.buildType = globalConfig['buildType']
-               self.jobs = globalConfig['jobs']
-               self.buildCmdPrefix = globalConfig['buildCmdPrefix']
-               self.installCmdPrefix = globalConfig['installCmdPrefix']
-               self.waitAfterConfig = globalConfig.get('waitAfterConfig', False)
-               self.projectConfig = projectConfig
+               self.config = config
        
        def build(self, reconfigure=False):
                # Make sure we have a build directory
@@ -23,54 +17,49 @@ class CMake:
                cacheFile = 'CMakeCache.txt'
                if os.path.exists(cacheFile) and reconfigure: os.remove(cacheFile)
                # Run cmake
-               os.putenv('PKG_CONFIG_PATH', os.path.join(self.installDir, 'lib', 'pkgconfig')) # I found no way to do this within cmake
-               subprocess.check_call(['cmake', self.sourceFolder, '-DCMAKE_BUILD_TYPE='+self.buildType,
-                       '-DCMAKE_INSTALL_PREFIX='+self.installDir]+self.projectConfig.get('cmakeParameters', []))
+               os.putenv('PKG_CONFIG_PATH', os.path.join(self.config['installDir'], 'lib', 'pkgconfig')) # I found no way to do this within cmake
+               subprocess.check_call(['cmake', self.sourceFolder, '-DCMAKE_BUILD_TYPE='+self.config['buildType'],
+                       '-DCMAKE_INSTALL_PREFIX='+self.config['installDir']]+self.config.get('cmakeParameters', []))
                os.unsetenv('PKG_CONFIG_PATH')
                # if asked to do so, wait
-               if self.waitAfterConfig:
+               if self.config['waitAfterConfig']:
                        raw_input('Configuration done. Hit "Enter" to build the project. ')
                # run compilation
-               subprocess.check_call(self.buildCmdPrefix + ['make', '-j'+str(self.jobs)])
+               subprocess.check_call(self.config['buildCmdPrefix'] + ['make', '-j'+str(self.config['jobs'])])
                # run installation
-               subprocess.check_call(self.installCmdPrefix + ['make', 'install'])
+               subprocess.check_call(self.config['installCmdPrefix'] + ['make', 'install'])
 
 # if auto-debuild is available, provide a wrapper for it
 try:
        import auto_debuild
        class AutoDebuild:
-               def __init__(self, sourceFolder, buildFolder, projectConfig, vcs, globalConfig):
+               def __init__(self, sourceFolder, buildFolder, config, vcs):
                        self.sourceFolder = os.path.abspath(sourceFolder)
                        self.buildFolder = os.path.abspath(buildFolder)
-                       self.jobs = globalConfig['jobs']
-                       self.debDir = os.path.abspath(globalConfig['debDir'])
-                       self.debName = globalConfig['debName']
-                       self.debEMail = globalConfig['debEMail']
-                       self.waitAfterConfig = globalConfig.get('waitAfterConfig', False)
-                       self.projectConfig = projectConfig
+                       self.debFolder = os.path.abspath(config['debDir'])
+                       self.config = config
                        self.vcs = vcs
 
                def build(self, reconfigure=False): # reconfigure is ignored (we always do a reconfiguration)
                        # create auto-debuild configuration
                        autoDebuildConfig = {
-                               'sourceName': self.projectConfig['name'],
-                               'buildSystem': self.projectConfig['buildSystem'],
-                               'debDir': self.debDir,
+                               'sourceName': self.config['name'],
+                               'buildSystem': self.config['buildSystem'],
+                               'debDir': self.debFolder,
                                'buildDir': self.buildFolder,
-                               'name': self.debName,
-                               'email': self.debEMail,
-                               'parallelJobs': self.jobs,
+                               'name': self.config['debName'],
+                               'email': self.config['debEMail'],
+                               'parallelJobs': self.config['jobs'],
                                'version': self.vcs.version(),
-                               'waitAfterConfig': self.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',
+                       for option in ('waitAfterConfig',  'dbgPackage', 'section', 'withPython2', 'binarySkipFiles', 'binaryInstallFiles',
                                        'buildDepends', 'binaryDepends', 'binaryRecommends', 'binaryProvides', 'binaryConflicts',
-                                       'cmakeParameters', 'automakeParameters'):
-                               if option in self.projectConfig:
-                                       autoDebuildConfig[option] = self.projectConfig[option]
+                                       'alternatives', 'cmakeParameters', 'automakeParameters'):
+                               if option in self.config:
+                                       autoDebuildConfig[option] = self.config[option]
                        # create Debian files
                        os.chdir(self.sourceFolder)
                        if os.path.isdir('debian'): # clean previous build attempts
@@ -79,7 +68,8 @@ try:
                        # build package(s)
                        auto_debuild.buildDebianPackage(autoDebuildConfig)
                        # install package(s)
-                       subprocess.check_call(['sudo', 'dpkg', '--install'] + files)
+                       if self.config.get('debInstall', True):
+                               subprocess.check_call(['sudo', 'dpkg', '--install'] + files)
 
 except ImportError:
        #print "auto_debuild not found, disabling auto-debuild system"