forward installFiles option; debian folder is no longer persistent

[mass-build.git] / build_system.py

diff --git a/build_system.py b/build_system.py
index 073d432663ee5143f3c49831e18f0bca3747690c..6e72e71e9b8eed6713bc5a3a789133f5a9deee6a 100644 (file)
--- a/build_system.py
+++ b/build_system.py
@@ -4,7 +4,7 @@ import os, subprocess
 
 # Compile, build, and install cmake projects:
 class CMake:
-       def __init__(self, sourceFolder, buildFolder, config):
+       def __init__(self, sourceFolder, buildFolder, module, config):
                self.sourceFolder = os.path.abspath(sourceFolder)
                self.buildFolder = os.path.abspath(buildFolder)
                self.installDir = config['installDir']
@@ -12,6 +12,7 @@ class CMake:
                self.jobs = config['jobs']
                self.buildCmdPrefix = config['buildCmdPrefix']
                self.installCmdPrefix = config['installCmdPrefix']
+               self.cmakeParameters = module.get('cmakeParameters', [])
        
        def configure(self, force=False):
                if not os.path.exists(self.buildFolder): os.makedirs(self.buildFolder)
@@ -22,7 +23,8 @@ class CMake:
                # yes we do! make sure we start clean, and then go ahead
                if os.path.exists(cacheFile): os.remove(cacheFile)
                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])
+               subprocess.check_call(['cmake', self.sourceFolder, '-DCMAKE_BUILD_TYPE='+self.buildType,
+                       '-DCMAKE_INSTALL_PREFIX='+self.installDir]+self.cmakeParameters)
                os.unsetenv('PKG_CONFIG_PATH')
        
        def build(self):
@@ -37,16 +39,52 @@ class CMake:
 try:
        import auto_debuild
        class AutoDebuild:
-               def __init__(self, sourceFolder, module):
-                       self.autoDebuildConfig = {}
+               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.vcs = vcs
+                       self.configured = False # make sure configure is called before build/install
+
+               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 configure(self, force=False): # force is ignored
+                       self.autoDebuildConfig['version'] = self.vcs.version() # by now, data has been fetched, so this is possible
+                       if self.autoDebuildConfig['version'] is None:
+                               raise Exception("VCS did not provide us with a proper version, please fix this")
+                       os.chdir(self.sourceFolder)
+                       #print self.autoDebuildConfig
                        self.files = auto_debuild.createDebianFiles(self.autoDebuildConfig)
+                       self.configured = True
 
                def build(self):
+                       if not self.configured: self.configure()
+                       os.chdir(self.sourceFolder)
                        auto_debuild.buildDebianPackage(self.autoDebuildConfig)
 
                def install(self):
+                       if not self.configured: self.configure()
+                       os.chdir(self.sourceFolder)
                        subprocess.check_call(['sudo', 'dpkg', '--install'] + self.files)
 except ImportError:
+       print "auto_debuild not found, disabling auto-debuild system"
        pass