fix usgae of host and build architecture; rename binaryInstall -> binaryInstallFiles

[auto-debuild.git] / auto_debuild.py

diff --git a/auto_debuild.py b/auto_debuild.py
index 422dafb3ef184812eb988df7931cd4d4a3649e1e..ab04dc0e9d752e24d5aa2f8e918e457e3f1fb515 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


@@ -53,18 +53,21 @@ def cmakeRules(config):
        return r
 
 def automakeRules(config):
        return r
 
 def automakeRules(config):

+       # "build" is what we are building *on*, and "host" is what we are building *for* (and GNU is weird...)
+       # also, we don't really support cross-building... ;-) (to do, we'd have to write shell code that checks whether BUILD_GNU_TYPE
+       #  and HOST_GNU_TYPE are equal, and if they are not, add a --host parameter)

        r = RulesFile()
        r.dh += ["--buildsystem=autoconf"]
        r.rules['auto_configure'] = [
                'BUILD_TYPE=$$(dpkg-architecture -qDEB_BUILD_GNU_TYPE) && ' + # doing the expansion beforehand ensures that we cancel if it fails
        r = RulesFile()
        r.dh += ["--buildsystem=autoconf"]
        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) && '+
-                       safeCall(['./configure', '--build=$$BUILD_TYPE',
-                       '--prefix=/usr', '--includedir=/usr/include', '--mandir=/usr/share/man', '--infodir=/usr/share/info',
-                       '--libdir=/usr/lib/$$MULTIARCH', '--libexecdir=/usr/lib/$$MULTIARCH',
-                       '--sysconfdir=/etc', '--localstatedir=/var'] +
-                       config.get('automakeParameters', []))
+               'MULTIARCH=$$(dpkg-architecture -qDEB_HOST_MULTIARCH) && '+
+                       './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 '+
+                       '--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


@@ -74,7 +77,7 @@ def commandInBuildEnv(config, command):
        return command
 
 def getArchitecture(config):
        return command
 
 def getArchitecture(config):

-       cmd = commandInBuildEnv(config, ['dpkg-architecture', '-qDEB_BUILD_ARCH'])
+       cmd = commandInBuildEnv(config, ['dpkg-architecture', '-qDEB_HOST_ARCH'])

        p = subprocess.Popen(cmd, stdout=subprocess.PIPE)
        res = p.communicate()[0] # get only stdout
        if p.returncode != 0: raise Exception("Querying dpkg for the architecture failed")
        p = subprocess.Popen(cmd, stdout=subprocess.PIPE)
        res = p.communicate()[0] # get only stdout
        if p.returncode != 0: raise Exception("Querying dpkg for the architecture failed")


@@ -94,13 +97,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:


@@ -144,6 +149,12 @@ def createDebianFiles(config):
                        print >>f, "Description:",sourceName,"debug smbols (auto-debuild)"
                        print >>f, " Package containing debug symbols for "+sourceName+", auto-generated by auto-debuild."
                        files.append(os.path.join(debDir, "%s-dbg_%s_%s.deb" % (binaryName, version, arch)))
                        print >>f, "Description:",sourceName,"debug smbols (auto-debuild)"
                        print >>f, " Package containing debug symbols for "+sourceName+", auto-generated by auto-debuild."
                        files.append(os.path.join(debDir, "%s-dbg_%s_%s.deb" % (binaryName, version, arch)))

+       # install file
+       with open('debian/'+binaryName+'.install', 'w') as f:
+               for line in config.get('binaryInstallFiles', []):
+                       if line.startswith('/'): # a file from within the package, not from the source tree
+                               line = 'debian/'+binaryName+line
+                       print >>f, line

        # rules file: build system specific
        with open('debian/rules', 'w') as f:
                # get rule file for build system: may only touch auto_config and auto_clean rules and the dh options
        # rules file: build system specific
        with open('debian/rules', 'w') as f:
                # get rule file for build system: may only touch auto_config and auto_clean rules and the dh options


@@ -154,7 +165,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,7 +173,11 @@ 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:
                        r.rules['strip'] = [safeCall(['dh_strip', '--dbg-package='+binaryName+"-dbg"])] # put debug files in appropriate package
                # for debug packages
                if dbgPackage:
                        r.rules['strip'] = [safeCall(['dh_strip', '--dbg-package='+binaryName+"-dbg"])] # put debug files in appropriate package


@@ -171,35 +186,35 @@ def createDebianFiles(config):
                r.write(f)
        mode = os.stat('debian/rules').st_mode
        os.chmod('debian/rules', mode | stat.S_IXUSR | stat.S_IXGRP | stat.S_IXOTH)
                r.write(f)
        mode = os.stat('debian/rules').st_mode
        os.chmod('debian/rules', mode | stat.S_IXUSR | stat.S_IXGRP | stat.S_IXOTH)

-       # return list of files affected
+       # return list of files that will be created

        return files
 
 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))
        return files
 
 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))

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

 
 

-# all at once
-def createAndInstall(config, overwriteCheck = False):
+###################################################################
+# if we are called directly as script
+if __name__ == "__main__":
+       import imp
+       # get config
+       config = imp.load_source('config', 'auto-debuild.conf').__dict__
+       os.remove('auto-debuild.confc')

        # generate debian files
        # generate debian files

+       if os.path.exists('debian'):
+               if raw_input("A debian folder already exists, to you want to remove it (y/N)? ").lower() != "y":
+                       sys.exit(1)
+               shutil.rmtree('debian')

        files = createDebianFiles(config)
        # check if a file is overwritten
        files = createDebianFiles(config)
        # check if a file is overwritten

-       if overwriteCheck:
-               for file in files:
-                       if os.path.exists(file):
-                               if raw_input("Do you want to overwrite %s (y/N)? " % file).lower() != "y":
-                                       sys.exit(1)
+       for file in files:
+               if os.path.exists(file):
+                       if raw_input("Do you want to overwrite %s (y/N)? " % file).lower() != "y":
+                               sys.exit(1)

        # run compilation
        buildDebianPackage(config)
        # install files
        print "Installing created deb files..."
        subprocess.check_call(['sudo', 'dpkg', '--install'] + files)
        # run compilation
        buildDebianPackage(config)
        # install files
        print "Installing created deb files..."
        subprocess.check_call(['sudo', 'dpkg', '--install'] + files)

-
-# if we are called directly as script
-if __name__ == "__main__":
-       # get config
-       import imp
-       config = imp.load_source('config', 'debian/auto-debuild.conf').__dict__
-       os.remove('debian/auto-debuild.confc')
-       # and go for it
-       createAndInstall(config, overwriteCheck=True)