Remove the niceness by default - that should be up to the caller

[auto-debuild.git] / auto_debuild.py

diff --git a/auto_debuild.py b/auto_debuild.py
index c2744125659bf3071c6bbbb6e97767f97989b835..8ef290ba8f2e5b253475979d6852722ee98a9608 100755 (executable)
--- a/auto_debuild.py
+++ b/auto_debuild.py
@@ -1,5 +1,5 @@
 #!/usr/bin/python
-import os, stat, time, subprocess, sys
+import os, shutil, stat, time, subprocess, sys
 from collections import OrderedDict
 
 # some utility functions
@@ -53,11 +53,14 @@ def cmakeRules(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
-               'MULTIARCH=$$(dpkg-architecture -qDEB_BUILD_MULTIARCH) && '+
+               '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 '+
@@ -74,7 +77,7 @@ def commandInBuildEnv(config, command):
        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")
@@ -148,7 +151,9 @@ def createDebianFiles(config):
                        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('binaryInstall', []):
+               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:
@@ -181,19 +186,19 @@ 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)
-       # 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)]
+       command = ['bash', '-c', ' && '.join(commands)] # make it all one command, so we don't have to open and close the chroot too often
        subprocess.check_call(commandInBuildEnv(config, command))
        shutil.rmtree('debian') # it only contains what we just created
 
 ###################################################################
 # if we are called directly as script
 if __name__ == "__main__":
-       import imp, shutil
+       import imp
        # get config
        config = imp.load_source('config', 'auto-debuild.conf').__dict__
        os.remove('auto-debuild.confc')