X-Git-Url: https://git.ralfj.de/auto-debuild.git/blobdiff_plain/49465b61f6d221f4507e9c3c600a48c34a20293f..f2827092df37a79178807b7d018e126ae2c9c6c2:/auto_debuild.py?ds=sidebyside

diff --git a/auto_debuild.py b/auto_debuild.py
index 2bb4f8c..3844102 100755
--- a/auto_debuild.py
+++ b/auto_debuild.py
@@ -119,10 +119,9 @@ class RulesFile:
 				print >>f, "\t"+line
 
 # rule-makers
-def cmakeRules(config):
+def cmakeRules(r, config):
 	buildDir = config.getstr('buildDir', 'build')
 	srcDir = os.getcwd()
-	r = RulesFile()
 	r.dh += ["--buildsystem=cmake", "--builddirectory="+buildDir] # dh parameters
 	r.rules['auto_configure'] = [
 		safeCall("mkdir", "-p", buildDir),
@@ -130,13 +129,11 @@ def cmakeRules(config):
 		  safeCall("cmake", srcDir, "-DCMAKE_INSTALL_PREFIX=/usr", *config.get('cmakeParameters', []))
 	]
 	r.rules['auto_clean'] = [safeCall('rm', '-f', os.path.join(buildDir, 'CMakeCache.txt'))] # clean old cmake cache
-	return r
 
-def automakeRules(config):
+def automakeRules(r, config):
 	# "build" is what we are building *on*, and "host" is what we are building *for* (and GNU is weird...)
 	# also, we don't really support cross-building... ;-) (to do, we'd have to write shell code that checks whether BUILD_GNU_TYPE
 	#  and HOST_GNU_TYPE are equal, and if they are not, add a --host parameter)
-	r = RulesFile()
 	r.dh += ["--buildsystem=autoconf"]
 	r.rules['auto_configure'] = [
 		'BUILD_TYPE=$$(dpkg-architecture -qDEB_BUILD_GNU_TYPE) && ' + # doing the expansion beforehand ensures that we cancel if it fails
@@ -148,22 +145,23 @@ def automakeRules(config):
 			safeCall(*config.get('automakeParameters', []))
 	]
 	r.rules['auto_clean'] = ['rm -f config.status'] # do not re-use old configuration (no need for escaping here, obviously)
-	return r
 
-def pythonRules(config):
-	r = RulesFile()
+def pythonRules(r, config):
 	r.dh += ["--buildsystem=python_distutils"]
 	r.dhWith.add('python2')
 	r.rules['auto_clean'] = [ # clean properly
 		'dh_auto_clean',
 		'rm -rf build'
 	]
-	return r
 
-def noneRules(config):
-	r = RulesFile()
-	r.dh += ["--buildsystem=makefile"] # makefile does the last possible harm
+def makefileRules(r, config):
+	r.dh += ["--buildsystem=makefile"]
+
+def noneRules(r, config):
+	r.dh += ["--buildsystem=makefile"] # makefile does the least possible harm
+	r.rules['auto_configure'] = []
 	r.rules['auto_build'] = []
+	r.rules['auto_clean'] = []
 	return r
 
 # build systems
@@ -171,6 +169,7 @@ buildSystems = {
 	'cmake': BuildSystem(cmakeRules, ["cmake"]),
 	'automake': BuildSystem(automakeRules),
 	'python': BuildSystem(pythonRules, ["python-setuptools"], ["${python:Depends}"]),
+	'makefile': BuildSystem(makefileRules),
 	'none': BuildSystem(noneRules),
 }
 
@@ -201,7 +200,8 @@ def createDebianFiles(config):
 	email = config.getstr('email', os.getenv('USER')+'@'+os.uname()[1]) # user@hostname
 	debDir = os.path.expanduser(config.getstr('debDir'))
 	buildSystem = buildSystems[config.getstr('buildSystem')] # get the data immediately
-	version = config.getstr('version')
+	version = config.getstr('version') # version name excluding epoch (used for filenames)
+	fullVersion = str(config.getint('epoch'))+':'+version if 'epoch' in config else version # version name including epoch
 	dbgPackage = config.getbool('dbgPackage', False)
 	parallelJobs = config.getint('parallelJobs', 2)
 	packageArchitecture = config.getstr('architecture', 'any')
@@ -227,19 +227,21 @@ def createDebianFiles(config):
 		print >>f, "Auto-generated by auto-debuild, not suited for distribution"
 	# changelog file
 	with open('debian/changelog', 'w') as f:
-		print >>f, sourceName,"("+version+")","UNRELEASED; urgency=low"
+		print >>f, sourceName,"("+fullVersion+")","UNRELEASED; urgency=low"
 		print >>f, ""
 		print >>f, "  * Auto-generated by auto-debuild"
 		print >>f, ""
 		print >>f, " --",name,"<"+email+">  "+time.strftime('%a, %d %b %Y %H:%M:%S %z')
 	# control file
 	with open('debian/control', 'w') as f:
