X-Git-Url: https://git.ralfj.de/auto-debuild.git/blobdiff_plain/74e2c8497d6dacf9c01159ddc4b7618d1a593021..0a6ddd48a0191f5ba1e4a6c121dfafa374ae7722:/auto_debuild.py?ds=inline

diff --git a/auto_debuild.py b/auto_debuild.py
index aa0b28f..0db5388 100755
--- a/auto_debuild.py
+++ b/auto_debuild.py
@@ -35,15 +35,27 @@ 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 ' +
+		'@dpkg-architecture -qDEB_BUILD_GNU_TYPE > /dev/null', # make sure this command runs successfully (and hope it does so again)
+		'@dpkg-architecture -qDEB_BUILD_MULTIARCH > /dev/null', # make sure this command runs successfully (and hope it does so again)
+		'./configure --build=$$(dpkg-architecture -qDEB_BUILD_GNU_TYPE) ' +
+			'--prefix=/usr --includedir=/usr/include --mandir=/usr/share/man --infodir=/usr/share/info ' +
+			'--libdir=/usr/lib/$$(dpkg-architecture -qDEB_BUILD_MULTIARCH) '+
+			'--libexecdir=/usr/lib/$$(dpkg-architecture -qDEB_BUILD_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
@@ -63,7 +75,7 @@ def createDebianFiles(config):
 	dbgPackage = config.get('dbgPackage', False)
 	packageArchitecture = config.get('architecture', 'any')
 	# we return the list of files generated
-	arch = getArchitecture()
+	arch = getArchitecture(config)
 	files = []
 	# source format file
 	if not os.path.exists('debian/source'): os.mkdir('debian/source')
@@ -133,26 +145,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)