From: Ralf Jung Date: Tue, 17 Jul 2012 16:40:25 +0000 (+0200) Subject: build a proper representation of the rules file beforde dumping it; avoid these annoy... X-Git-Url: https://git.ralfj.de/auto-debuild.git/commitdiff_plain/3960c6215e9549f7dc7c06e4f2e906acf820d2b5 build a proper representation of the rules file beforde dumping it; avoid these annoying .pyc files --- diff --git a/auto_debuild.py b/auto_debuild.py index 3a9deaf..f8ff641 100755 --- a/auto_debuild.py +++ b/auto_debuild.py @@ -1,5 +1,23 @@ #!/usr/bin/python import os, stat, time, subprocess, sys +from collections import OrderedDict + +class RulesFile: + def __init__(self): + self.buildOptions = '' + self.dh = [] + self.rules = OrderedDict() + + def write(self, f): + print >>f, "#!/usr/bin/make -f" + print >>f, "" + print >>f, "%:" + print >>f, '\tDEB_BUILD_OPTIONS="'+self.buildOptions+'" dh $@',' '.join(self.dh) + for rule in self.rules: + print >>f, "" + print >>f, "override_dh_"+rule+":" + for line in self.rules[rule]: + print >>f, "\t"+line def getArchitecture(): p = subprocess.Popen(['dpkg-architecture', '-qDEB_BUILD_ARCH'], stdout=subprocess.PIPE) @@ -8,17 +26,15 @@ def getArchitecture(): return res[0:len(res)-1] # chop of the \n at the end # build-system specific part of rules file -def writeCmakeRulesFile(f, config): - print >>f, "%:" - print >>f, "\tdh $@ --buildsystem cmake --parallel --builddirectory=build.dir" # "build" is not a good idea, as that's also the name of a target... - print >>f, "" - print >>f, "override_dh_auto_configure:" - print >>f, "\tmkdir -p build.dir" - print >>f, "\tcd build.dir && cmake ..",' '.join(['-DCMAKE_INSTALL_PREFIX=/usr', '-DCMAKE_BUILD_TYPE=Release'] + config.get('cmakeParameters', [])) - print >>f, "" - print >>f, "override_dh_auto_clean:" - print >>f, " rm -f build.dir/CMakeCache.txt # clean old cmake cache" - print >>f, "" +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=Release'] + config.get('cmakeParameters', [])) + ] + r.rules['auto_clean'] = ['rm -f build.dir/CMakeCache.txt'] # clean old cmake cache + return r def writeDebList(list): return ', '.join(list) @@ -69,25 +85,28 @@ def createDebianFiles(config): files.append(os.path.join(debDir, "%s_%s_%s.deb" % (binaryName, version, arch))) # rules file: build system specific with open('debian/rules', 'w') as f: - print >>f, "#!/usr/bin/make -f" - print >>f, "" + # get rule file for build system if buildSystem == 'cmake': - writeCmakeRulesFile(f, config) + r = cmakeRules(config) else: raise Exception("Invalid build system "+buildSystem) - print >>f, "" - print >>f, "override_dh_builddeb:" # put deb in other folder - print >>f, "\tdh_builddeb --destdir="+debDir - print >>f, "override_dh_auto_test:" # do not test - print >>f, "" - # overwrite: auto_config, auto_test, auto_clean, builddeb + # global rules + r.buildOptions = "parallel=2" + r.dh += ['--parallel'] + if not 'builddeb' in r.rules: + 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...) + else: + print "WARNING: Build system messes with global rules" + if not 'auto_test' in r.rules: # unless the build system has something in mind for this + r.rules['auto_test'] = [] + # dump it to a file + r.write(f) mode = os.stat('debian/rules').st_mode os.chmod('debian/rules', mode | stat.S_IXUSR | stat.S_IXGRP | stat.S_IXOTH) # return list of files affected return files def buildDebianPackage(): - os.putenv("DEB_BUILD_OPTIONS", "parallel=2") subprocess.check_call(['dpkg-checkbuilddeps']) subprocess.check_call(['debian/rules', 'clean']) subprocess.check_call(['debian/rules', 'build']) @@ -96,15 +115,15 @@ def buildDebianPackage(): # if we are called directly as script if __name__ == "__main__": - import imp # generate debian files - config = imp.load_source('config', 'debian/auto-debuild.py') + import imp + config = imp.load_source('config', 'debian/auto-debuild.conf') + os.remove('debian/auto-debuild.confc') files = createDebianFiles(config.__dict__) # 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)? \n" % file).lower() != "y": + if raw_input("Do you want to overwrite %s (y/N)? " % file).lower() != "y": sys.exit(1) # run compilation buildDebianPackage() -