X-Git-Url: https://git.ralfj.de/auto-debuild.git/blobdiff_plain/792702b7a261f1eecf94ea713affb4f9e9494cd2..8b398829c3062f20c42b0a5d048cc3414098cc89:/auto_debuild.py?ds=sidebyside

diff --git a/auto_debuild.py b/auto_debuild.py
index 422dafb..c274412 100755
--- a/auto_debuild.py
+++ b/auto_debuild.py
@@ -58,13 +58,13 @@ def automakeRules(config):
 	r.rules['auto_configure'] = [
 		'BUILD_TYPE=$$(dpkg-architecture -qDEB_BUILD_GNU_TYPE) && ' + # doing the expansion beforehand ensures that we cancel if it fails
 		'MULTIARCH=$$(dpkg-architecture -qDEB_BUILD_MULTIARCH) && '+
-			safeCall(['./configure', '--build=$$BUILD_TYPE',
-			'--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'] +
-			config.get('automakeParameters', []))
+			'./configure --build=$$BUILD_TYPE '+ # do the escape manually here so we can use the variables (there's no user-controlled string in here anyway)
+			'--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', []))
 	]
-	r.rules['auto_clean'] = ['rm -f config.status'] # do not re-use old configuration
+	r.rules['auto_clean'] = ['rm -f config.status'] # do not re-use old configuration (no need for escaping here, obviously)
 	return r
 
 # utility functions
@@ -94,13 +94,15 @@ def createDebianFiles(config):
 	buildSystem = config['buildSystem']
 	version = config['version']
 	dbgPackage = config.get('dbgPackage', False)
+	parallelJobs = int(config.get('parallelJobs', 2))
 	packageArchitecture = config.get('architecture', 'any')
 	# we return the list of files generated, so we need to know the architecture
 	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:
@@ -144,6 +146,10 @@ 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', []):
+			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
@@ -154,7 +160,7 @@ def createDebianFiles(config):
 		else:
 			raise Exception("Invalid build system "+buildSystem)
 		# global rules
-		r.env["DEB_BUILD_OPTIONS"] = 'parallel=2'
+		r.env["DEB_BUILD_OPTIONS"] = 'parallel='+str(parallelJobs)
 		if not dbgPackage:
 			# disable debug information
 			r.env["DEB_CFLAGS_APPEND"] = '-g0'
@@ -162,7 +168,11 @@ def createDebianFiles(config):
 		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['auto_test'] = []
+		# installation rule
 		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']))
 		# for debug packages
 		if dbgPackage:
 			r.rules['strip'] = [safeCall(['dh_strip', '--dbg-package='+binaryName+"-dbg"])] # put debug files in appropriate package
@@ -178,28 +188,28 @@ 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, shutil
+	# 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)