From: Ralf Jung <post@ralfj.de>
Date: Wed, 18 Jul 2012 09:20:16 +0000 (+0200)
Subject: properly disable debug information if not debug package is used
X-Git-Url: https://git.ralfj.de/auto-debuild.git/commitdiff_plain/6d5e051eaaff2fe4af1f2e2573284b706982857c?ds=inline

properly disable debug information if not debug package is used
---

diff --git a/auto_debuild.py b/auto_debuild.py
index 77493c3..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+":"
@@ -26,13 +26,12 @@ def getArchitecture():
 	return res[0:len(res)-1] # chop of the \n at the end
 
 # build-system specific part of rules file
-def cmakeRules(dbg, config):
-	buildType = 'RelWithDebInfo' if dbg else 'Release'
+def cmakeRules(config):
 	r = RulesFile()
 	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='+buildType] + 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
@@ -98,11 +97,12 @@ def createDebianFiles(config):
 	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
 		if buildSystem == 'cmake':
-			r = cmakeRules(dbgPackage, config)
+			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']
 		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'] = []