X-Git-Url: https://git.ralfj.de/auto-debuild.git/blobdiff_plain/74e2c8497d6dacf9c01159ddc4b7618d1a593021..3c40b0a24572eda4137dd92dd5abf5efaf6bb1e1:/auto_debuild.py

diff --git a/auto_debuild.py b/auto_debuild.py
index aa0b28f..6b7a84b 100755
--- a/auto_debuild.py
+++ b/auto_debuild.py
@@ -35,15 +35,26 @@ def automakeRules(config):
 	r = RulesFile()
 	r.dh += ["--buildsystem=autoconf"]
 	r.rules['auto_configure'] = [
-		'./configure --build=$$(dpkg-architecture -qDEB_BUILD_GNU_TYPE) --prefix=/usr --sysconfdir=/etc --localstatedir=/var ' +
+		'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) && '+
+			'./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 ' +
 			' '.join(config.get('automakeParameters', []))
 	]
 	r.rules['auto_clean'] = ['rm -f config.status'] # do not re-use old configuration
 	return r
 
 # utility functions
-def getArchitecture():
-	p = subprocess.Popen(['dpkg-architecture', '-qDEB_BUILD_ARCH'], stdout=subprocess.PIPE)
+def commandInBuildEnv(config, command):
+	schroot = config.get('schroot')
+	if schroot is not None: command = ['schroot', '-c', schroot, '--'] + command
+	return command
+
+def getArchitecture(config):
+	cmd = commandInBuildEnv(config, ['dpkg-architecture', '-qDEB_BUILD_ARCH'])
+	p = subprocess.Popen(cmd, stdout=subprocess.PIPE)
 	res = p.communicate()[0] # get only stdout
 	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
@@ -62,8 +73,8 @@ def createDebianFiles(config):
 	version = config['version']
 	dbgPackage = config.get('dbgPackage', False)
 	packageArchitecture = config.get('architecture', 'any')
-	# we return the list of files generated
-	arch = getArchitecture()
+	# we return the list of files generated, so we need to know the architecture
+	arch = getArchitecture(config)
 	files = []
 	# source format file
 	if not os.path.exists('debian/source'): os.mkdir('debian/source')
@@ -93,6 +104,8 @@ def createDebianFiles(config):
 		print >>f, ""
 		print >>f, "Package:",binaryName
 		print >>f, "Architecture:",packageArchitecture
+		if 'binaryPreDepends' in config:
+			print >>f, "Pre-Depends:",writeDebList(config['binaryPreDepends'])
 		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)"
@@ -124,8 +137,8 @@ def createDebianFiles(config):
 		r.rules['auto_install'] = ['dh_auto_install --destdir=debian/'+binaryName] # install everything into the binary package
 		# for debug packages
 		if dbgPackage:
-			r.rules['strip'] = ['dh_strip --dbg-package='+binaryName+"-dbg"]
-			r.rules['installdocs'] = ['dh_installdocs --link-doc='+binaryName]
+			r.rules['strip'] = ['dh_strip --dbg-package='+binaryName+"-dbg"] # put debug files in appropriate package
+			r.rules['installdocs'] = ['dh_installdocs --link-doc='+binaryName] # make the doc folder of the dbg package a symlink
 		# dump it to a file
 		r.write(f)
 	mode = os.stat('debian/rules').st_mode
@@ -133,26 +146,24 @@ def createDebianFiles(config):
 	# return list of files affected
 	return files
 
-def buildDebianPackage():
-	subprocess.check_call(['dpkg-checkbuilddeps'])
-	subprocess.check_call(['debian/rules', 'clean'])
-	subprocess.check_call(['debian/rules', 'build'])
-	subprocess.check_call(['fakeroot', 'debian/rules', 'binary'])
-	subprocess.check_call(['debian/rules', 'clean'])
+def buildDebianPackage(config):
+	commands = ['dpkg-checkbuilddeps', 'debian/rules clean', 'debian/rules build', 'fakeroot debian/rules binary', 'debian/rules clean']
+	command = ['bash', '-c', ' && '.join(commands)]
+	subprocess.check_call(commandInBuildEnv(config, command))
 
 # if we are called directly as script
 if __name__ == "__main__":
 	# generate debian files
 	import imp
-	config = imp.load_source('config', 'debian/auto-debuild.conf')
+	config = imp.load_source('config', 'debian/auto-debuild.conf').__dict__
 	os.remove('debian/auto-debuild.confc')
-	files = createDebianFiles(config.__dict__)
+	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)
 	# run compilation
-	buildDebianPackage()
+	buildDebianPackage(config)
 	# install files
 	subprocess.check_call(['sudo', 'dpkg', '--install'] + files)