X-Git-Url: https://git.ralfj.de/auto-debuild.git/blobdiff_plain/b36b79c329864a4681e9339d8b92f950800b4b79..8d6f5281b6f105449515b33ac4c35c0d4a278c1a:/auto_debuild.py

diff --git a/auto_debuild.py b/auto_debuild.py
index b921d7c..5733273 100755
--- a/auto_debuild.py
+++ b/auto_debuild.py
@@ -1,14 +1,17 @@
 #!/usr/bin/python
-import os, shutil, stat, time, subprocess, sys
+import os, shutil, stat, time, subprocess, sys, shlex
 from collections import OrderedDict
 
-# a dict with some useful additional getters
-class AdvancedDict(dict):
+# a dict with some useful additional getters which can convert types and handle one-element lists like their single member
+class ConfigDict(dict):
 	def getstr(self, name, default = None):
 		if not name in self: return default
 		val = self[name]
-		if len(val) != 1: raise Exception('%s is a list, but it should not' % name)
-		return val[0]
+		if isinstance(val, list):
+			if len(val) != 1: raise Exception('%s is a list, but it should not' % name)
+			return val[0]
+		else:
+			return val
 	
 	def getint(self, name, default = None):
 		return int(self.getstr(name, default))
@@ -27,29 +30,32 @@ def safeCall(*args):
 		res += "'"+arg+"'"
 	return res
 
-# Load a section-less config file: maps parameter names to strings or lists of strings (which are comma-separated or in separate lines)
+# Load a section-less config file: maps parameter names to space-separated lists of strings (with shell quotation)
 # Lines starting with spaces are continuation lines
 def loadConfigFile(file):
-	import shlex
 	# read config file
+	linenr = 0
 	with open(file) as file:
-		result = AdvancedDict()
+		result = ConfigDict()
 		curKey = None
 		for line in file:
+			linenr += 1
 			isCont = len(line) and line[0].isspace() # remember if we were a continuation line
 			if isCont and curKey is None:
-				raise Exception("Invalid config: Starting with continuation line")
+				raise Exception("Invalid config, line %d: Starting with continuation line" % linenr)
 			line = line.strip()
 			if not len(line) or line.startswith("#"): continue # skip empty and comment lines
-			if isCont:
-				# continuation line
-				result[curKey].append(shlex.split(line))
-			else:
-				# option line
-				pos = line.index("=") # will raise exception when substring is not found
-				curKey = line[:pos].strip()
-				value = line[pos+1:]
-				result[curKey] = shlex.split(value)
+			try:
+				if isCont:
+					# continuation line
+					result[curKey] += shlex.split(line)
+				else:
+					# option line
+					pos = line.index("=") # will raise exception when substring is not found
+					curKey = line[:pos].strip()
+					result[curKey] = shlex.split(line[pos+1:]) # shlex.split also strips
+			except Exception:
+				raise Exception("Invalid config, line %d: Error parsing line (quoting issue?)" % linenr)
 	# add some convencience get functions
 	return result
 
@@ -82,7 +88,7 @@ class RulesFile:
 		print >>f, ""
 		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, "build %:" # need to mention "build" here again explicitly so PHONY takes effect
 		# write proper dh call
 		dh = self.dh
 		if self.dhWith:
@@ -137,11 +143,18 @@ def pythonRules(config):
 	]
 	return r
 
+def noneRules(config):
+	r = RulesFile()
+	r.dh += ["--buildsystem=makefile"] # makefile does the last possible harm
+	r.rules['auto_build'] = []
+	return r
+
 # build systems
 buildSystems = {
 	'cmake': BuildSystem(cmakeRules, ["cmake"]),
 	'automake': BuildSystem(automakeRules),
 	'python': BuildSystem(pythonRules, ["python-setuptools"], ["${python:Depends}"]),
+	'none': BuildSystem(noneRules),
 }
 
 # utility functions
@@ -163,6 +176,8 @@ def writeDependency(f, name, list):
 
 # actual work functions
 def createDebianFiles(config):
+	if not isinstance(config, ConfigDict):
+		config = ConfigDict(config)
 	sourceName = config.getstr('sourceName')
 	binaryName = config.getstr('binaryName', sourceName+'-local')
 	name = config.getstr('name', os.getenv('USER')) # os.getlogin() fails in minimal chroots
@@ -247,8 +262,8 @@ def createDebianFiles(config):
 			print >>f, "set -e"
 			print >>f, 'if [ "$1" = "configure" ]; then'
 			for alternative in config.get('alternatives'):
-				print >>f, safeCall('update-alternatives', '--install', alternative['link'], alternative['name'], alternative['target'],
-					str(alternative['priority']))
+				alternative = shlex.split(alternative)
+				print >>f, safeCall('update-alternatives', '--install', alternative[0], alternative[1], alternative[2], alternative[3])
 			print >>f, 'fi'
 			print >>f, ''
 			print >>f, '#DEBHELPER#'
@@ -259,7 +274,8 @@ def createDebianFiles(config):
 			print >>f, "set -e"
 			print >>f, 'if [ "$1" = "remove" ]; then'
 			for alternative in config.get('alternatives'):
-				print >>f, safeCall('update-alternatives', '--remove', alternative['name'], alternative['target'])
+				alternative = shlex.split(alternative)
+				print >>f, safeCall('update-alternatives', '--remove', alternative[1], alternative[2])
 			print >>f, 'fi'
 			print >>f, ''
 			print >>f, '#DEBHELPER#'
@@ -302,6 +318,8 @@ def createDebianFiles(config):
 	return files
 
 def buildDebianPackage(config):
+	if not isinstance(config, ConfigDict):
+		config = ConfigDict(config)
 	commands = ['dpkg-checkbuilddeps', 'debian/rules clean', 'debian/rules build', 'fakeroot debian/rules binary', 'debian/rules clean']
 	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))