X-Git-Url: https://git.ralfj.de/auto-debuild.git/blobdiff_plain/3960c6215e9549f7dc7c06e4f2e906acf820d2b5..6d5e051eaaff2fe4af1f2e2573284b706982857c:/auto_debuild.py?ds=inline

diff --git a/auto_debuild.py b/auto_debuild.py
index f8ff641..47102af 100755
--- a/auto_debuild.py
+++ b/auto_debuild.py
@@ -4,7 +4,7 @@ from collections import OrderedDict
 
 class RulesFile:
 	def __init__(self):
-		self.buildOptions = ''
+		self.env = []
 		self.dh = []
 		self.rules = OrderedDict()
 	
@@ -12,7 +12,7 @@ class RulesFile:
 		print >>f, "#!/usr/bin/make -f"
 		print >>f, ""
 		print >>f, "%:"
-		print >>f, '\tDEB_BUILD_OPTIONS="'+self.buildOptions+'" dh $@',' '.join(self.dh)
+		print >>f, '\t'+' '.join(self.env)+' dh $@',' '.join(self.dh)
 		for rule in self.rules:
 			print >>f, ""
 			print >>f, "override_dh_"+rule+":"
@@ -31,7 +31,7 @@ def cmakeRules(config):
 	r.dh += ["--buildsystem=cmake", "--builddirectory=build.dir"] # dh parameters: "build" is not a good idea, as that's also the name of a target...
 	r.rules['auto_configure'] = [
 		'mkdir -p build.dir',
-		"cd build.dir && cmake .. "+' '.join(['-DCMAKE_INSTALL_PREFIX=/usr', '-DCMAKE_BUILD_TYPE=Release'] + config.get('cmakeParameters', []))
+		"cd build.dir && cmake .. -DCMAKE_INSTALL_PREFIX=/usr "+' '.join(config.get('cmakeParameters', []))
 	]
 	r.rules['auto_clean'] = ['rm -f build.dir/CMakeCache.txt'] # clean old cmake cache
 	return r
@@ -47,6 +47,8 @@ def createDebianFiles(config):
 	debDir = os.path.expanduser(config['debDir'])
 	buildSystem = config['buildSystem']
 	version = config['version']
+	dbgPackage = config.get('dbgPackage', False)
+	packageArchitecture = config.get('architecture', 'any')
 	# we return the list of files generated
 	arch = getArchitecture()
 	files = []
@@ -77,28 +79,38 @@ def createDebianFiles(config):
 		print >>f, "Standards-Version: 3.9.3"
 		print >>f, ""
 		print >>f, "Package:",binaryName
-		print >>f, "Architecture:",config.get('architecture', 'any')
+		print >>f, "Architecture:",packageArchitecture
 		print >>f, "Depends:",writeDebList(["${shlibs:Depends}", "${misc:Depends}"] + config.get('binaryDepends', []))
 		print >>f, "Provides:",writeDebList(config.get('binaryProvides', [sourceName]))
 		print >>f, "Description:",sourceName,"(auto-debuild)"
-		print >>f, " Package auto-generated by auto-debuild"
+		print >>f, " Package auto-generated by auto-debuild."
 		files.append(os.path.join(debDir, "%s_%s_%s.deb" % (binaryName, version, arch)))
+		if dbgPackage:
+			print >>f, ""
+			print >>f, "Package:",binaryName+"-dbg"
+			print >>f, "Architecture:",packageArchitecture
+			print >>f, "Depends:",writeDebList(["${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)))
 	# rules file: build system specific
 	with open('debian/rules', 'w') as f:
-		# get rule file for build system
+		# get rule file for build system: may only touch auto_config and auto_clean rules and the dh options
 		if buildSystem == 'cmake':
 			r = cmakeRules(config)
 		else:
 			raise Exception("Invalid build system "+buildSystem)
 		# global rules
-		r.buildOptions = "parallel=2"
+		r.env += ["DEB_BUILD_OPTIONS='parallel=2'"]
+		if not dbgPackage: r.env += ["DEB_CFLAGS_APPEND='-g0'", "DEB_CXXFLAGS_APPEND='-g0'"] # disable debug information
 		r.dh += ['--parallel']
-		if not 'builddeb' in r.rules:
-			r.rules['builddeb'] = ['dh_builddeb --destdir='+debDir] # passing this gobally to dh results in weird problems (like stuff being installed there, and not in the package...)
-		else:
-			print "WARNING: Build system messes with global rules"
-		if not 'auto_test' in r.rules: # unless the build system has something in mind for this
-			r.rules['auto_test'] = []
+		r.rules['builddeb'] = ['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'] = []
+		# for debug packages
+		if dbgPackage:
+			r.rules['strip'] = ['dh_strip --dbg-package='+binaryName+"-dbg"]
+			r.rules['auto_install'] = ['dh_auto_install --destdir=debian/'+binaryName]
+			r.rules['installdocs'] = ['dh_installdocs --link-doc='+binaryName]
 		# dump it to a file
 		r.write(f)
 	mode = os.stat('debian/rules').st_mode
@@ -127,3 +139,5 @@ if __name__ == "__main__":
 				sys.exit(1)
 	# run compilation
 	buildDebianPackage()
+	# install files
+	subprocess.check_call(['sudo', 'dpkg', '--install'] + files)