Don't permanently create debian/ folder, and move auto-debuild.conf out of it

[auto-debuild.git] / auto_debuild.py

diff --git a/auto_debuild.py b/auto_debuild.py
index efc36ebb52a8b6c2d39125b528e0b5769cb34b81..57ee13bb86854d9134be05ac90583d39ff6329d4 100755 (executable)
--- a/auto_debuild.py
+++ b/auto_debuild.py
@@ -1,5 +1,5 @@
 #!/usr/bin/python
 #!/usr/bin/python

-import os, stat, time, subprocess, sys
+import os, shutil, stat, time, subprocess, sys

 from collections import OrderedDict
 
 # some utility functions
 from collections import OrderedDict
 
 # some utility functions


@@ -58,13 +58,13 @@ def automakeRules(config):
        r.rules['auto_configure'] = [
                'BUILD_TYPE=$$(dpkg-architecture -qDEB_BUILD_GNU_TYPE) && ' + # doing the expansion beforehand ensures that we cancel if it fails
                'MULTIARCH=$$(dpkg-architecture -qDEB_BUILD_MULTIARCH) && '+
        r.rules['auto_configure'] = [
                'BUILD_TYPE=$$(dpkg-architecture -qDEB_BUILD_GNU_TYPE) && ' + # doing the expansion beforehand ensures that we cancel if it fails
                'MULTIARCH=$$(dpkg-architecture -qDEB_BUILD_MULTIARCH) && '+

-                       './configure --build=$$BUILD_TYPE ' +
-                       '--prefix=/usr --includedir=/usr/include --mandir=/usr/share/man --infodir=/usr/share/info ' +
+                       './configure --build=$$BUILD_TYPE '+ # do the escape manually here so we can use the variables (there's no user-controlled string in here anyway)
+                       '--prefix=/usr --includedir=/usr/include --mandir=/usr/share/man --infodir=/usr/share/info '+

                        '--libdir=/usr/lib/$$MULTIARCH --libexecdir=/usr/lib/$$MULTIARCH '+
                        '--libdir=/usr/lib/$$MULTIARCH --libexecdir=/usr/lib/$$MULTIARCH '+

-                       '--sysconfdir=/etc --localstatedir=/var ' +
-                       ' '.join(config.get('automakeParameters', []))
+                       '--sysconfdir=/etc --localstatedir=/var '+
+                       safeCall(config.get('automakeParameters', []))

        ]
        ]

-       r.rules['auto_clean'] = ['rm -f config.status'] # do not re-use old configuration
+       r.rules['auto_clean'] = ['rm -f config.status'] # do not re-use old configuration (no need for escaping here, obviously)

        return r
 
 # utility functions
        return r
 
 # utility functions


@@ -94,13 +94,15 @@ def createDebianFiles(config):
        buildSystem = config['buildSystem']
        version = config['version']
        dbgPackage = config.get('dbgPackage', False)
        buildSystem = config['buildSystem']
        version = config['version']
        dbgPackage = config.get('dbgPackage', False)

+       parallelJobs = int(config.get('parallelJobs', 2))

        packageArchitecture = config.get('architecture', 'any')
        # we return the list of files generated, so we need to know the architecture
        arch = getArchitecture(config)
        files = []
        # create folders
        packageArchitecture = config.get('architecture', 'any')
        # we return the list of files generated, so we need to know the architecture
        arch = getArchitecture(config)
        files = []
        # create folders

-       if not os.path.exists('debian'): os.mkdir('debian')
-       if not os.path.exists('debian/source'): os.mkdir('debian/source')
+       if os.path.exists('debian'): raise Exception('debian folder already exists?')
+       os.mkdir('debian')
+       os.mkdir('debian/source')

        if not os.path.exists(debDir): os.mkdir(debDir)
        # source format file
        with open('debian/source/format', 'w') as f:
        if not os.path.exists(debDir): os.mkdir(debDir)
        # source format file
        with open('debian/source/format', 'w') as f:


