rename some options for a more consistent naming; fix auto-debuild build system

[mass-build.git] / build_system.py

diff --git a/build_system.py b/build_system.py
index 979a47ac35e078c8200f7e60b3888d14e97d983d..975c2c558103579cd245a87b9a2e646caea5aecd 100644 (file)
--- a/build_system.py
+++ b/build_system.py
@@ -12,27 +12,23 @@ class CMake:
                self.jobs = config['jobs']
                self.buildCmdPrefix = config['buildCmdPrefix']
                self.installCmdPrefix = config['installCmdPrefix']
                self.jobs = config['jobs']
                self.buildCmdPrefix = config['buildCmdPrefix']
                self.installCmdPrefix = config['installCmdPrefix']

-               self.cmakeParameters = module.get('cmakeParameters', [])
+               self.module = module

        
        

-       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)
                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'
                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,
                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')
                os.unsetenv('PKG_CONFIG_PATH')

-       
-       def build(self):
-               os.chdir(self.buildFolder)
+               # run compilation

                subprocess.check_call(self.buildCmdPrefix + ['make', '-j'+str(self.jobs)])
                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
                subprocess.check_call(self.installCmdPrefix + ['make', 'install'])
 
 # if auto-debuild is available, provide a wrapper for it


@@ -41,51 +37,41 @@ try:
        class AutoDebuild:
                def __init__(self, sourceFolder, buildFolder, module, vcs, config):
                        self.sourceFolder = os.path.abspath(sourceFolder)
        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
                        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
-                       if self.configured: return # do not configure twice
-                       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):
-                       self.configure() # make sure we are configured (this call is idempotent)
+               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'],
+                               'debDir': self.debDir,
+                               'buildDir': self.buildFolder,
+                               'name': self.debName,
+                               'email': self.debEMail,
+                               'parallelJobs': self.jobs,
+                               'version': self.vcs.version()
+                       }
+                       if autoDebuildConfig['version'] is None:
+                               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)
                        os.chdir(self.sourceFolder)

-                       auto_debuild.buildDebianPackage(self.autoDebuildConfig)
+                       files = auto_debuild.createDebianFiles(autoDebuildConfig)
+                       # build package(s)
+                       auto_debuild.buildDebianPackage(autoDebuildConfig)
+                       # install package(s)
+                       subprocess.check_call(['sudo', 'dpkg', '--install'] + files)

 
 

-               def install(self):
-                       self.configure() # make sure we are configured (this call is idempotent)
-                       os.chdir(self.sourceFolder)
-                       subprocess.check_call(['sudo', 'dpkg', '--install'] + self.files)

 except ImportError:
        print "auto_debuild not found, disabling auto-debuild system"
        pass
 except ImportError:
        print "auto_debuild not found, disabling auto-debuild system"
        pass