make the prefix options optional; fix SVN for the case that the parent folder does...

[mass-build.git] / build_system.py

diff --git a/build_system.py b/build_system.py
index cb90c6352b7fdb121f8738bea1cf0e569595f518..1c0411bc02739d78068b3ebdafe0ec0dc1a941cc 100644 (file)
--- a/build_system.py
+++ b/build_system.py
@@ -1,21 +1,15 @@
 import os, shutil, subprocess
 
 import os, shutil, subprocess
 

-'''A build system has three methods: "configure" (with optionak "force" parameter), "build" and "install"'''
+'''A build system must have a "build" method with parameters "reconfigure" and "waitAfterConfig".'''

 
 # Compile, build, and install cmake projects:
 class CMake:
 
 # Compile, build, and install cmake projects:
 class CMake:

-       def __init__(self, sourceFolder, buildFolder, module, config):
+       def __init__(self, sourceFolder, buildFolder, config):

                self.sourceFolder = os.path.abspath(sourceFolder)
                self.buildFolder = os.path.abspath(buildFolder)
                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.waitAfterConfig = config.get('waitAfterConfig', False)
-               self.module = module
+               self.config = config

        
        

-       def build(self, reconfigure=False):
+       def build(self, reconfigure, waitAfterConfig):

                # Make sure we have a build directory
                if not os.path.exists(self.buildFolder): os.makedirs(self.buildFolder)
                os.chdir(self.buildFolder)
                # Make sure we have a build directory
                if not os.path.exists(self.buildFolder): os.makedirs(self.buildFolder)
                os.chdir(self.buildFolder)


@@ -23,54 +17,52 @@ class CMake:
                cacheFile = 'CMakeCache.txt'
                if os.path.exists(cacheFile) and reconfigure: os.remove(cacheFile)
                # Run cmake
                cacheFile = 'CMakeCache.txt'
                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]+self.module.get('cmakeParameters', []))
+               os.putenv('PKG_CONFIG_PATH', os.path.join(self.config['installDir'], 'lib', 'pkgconfig')) # I found no way to do this within cmake
+               subprocess.check_call(['cmake', self.sourceFolder, '-DCMAKE_BUILD_TYPE='+self.config['buildType'],
+                       '-DCMAKE_INSTALL_PREFIX='+self.config['installDir']]+self.config.get('cmakeParameters', []))

                os.unsetenv('PKG_CONFIG_PATH')
                # if asked to do so, wait
                os.unsetenv('PKG_CONFIG_PATH')
                # if asked to do so, wait

-               if self.waitAfterConfig:
-                       raw_input('Configuration done. Hit "Enter" to build the module. ')
+               if waitAfterConfig:
+                       raw_input('Configuration done. Hit "Enter" to build the project. ')

                # run compilation
                # run compilation

-               subprocess.check_call(self.buildCmdPrefix + ['make', '-j'+str(self.jobs)])
+               subprocess.check_call(self.config.get('buildCmdPrefix', []) + ['make', '-j'+str(self.config['jobs'])])

                # run installation
                # run installation

-               subprocess.check_call(self.installCmdPrefix + ['make', 'install'])
+               subprocess.check_call(self.config.get('installCmdPrefix', []) + ['make', 'install'])

 
 # if auto-debuild is available, provide a wrapper for it
 try:
        import auto_debuild
        class AutoDebuild:
 
 # if auto-debuild is available, provide a wrapper for it
 try:
        import auto_debuild
        class AutoDebuild:

-               def __init__(self, sourceFolder, buildFolder, module, vcs, config):
+               def __init__(self, sourceFolder, buildFolder, config, vcs):

                        self.sourceFolder = os.path.abspath(sourceFolder)
                        self.buildFolder = os.path.abspath(buildFolder)
                        self.sourceFolder = os.path.abspath(sourceFolder)
                        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.waitAfterConfig = config.get('waitAfterConfig', False)
-                       self.module = module
+                       self.debFolder = os.path.abspath(config['debDir'])
+                       self.config = config

                        self.vcs = vcs
 
                        self.vcs = vcs
 

-               def build(self, reconfigure=False): # reconfigure is ignored (we always do a reconfiguration)
+               def build(self, reconfigure, waitAfterConfig): # reconfigure is ignored (we always do a reconfiguration)

                        # create auto-debuild configuration
                        # create auto-debuild configuration

+                       versionName = self.config['versionName'] if 'versionName' in self.config else self.vcs.version()

                        autoDebuildConfig = {
                        autoDebuildConfig = {

-                               'sourceName': self.module['name'],
-                               'buildSystem': self.module['buildSystem'],
-                               'debDir': self.debDir,
+                               'sourceName': self.config['name'],
+                               'buildSystem': self.config['buildSystem'],
+                               'debDir': self.debFolder,

                                'buildDir': self.buildFolder,
                                'buildDir': self.buildFolder,

-                               'name': self.debName,
-                               'email': self.debEMail,
-                               'parallelJobs': self.jobs,
-                               'version': self.vcs.version(),
-                               'waitAfterConfig': self.waitAfterConfig,
+                               'name': self.config['debName'],
+                               'email': self.config['debEMail'],
+                               'parallelJobs': self.config['jobs'],
+                               'version': versionName,
+                               'waitAfterConfig': waitAfterConfig,

                        }
                        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', 'section', 'withPython2', 'binarySkipFiles', 'binaryInstallFiles',
                        }
                        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', 'section', 'withPython2', 'binarySkipFiles', 'binaryInstallFiles',

-                                       'buildDepends', 'binaryDepends', 'binaryRecommends', 'binaryProvides',
-                                       'cmakeParameters', 'automakeParameters'):
-                               if option in self.module:
-                                       autoDebuildConfig[option] = self.module[option]
+                                       'buildDepends', 'binaryDepends', 'binaryRecommends', 'binaryProvides', 'binaryConflicts', 'binaryBreaks',
+                                       'binaryReplaces', 'binaryBreaksReplaces',
+                                       'alternatives', 'cmakeParameters', 'automakeParameters'):
+                               if option in self.config:
+                                       autoDebuildConfig[option] = self.config[option]

                        # create Debian files
                        os.chdir(self.sourceFolder)
                        if os.path.isdir('debian'): # clean previous build attempts
                        # create Debian files
                        os.chdir(self.sourceFolder)
                        if os.path.isdir('debian'): # clean previous build attempts


@@ -79,7 +71,8 @@ try:
                        # build package(s)
                        auto_debuild.buildDebianPackage(autoDebuildConfig)
                        # install package(s)
                        # build package(s)
                        auto_debuild.buildDebianPackage(autoDebuildConfig)
                        # install package(s)

-                       subprocess.check_call(['sudo', 'dpkg', '--install'] + files)
+                       if self.config.get('debInstall', True):
+                               subprocess.check_call(['sudo', 'dpkg', '--install'] + files)

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