module -> project; allow building all projects within a folder

[mass-build.git] / build_system.py

diff --git a/build_system.py b/build_system.py
index 14877d41562339beda7b861dc20288aede1a4a6e..197d7ac08feb3d84b83cb8aab89d151fa5bb690f 100644 (file)
--- a/build_system.py
+++ b/build_system.py
@@ -1,19 +1,19 @@
 import os, shutil, subprocess
 
-'''A build system has three methods: "configure" (with optionak "force" parameter), "build" and "install"'''
+'''A build system must have a "build" method with an optional "reconfigure" parameter.'''
 
 # Compile, build, and install cmake projects:
 class CMake:
-       def __init__(self, sourceFolder, buildFolder, module, config):
+       def __init__(self, sourceFolder, buildFolder, projectConfig, globalConfig):
                self.sourceFolder = os.path.abspath(sourceFolder)
                self.buildFolder = os.path.abspath(buildFolder)
-               self.installDir = config['installDir']
-               self.buildType = config['buildType']
-               self.jobs = config['jobs']
-               self.buildCmdPrefix = config['buildCmdPrefix']
-               self.installCmdPrefix = config['installCmdPrefix']
-               self.waitAfterConfig = config.get('waitAfterConfig', False)
-               self.module = module
+               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
        
        def build(self, reconfigure=False):
                # Make sure we have a build directory
@@ -25,11 +25,11 @@ class CMake:
                # 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.module.get('cmakeParameters', []))
+                       '-DCMAKE_INSTALL_PREFIX='+self.installDir]+self.projectConfig.get('cmakeParameters', []))
                os.unsetenv('PKG_CONFIG_PATH')
                # if asked to do so, wait
                if self.waitAfterConfig:
-                       raw_input('Configuration done. Hit "Enter" to build the module. ')
+                       raw_input('Configuration done. Hit "Enter" to build the project. ')
                # run compilation
                subprocess.check_call(self.buildCmdPrefix + ['make', '-j'+str(self.jobs)])
                # run installation
@@ -39,22 +39,22 @@ class CMake:
 try:
        import auto_debuild
        class AutoDebuild:
-               def __init__(self, sourceFolder, buildFolder, module, vcs, config):
+               def __init__(self, sourceFolder, buildFolder, projectConfig, vcs, globalConfig):
                        self.sourceFolder = os.path.abspath(sourceFolder)
                        self.buildFolder = os.path.abspath(buildFolder)
-                       self.jobs = config['jobs']
-                       self.debDir = os.path.abspath(config['debDir'])
-                       self.debName = config['debName']
-                       self.debEMail = config['debEMail']
-                       self.waitAfterConfig = config.get('waitAfterConfig', False)
-                       self.module = module
+                       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.vcs = vcs
 
                def build(self, reconfigure=False): # reconfigure is ignored (we always do a reconfiguration)
                        # create auto-debuild configuration
                        autoDebuildConfig = {
-                               'sourceName': self.module['name'],
-                               'buildSystem': self.module['buildSystem'],
+                               'sourceName': self.projectConfig['name'],
+                               'buildSystem': self.projectConfig['buildSystem'],
                                'debDir': self.debDir,
                                'buildDir': self.buildFolder,
                                'name': self.debName,
@@ -69,8 +69,8 @@ try:
                        for option in ('dbgPackage', 'section', 'withPython2', 'binarySkipFiles', 'binaryInstallFiles',
                                        'buildDepends', 'binaryDepends', 'binaryRecommends', 'binaryProvides', 'binaryConflicts',
                                        'cmakeParameters', 'automakeParameters'):
-                               if option in self.module:
-                                       autoDebuildConfig[option] = self.module[option]
+                               if option in self.projectConfig:
+                                       autoDebuildConfig[option] = self.projectConfig[option]
                        # create Debian files
                        os.chdir(self.sourceFolder)
                        if os.path.isdir('debian'): # clean previous build attempts