simplify calling safe_args; make the wait-for-confirmation actually work
[auto-debuild.git] / auto_debuild.py
index cb2d840039af595a7a6f79ae545cb78e08b3294a..86f5805c8fe3e90f041891edcaf6edaa85ea6568 100755 (executable)
@@ -3,7 +3,7 @@ import os, shutil, stat, time, subprocess, sys
 from collections import OrderedDict
 
 # some utility functions
-def safeCall(args):
+def safeCall(*args):
        res = ""
        for arg in args:
                assert arg.find("'") < 0 # ' is not supported
@@ -31,7 +31,7 @@ class RulesFile:
                print >>f, "#!/usr/bin/make -f"
                print >>f, ""
                print >>f, "%:"
-               print >>f, '\t'+self.env2str()+' dh $@ '+safeCall(self.dh)
+               print >>f, '\t'+self.env2str()+' dh $@ '+safeCall(*self.dh)
                for rule in self.rules:
                        print >>f, ""
                        print >>f, "override_dh_"+rule+":"
@@ -45,24 +45,27 @@ def cmakeRules(config):
        r = RulesFile()
        r.dh += ["--buildsystem=cmake", "--builddirectory="+buildDir] # dh parameters
        r.rules['auto_configure'] = [
-               safeCall(["mkdir", "-p", buildDir]),
-               safeCall(["cd", buildDir]) + " && " +
-                 safeCall(["cmake", srcDir, "-DCMAKE_INSTALL_PREFIX=/usr"] + config.get('cmakeParameters', []))
+               safeCall("mkdir", "-p", buildDir),
+               safeCall("cd", buildDir) + " && " +
+                 safeCall("cmake", srcDir, "-DCMAKE_INSTALL_PREFIX=/usr", *config.get('cmakeParameters', []))
        ]
-       r.rules['auto_clean'] = [safeCall(['rm', '-f', os.path.join(buildDir, 'CMakeCache.txt')])] # clean old cmake cache
+       r.rules['auto_clean'] = [safeCall('rm', '-f', os.path.join(buildDir, 'CMakeCache.txt'))] # clean old cmake cache
        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 '+
                        '--sysconfdir=/etc --localstatedir=/var '+
-                       safeCall(config.get('automakeParameters', []))
+                       safeCall(*config.get('automakeParameters', []))
        ]
        r.rules['auto_clean'] = ['rm -f config.status'] # do not re-use old configuration (no need for escaping here, obviously)
        return r
@@ -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,7 @@ 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
@@ -168,17 +171,20 @@ def createDebianFiles(config):
                        r.env["DEB_CFLAGS_APPEND"] = '-g0'
                        r.env["DEB_CXXFLAGS_APPEND"] = '-g0'
                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['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']))
+                       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
-                       r.rules['installdocs'] = [safeCall(['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
+               # wait after configuration?
+               if config.get('waitAfterConfig', False):
+                       r.rules['auto_configure'].append("@"+safeCall('read', '-p', 'Configuration done. Hit "Enter" to build the package. ', 'DUMMY_VAR')) # if we run in dash, we need to tell it which variable to use for the result...
                # dump it to a file
                r.write(f)
        mode = os.stat('debian/rules').st_mode
@@ -188,7 +194,7 @@ def createDebianFiles(config):
 
 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