From: Ralf Jung Date: Thu, 2 Aug 2012 14:20:07 +0000 (+0200) Subject: simplify calling safe_args; make the wait-for-confirmation actually work X-Git-Url: https://git.ralfj.de/auto-debuild.git/commitdiff_plain/58ba5650908a996bb32682a724831cdc07509263?ds=inline simplify calling safe_args; make the wait-for-confirmation actually work --- diff --git a/auto_debuild.py b/auto_debuild.py index 4f46da1..86f5805 100755 --- a/auto_debuild.py +++ b/auto_debuild.py @@ -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,11 +45,11 @@ 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): @@ -65,7 +65,7 @@ def automakeRules(config): '--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 @@ -171,20 +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.'])) + 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