X-Git-Url: https://git.ralfj.de/auto-debuild.git/blobdiff_plain/6a16ca2114768210c74541b4a882d4a8ecfc1ad6..51a545889a5c19e7acb8e987a95df1fb81e50eae:/auto_debuild.py

diff --git a/auto_debuild.py b/auto_debuild.py
index 0c466b4..9d7c042 100755
--- a/auto_debuild.py
+++ b/auto_debuild.py
@@ -59,8 +59,9 @@ def getArchitecture(config):
 	if p.returncode != 0: raise Exception("Querying dpkg for the architecture failed")
 	return res[0:len(res)-1] # chop of the \n at the end
 
-def writeDebList(list):
-	return ', '.join(list)
+def writeDependency(f, name, list):
+	if len(list):
+		print >>f, name+": "+', '.join(list)
 
 # actual work functions
 def createDebianFiles(config):
@@ -99,13 +100,15 @@ def createDebianFiles(config):
 		print >>f, "Section:",config.get('section', 'misc')
 		print >>f, "Priority: extra"
 		print >>f, "Maintainer: %s <%s>" % (name, email)
-		print >>f, "Build-Depends:",writeDebList(["debhelper (>= 9)"] + config.get('buildDepends', []))
+		writeDependency(f, 'Build-Depends', ["debhelper (>= 9)"] + config.get('buildDepends', []))
 		print >>f, "Standards-Version: 3.9.3"
 		print >>f, ""
 		print >>f, "Package:",binaryName
 		print >>f, "Architecture:",packageArchitecture
-		print >>f, "Depends:",writeDebList(["${shlibs:Depends}", "${misc:Depends}"] + config.get('binaryDepends', []))
-		print >>f, "Provides:",writeDebList(config.get('binaryProvides', [sourceName]))
+		writeDependency(f, "Pre-Depends", ["${misc:Pre-Depends}"] + config.get('binaryPreDepends', []))
+		writeDependency(f, "Depends", ["${shlibs:Depends}", "${misc:Depends}"] + config.get('binaryDepends', []))
+		writeDependency(f, "Recommends", config.get('binaryRecommends', []))
+		writeDependency(f, "Provides", config.get('binaryProvides', [sourceName]))
 		print >>f, "Description:",sourceName,"(auto-debuild)"
 		print >>f, " Package auto-generated by auto-debuild."
 		files.append(os.path.join(debDir, "%s_%s_%s.deb" % (binaryName, version, arch)))
@@ -113,7 +116,7 @@ def createDebianFiles(config):
 			print >>f, ""
 			print >>f, "Package:",binaryName+"-dbg"
 			print >>f, "Architecture:",packageArchitecture
-			print >>f, "Depends:",writeDebList(["${misc:Depends}", binaryName+" (= ${binary:Version})"])
+			writeDependency(f, "Depends", ["${misc:Depends}", binaryName+" (= ${binary:Version})"])
 			print >>f, "Description:",sourceName,"debug smbols (auto-debuild)"
 			print >>f, " Package containing debug symbols for "+sourceName+", auto-generated by auto-debuild."
 			files.append(os.path.join(debDir, "%s-dbg_%s_%s.deb" % (binaryName, version, arch)))
@@ -149,19 +152,27 @@ def buildDebianPackage(config):
 	command = ['bash', '-c', ' && '.join(commands)]
 	subprocess.check_call(commandInBuildEnv(config, command))
 
-# if we are called directly as script
-if __name__ == "__main__":
+# all at once
+def createAndInstall(config, overwriteCheck = False):
 	# generate debian files
-	import imp
-	config = imp.load_source('config', 'debian/auto-debuild.conf').__dict__
-	os.remove('debian/auto-debuild.confc')
 	files = createDebianFiles(config)
 	# check if a file is overwritten
-	for file in files:
-		if os.path.exists(file):
-			if raw_input("Do you want to overwrite %s (y/N)? " % file).lower() != "y":
-				sys.exit(1)
+	if overwriteCheck:
+		for file in files:
+			if os.path.exists(file):
+				if raw_input("Do you want to overwrite %s (y/N)? " % file).lower() != "y":
+					sys.exit(1)
 	# run compilation
 	buildDebianPackage(config)
 	# install files
+	print "Installing created deb files..."
 	subprocess.check_call(['sudo', 'dpkg', '--install'] + files)
+
+# if we are called directly as script
+if __name__ == "__main__":
+	# get config
+	import imp
+	config = imp.load_source('config', 'debian/auto-debuild.conf').__dict__
+	os.remove('debian/auto-debuild.confc')
+	# and go for it
+	createAndInstall(config, overwriteCheck=True)