X-Git-Url: https://git.ralfj.de/auto-debuild.git/blobdiff_plain/7981315d665d8d5cff93b7b402b80ea538a72471..e82d2ebfa5c26c1e60a334c9f048cf9661f019f5:/auto_debuild.py

diff --git a/auto_debuild.py b/auto_debuild.py
index 4f46da1..c827a12 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
@@ -30,8 +30,10 @@ class RulesFile:
 	def write(self, f):
 		print >>f, "#!/usr/bin/make -f"
 		print >>f, ""
-		print >>f, "%:"
-		print >>f, '\t'+self.env2str()+' dh $@ '+safeCall(self.dh)
+		print >>f, ".PHONY: build" # there may be a directory called "build"
+		print >>f, ""
+		print >>f, "build %:" # need to mention "build" here again explicitly
+		print >>f, '\t'+self.env2str()+' dh $@ '+safeCall(*self.dh)
 		for rule in self.rules:
 			print >>f, ""
 			print >>f, "override_dh_"+rule+":"
@@ -40,16 +42,16 @@ class RulesFile:
 
 # build-system specific part of rules file
 def cmakeRules(config):
-	buildDir = config.get('buildDir', 'build.dir') # "build" is not a good idea, as that's also the name of a target...
+	buildDir = config.get('buildDir', 'build')
 	srcDir = os.getcwd()
 	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 +67,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
@@ -91,8 +93,8 @@ def writeDependency(f, name, list):
 def createDebianFiles(config):
 	sourceName = config['sourceName']
 	binaryName = config.get('binaryName', sourceName+'-local')
-	name = config.get('name', os.getlogin())
-	email = config.get('email', os.getlogin()+'@'+os.uname()[1]) # user@hostname
+	name = config.get('name', os.getenv('USER')) # os.getlogin() fails in minimal chroots
+	email = config.get('email', os.getenv('USER')+'@'+os.uname()[1]) # user@hostname
 	debDir = os.path.expanduser(config['debDir'])
 	buildSystem = config['buildSystem']
 	version = config['version']
@@ -171,20 +173,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