rewuire a build system to be specified for auto-debuild; build auto-debuild configura...

diff --git a/build_system.py b/build_system.py
index 78039f19e77b649c8d876837cb66c268e206df01..2e10aed32425644878128ebe572cf401202c90c7 100644 (file)
--- a/build_system.py
+++ b/build_system.py
@@ -12,7 +12,7 @@ class CMake:
                self.jobs = config['jobs']
                self.buildCmdPrefix = config['buildCmdPrefix']
                self.installCmdPrefix = config['installCmdPrefix']
-               self.cmakeParameters = module.get('cmakeParameters', [])
+               self.module = module
        
        def build(self, reconfigure=False):
                # Make sure we have a build directory
@@ -24,7 +24,7 @@ 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.cmakeParameters)
+                       '-DCMAKE_INSTALL_PREFIX='+self.installDir]+self.module.get('cmakeParameters', []))
                os.unsetenv('PKG_CONFIG_PATH')
                # run compilation
                subprocess.check_call(self.buildCmdPrefix + ['make', '-j'+str(self.jobs)])
@@ -37,41 +37,38 @@ try:
        class AutoDebuild:
                def __init__(self, sourceFolder, buildFolder, module, vcs, config):
                        self.sourceFolder = os.path.abspath(sourceFolder)
-                       buildSystem = module.get('build-system', 'cmake')
-                       self.autoDebuildConfig = {
-                               'sourceName': module['name'],
-                               'debDir': os.path.abspath(config['debDir']),
-                               'buildSystem': buildSystem,
-                               'buildDir': os.path.abspath(buildFolder),
-                               'name': config['debName'],
-                               'email': config['debEMail'],
-                       }
-                       self.copyOption(config, 'jobs', 'parallelJobs')
-                       self.copyOption(module, 'dbgPackage')
-                       self.copyOption(module, 'skipFiles', 'binarySkipFiles')
-                       self.copyOption(module, 'installFiles', 'binaryInstall')
-                       self.copyOption(module, 'buildDepends')
-                       self.copyOption(module, 'binaryDepends')
-                       self.copyOption(module, 'binaryRecommends')
-                       if buildSystem == 'cmake':
-                               self.copyOption(module, 'cmakeParameters')
+                       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.module = module
                        self.vcs = vcs
 
-               def copyOption(self, src, name, dstName = None):
-                       if dstName is None: dstName = name # per default, stick with original name
-                       if name in src:
-                               self.autoDebuildConfig[dstName] = src[name]
-
                def build(self, reconfigure=False): # reconfigure is ignored (we always do a reconfiguration)
-                       # Get us a version number
-                       self.autoDebuildConfig['version'] = self.vcs.version() # by now, data has been fetched, so this is possible
+                       # create auto-debuild configuration
+                       autoDebuildConfig = {
+                               'sourceName': self.module['name'],
+                               'buildSystem': self.module['build-system'],
+                               'debDir': self.debDir,
+                               'buildDir': self.buildFolder,
+                               'name': self.debName,
+                               'email': self.debEMail,
+                               'parallelJobs': self.jobs,
+                               'version': self.vcs.version()
+                       }
                        if self.autoDebuildConfig['version'] is None:
-                               raise Exception("VCS did not provide us with a proper version, please fix this")
+                               raise Exception("VCS did not provide us with a proper version number, please fix this")
+                       # copy some more optional configuration
+                       for option in ('dbgPackage', 'binarySkipFiles', 'binaryInstallFiles', 'buildDepends', 'binaryDepends', 'binaryRecommends',
+                                       'binaryProvides', 'cmakeParameters', 'automakeParameters'):
+                               if option in self.module:
+                                       autoDebuildConfig[option] = self.module[option]
                        # create Debian files
                        os.chdir(self.sourceFolder)
-                       files = auto_debuild.createDebianFiles(self.autoDebuildConfig)
+                       files = auto_debuild.createDebianFiles(autoDebuildConfig)
                        # build package(s)
-                       auto_debuild.buildDebianPackage(self.autoDebuildConfig)
+                       auto_debuild.buildDebianPackage(autoDebuildConfig)
                        # install package(s)
                        subprocess.check_call(['sudo', 'dpkg', '--install'] + files)