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 e18d9ffa98545ca16fab9ccfece768b931cea020..78039f19e77b649c8d876837cb66c268e206df01 100644 (file)
--- a/build_system.py
+++ b/build_system.py
@@ -4,36 +4,77 @@ 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
-               self.buildType = config.buildType
-               self.jobs = config.jobs
-               self.buildCmdPrefix = config.buildCmdPrefix
-               self.installCmdPrefix = config.installCmdPrefix
+               self.installDir = config['installDir']
+               self.buildType = config['buildType']
+               self.jobs = config['jobs']
+               self.buildCmdPrefix = config['buildCmdPrefix']
+               self.installCmdPrefix = config['installCmdPrefix']
+               self.cmakeParameters = module.get('cmakeParameters', [])
        
-       def configure(self, force=False):
-               print "Configuring",self.sourceFolder
+       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):
-               print "Building",self.sourceFolder
-               os.chdir(self.buildFolder)
+               # run compilation
                subprocess.check_call(self.buildCmdPrefix + ['make', '-j'+str(self.jobs)])
-       
-       def install(self):
-               print "Installing",self.sourceFolder
-               os.chdir(self.buildFolder)
+               # run installation
                subprocess.check_call(self.installCmdPrefix + ['make', 'install'])
 
-# TODO: class Debian, which creates & install a debian package
+# if auto-debuild is available, provide a wrapper for it
+try:
+       import auto_debuild
+       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.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
+                       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)
+
+except ImportError:
+       print "auto_debuild not found, disabling auto-debuild system"
+       pass