Simplify build system interface: There is simply a single function to trigger configu...

[mass-build.git] / build_system.py

diff --git a/build_system.py b/build_system.py
index 5634f9dd1be6e10ce87ae56274f40686d2c234f7..78039f19e77b649c8d876837cb66c268e206df01 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,57 +12,69 @@ class CMake:
                self.jobs = config['jobs']
                self.buildCmdPrefix = config['buildCmdPrefix']
                self.installCmdPrefix = config['installCmdPrefix']
+               self.cmakeParameters = module.get('cmakeParameters', [])
        
-       def configure(self, force=False):
+       def build(self, reconfigure=False):
+               # Make sure we have a build directory
                if not os.path.exists(self.buildFolder): os.makedirs(self.buildFolder)
                os.chdir(self.buildFolder)
-               # check if we actually need to work
+               # In case of reconfiguration, delete cache file if it exists
                cacheFile = 'CMakeCache.txt'
-               if os.path.exists(cacheFile) and os.path.exists('Makefile') and not force: return
-               # yes we do! make sure we start clean, and then go ahead
-               if os.path.exists(cacheFile): os.remove(cacheFile)
+               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])
+               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):
-               os.chdir(self.buildFolder)
+               # run compilation
                subprocess.check_call(self.buildCmdPrefix + ['make', '-j'+str(self.jobs)])
-       
-       def install(self):
-               os.chdir(self.buildFolder)
+               # run installation
                subprocess.check_call(self.installCmdPrefix + ['make', 'install'])
 
 # if auto-debuild is available, provide a wrapper for it
 try:
        import auto_debuild
        class AutoDebuild:
-               def __init__(self, sourceFolder, module, vcs, config):
+               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': module.get('build-system', 'cmake'),
+                               '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 configure(self, force=False): # force is ignored
-                       self.autoDebuildConfig['version'] = self.vcs.version() # by now, data has been fetched, so this is possible
-                       os.chdir(self.sourceFolder)
-                       print self.sourceFolder,self.autoDebuildConfig
-                       self.files = auto_debuild.createDebianFiles(self.autoDebuildConfig)
-                       self.configured = True
+               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):
-                       if not self.configured: self.configure()
+               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
+                       if self.autoDebuildConfig['version'] is None:
+                               raise Exception("VCS did not provide us with a proper version, please fix this")
+                       # create Debian files
                        os.chdir(self.sourceFolder)
+                       files = auto_debuild.createDebianFiles(self.autoDebuildConfig)
+                       # build package(s)
                        auto_debuild.buildDebianPackage(self.autoDebuildConfig)
+                       # install package(s)
+                       subprocess.check_call(['sudo', 'dpkg', '--install'] + files)
 
-               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