@@ -154,7 +156,7 @@ def createDebianFiles(config):
                else:
                        raise Exception("Invalid build system "+buildSystem)
                # global rules
                else:
                        raise Exception("Invalid build system "+buildSystem)
                # global rules

-               r.env["DEB_BUILD_OPTIONS"] = 'parallel=2'
+               r.env["DEB_BUILD_OPTIONS"] = 'parallel='+str(parallelJobs)

                if not dbgPackage:
                        # disable debug information
                        r.env["DEB_CFLAGS_APPEND"] = '-g0'
                if not dbgPackage:
                        # disable debug information
                        r.env["DEB_CFLAGS_APPEND"] = '-g0'


@@ -162,11 +164,15 @@ def createDebianFiles(config):
                r.dh += ['--parallel']
                r.rules['builddeb'] = [safeCall(['dh_builddeb', "--destdir="+debDir])] # passing this gobally to dh results in weird problems (like stuff being installed there, and not in the package...)
                r.rules['auto_test'] = []
                r.dh += ['--parallel']
                r.rules['builddeb'] = [safeCall(['dh_builddeb', "--destdir="+debDir])] # passing this gobally to dh results in weird problems (like stuff being installed there, and not in the package...)
                r.rules['auto_test'] = []

+               # installation rule

                r.rules['auto_install'] = [safeCall(['dh_auto_install', '--destdir=debian/'+binaryName])] # install everything into the binary package
                r.rules['auto_install'] = [safeCall(['dh_auto_install', '--destdir=debian/'+binaryName])] # install everything into the binary package

+               if 'binarySkipFiles' in config:
+                       r.rules['auto_install'].append(safeCall(['cd', 'debian/'+binaryName]) + " && " +
+                               safeCall(['rm'] + config['binarySkipFiles']))

                # for debug packages
                if dbgPackage:
                # for debug packages
                if dbgPackage:

-                       r.rules['strip'] = ['dh_strip --dbg-package='+binaryName+"-dbg"] # put debug files in appropriate package
-                       r.rules['installdocs'] = ['dh_installdocs --link-doc='+binaryName] # make the doc folder of the dbg package a symlink
+                       r.rules['strip'] = [safeCall(['dh_strip', '--dbg-package='+binaryName+"-dbg"])] # put debug files in appropriate package
+                       r.rules['installdocs'] = [safeCall(['dh_installdocs', '--link-doc='+binaryName])] # make the doc folder of the dbg package a symlink

                # dump it to a file
                r.write(f)
        mode = os.stat('debian/rules').st_mode
                # dump it to a file
                r.write(f)
        mode = os.stat('debian/rules').st_mode


@@ -178,6 +184,7 @@ def buildDebianPackage(config):
        commands = ['dpkg-checkbuilddeps', 'debian/rules clean', 'debian/rules build', 'fakeroot debian/rules binary', 'debian/rules clean']
        command = ['nice', 'bash', '-c', ' && '.join(commands)]
        subprocess.check_call(commandInBuildEnv(config, command))
        commands = ['dpkg-checkbuilddeps', 'debian/rules clean', 'debian/rules build', 'fakeroot debian/rules binary', 'debian/rules clean']
        command = ['nice', 'bash', '-c', ' && '.join(commands)]
        subprocess.check_call(commandInBuildEnv(config, command))

+       shutil.rmtree('debian') # it only contains what we just created

 
 # all at once
 def createAndInstall(config, overwriteCheck = False):
 
 # all at once
 def createAndInstall(config, overwriteCheck = False):


@@ -199,7 +206,7 @@ def createAndInstall(config, overwriteCheck = False):
 if __name__ == "__main__":
        # get config
        import imp
 if __name__ == "__main__":
        # get config
        import imp

-       config = imp.load_source('config', 'debian/auto-debuild.conf').__dict__
-       os.remove('debian/auto-debuild.confc')
+       config = imp.load_source('config', 'auto-debuild.conf').__dict__
+       os.remove('auto-debuild.confc')

        # and go for it
        createAndInstall(config, overwriteCheck=True)
        # and go for it
        createAndInstall(config, overwriteCheck=True)