X-Git-Url: https://git.ralfj.de/auto-debuild.git/blobdiff_plain/cbcb54ccaafd688b86c9cd1f771c74930117a782..180623ecdb0fbe555d16e2ddbb0edc31185e1a1f:/auto_debuild.py

diff --git a/auto_debuild.py b/auto_debuild.py
index f9f0672..11845de 100755
--- a/auto_debuild.py
+++ b/auto_debuild.py
@@ -2,13 +2,16 @@
 import os, shutil, stat, time, subprocess, sys
 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,14 +30,14 @@ 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
@@ -51,8 +54,7 @@ def loadConfigFile(file):
 					# 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)
+					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
@@ -142,11 +144,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
@@ -168,6 +177,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
@@ -307,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))