+		# source package
 		print >>f, "Source:",sourceName
 		print >>f, "Section:",config.getstr('section', 'misc')
 		print >>f, "Priority: extra"
 		print >>f, "Maintainer: %s <%s>" % (name, email)
 		writeDependency(f, 'Build-Depends', ["debhelper (>= 9)"] + buildSystem.buildDepends + config.get('buildDepends', []))
 		print >>f, "Standards-Version: 3.9.3"
+		# main binary package
 		print >>f, ""
 		print >>f, "Package:",binaryName
 		print >>f, "Architecture:",packageArchitecture
@@ -256,6 +258,7 @@ def createDebianFiles(config):
 		print >>f, "Description:",sourceName,"(auto-debuild)"
 		print >>f, " Package auto-generated by auto-debuild."
 		files.append(os.path.join(debDir, "%s_%s_%s.deb" % (binaryName, version, arch)))
+		# debug package
 		if dbgPackage:
 			print >>f, ""
 			print >>f, "Package:",binaryName+"-dbg"
@@ -266,6 +269,17 @@ def createDebianFiles(config):
 			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)))
+		# shim packages
+		for shim in config.get('binaryShims', []):
+			print >>f, ""
+			print >>f, "Package:",shim
+			print >>f, "Section:",config.getstr('section', 'misc')
+			print >>f, "Priority: extra"
+			print >>f, "Architecture:",packageArchitecture
+			writeDependency(f, "Depends", ["${misc:Depends}", binaryName+" (= ${binary:Version})"])
+			print >>f, "Description:",sourceName,"shim for",shim,"(auto-debuild)"
+			print >>f, " Package pretending to be "+shim+", auto-generated by auto-debuild."
+			files.append(os.path.join(debDir, "%s_%s_%s.deb" % (shim, version, arch)))
 	# install file
 	with open('debian/'+binaryName+'.install', 'w') as f:
 		for line in config.get('binaryInstallFiles', []):
@@ -300,8 +314,12 @@ def createDebianFiles(config):
 			print >>f, 'exit 0'
 	# rules file: build system specific
 	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
-		r = buildSystem.ruleMaker(config)
+		# pre-fill rule file with our global defaults
+		r = RulesFile()
+		r.rules['auto_test'] = []
+		r.rules['auto_install'] = [safeCall('dh_auto_install', '--destdir=debian/'+binaryName)] # install everything into the binary package
+		# patch rule file for build system: may only touch auto_* rules and the dh options
+		buildSystem.ruleMaker(r, config)
 		# global rules
 		r.env["DEB_BUILD_OPTIONS"] = 'parallel='+str(parallelJobs)
 		if not dbgPackage:
@@ -313,16 +331,15 @@ def createDebianFiles(config):
 			r.dhWith.add('python2')
 			r.rules['python2'] = ['dh_python2 --no-guessing-versions']
 		r.rules['builddeb'] = [safeCall('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'] = []
 		# installation rule
-		r.rules['auto_install'] = [safeCall('dh_auto_install', '--destdir=debian/'+binaryName)] # install everything into the binary package
 		if 'binarySkipFiles' in config:
-			r.rules['auto_install'].append(safeCall('cd', 'debian/'+binaryName) + " && " +
-				safeCall('rm', *config.get('binarySkipFiles')))
-		# for debug packages
+			if not 'auto_install' in r.rules: r.rules['auto_install'] = ['dh_auto_install'] # make sure there is an override
+			r.rules['auto_install'].append(safeCall('cd', 'debian/'+binaryName) + " && " + safeCall('rm', *config.get('binarySkipFiles')))
+		# debug packages
 		if dbgPackage:
 			r.rules['strip'] = [safeCall('dh_strip', '--dbg-package='+binaryName+"-dbg")] # put debug files in appropriate package
-			r.rules['installdocs'] = [safeCall('dh_installdocs', '--link-doc='+binaryName)] # make the doc folder of the dbg package a symlink
+		# make the doc folder of the other packages a symlink (dbg, shims)
+		r.rules['installdocs'] = [safeCall('dh_installdocs', '--link-doc='+binaryName)]
 		# wait after configuration?
 		if config.getbool('waitAfterConfig', False):
 			if not 'auto_configure' in r.rules: r.rules['auto_configure'] = ['dh_auto_configure'] # make sure there is an override
@@ -337,10 +354,10 @@ def createDebianFiles(config):
 def buildDebianPackage(config):
 	if not isinstance(config, ConfigDict):
 		config = ConfigDict(config)
-	commands = ['dpkg-checkbuilddeps', 'debian/rules clean', 'debian/rules build', 'fakeroot debian/rules binary', 'debian/rules clean']
+	commands = ['dpkg-checkbuilddeps', 'debian/rules clean', 'debian/rules build', 'fakeroot debian/rules binary']
 	command = ['bash', '-c', ' && '.join(commands)] # make it all one command, so we don't have to open and close the chroot too often
 	subprocess.check_call(commandInBuildEnv(config, command))
-	shutil.rmtree('debian') # it only contains what we just created
+	shutil.rmtree('debian') # cleanup: the debian folder only contains what we just created
 
 ###################################################################
 # if we are called directly as script