X-Git-Url: https://git.ralfj.de/auto-debuild.git/blobdiff_plain/e487d02a8ed99eb83a7be8e500350dbb35f59e1e..55180f98e11f87580fc8d90f963bc10982483197:/auto_debuild.py

diff --git a/auto_debuild.py b/auto_debuild.py
index 08a9a79..36cef6d 100755
--- a/auto_debuild.py
+++ b/auto_debuild.py
@@ -35,7 +35,12 @@ 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
@@ -68,7 +73,7 @@ def createDebianFiles(config):
 	version = config['version']
 	dbgPackage = config.get('dbgPackage', False)
 	packageArchitecture = config.get('architecture', 'any')
-	# we return the list of files generated
+	# we return the list of files generated, so we need to know the architecture
 	arch = getArchitecture(config)
 	files = []
 	# source format file
@@ -99,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)"
@@ -130,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
@@ -144,19 +151,26 @@ def buildDebianPackage(config):
 	command = ['bash', '-c', ' && '.join(commands)]
 	subprocess.check_call(commandInBuildEnv(config, command))
 
-# if we are called directly as script
-if __name__ == "__main__":
+# all at once
+def createAndInstall(config, overwriteCheck = False):
 	# generate debian files
-	import imp
-	config = imp.load_source('config', 'debian/auto-debuild.conf').__dict__
-	os.remove('debian/auto-debuild.confc')
 	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)
+	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)
 	# run compilation
 	buildDebianPackage(config)
 	# install 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)