X-Git-Url: https://git.ralfj.de/auto-debuild.git/blobdiff_plain/16058e77e06a5e49f042d86622b66bba3a6d6247..e2ba60734fa52dacdf59203b09af6324b0014922:/auto_debuild.py

diff --git a/auto_debuild.py b/auto_debuild.py
index 90d616d..cb2d840 100755
--- a/auto_debuild.py
+++ b/auto_debuild.py
@@ -1,5 +1,5 @@
 #!/usr/bin/python
-import os, stat, time, subprocess, sys
+import os, shutil, stat, time, subprocess, sys
 from collections import OrderedDict
 
 # some utility functions
@@ -100,8 +100,9 @@ def createDebianFiles(config):
 	arch = getArchitecture(config)
 	files = []
 	# create folders
-	if not os.path.exists('debian'): os.mkdir('debian')
-	if not os.path.exists('debian/source'): os.mkdir('debian/source')
+	if os.path.exists('debian'): raise Exception('debian folder already exists?')
+	os.mkdir('debian')
+	os.mkdir('debian/source')
 	if not os.path.exists(debDir): os.mkdir(debDir)
 	# source format file
 	with open('debian/source/format', 'w') as f:
@@ -145,6 +146,12 @@ def createDebianFiles(config):
 			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)))
+	# install file
+	with open('debian/'+binaryName+'.install', 'w') as f:
+		for line in config.get('binaryInstall', []):
+			if line.startswith('/'): # a file from within the package, not from the source tree
+				line = 'debian/'+binaryName+line
+			print >>f, line
 	# rules file: build system specific
 	with open('debian/rules', 'w') as f:
 		# get rule file for build system: may only touch auto_config and auto_clean rules and the dh options
@@ -176,35 +183,35 @@ def createDebianFiles(config):
 		r.write(f)
 	mode = os.stat('debian/rules').st_mode
 	os.chmod('debian/rules', mode | stat.S_IXUSR | stat.S_IXGRP | stat.S_IXOTH)
-	# return list of files affected
+	# return list of files that will be created
 	return files
 
 def buildDebianPackage(config):
 	commands = ['dpkg-checkbuilddeps', 'debian/rules clean', 'debian/rules build', 'fakeroot debian/rules binary', 'debian/rules clean']
 	command = ['nice', 'bash', '-c', ' && '.join(commands)]
 	subprocess.check_call(commandInBuildEnv(config, command))
+	shutil.rmtree('debian') # it only contains what we just created
 
-# all at once
-def createAndInstall(config, overwriteCheck = False):
+###################################################################
+# if we are called directly as script
+if __name__ == "__main__":
+	import imp
+	# get config
+	config = imp.load_source('config', 'auto-debuild.conf').__dict__
+	os.remove('auto-debuild.confc')
 	# generate debian files
+	if os.path.exists('debian'):
+		if raw_input("A debian folder already exists, to you want to remove it (y/N)? ").lower() != "y":
+			sys.exit(1)
+		shutil.rmtree('debian')
 	files = createDebianFiles(config)
 	# check if a file is overwritten
-	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)
+	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)