From: Ralf Jung Date: Wed, 3 Apr 2013 21:08:12 +0000 (+0200) Subject: Fix --docdir in automake; remove python build system; do not attempt to fix python... X-Git-Url: https://git.ralfj.de/auto-debuild.git/commitdiff_plain/60e14aacfd2349b4ecc6801194bba8d60a11ff4e Fix --docdir in automake; remove python build system; do not attempt to fix python shebangs --- diff --git a/auto_debuild.py b/auto_debuild.py index 3844102..f1a3e84 100755 --- a/auto_debuild.py +++ b/auto_debuild.py @@ -141,19 +141,10 @@ def automakeRules(r, config): './configure --build=$$BUILD_TYPE '+ # do the escape manually here so we can use the variables (there's no user-controlled string in here anyway) '--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 '+ - safeCall(*config.get('automakeParameters', [])) + safeCall('--docdir=/usr/share/doc/'+config['binaryName'], '--sysconfdir=/etc', '--localstatedir=/var', *config.get('automakeParameters', [])) ] r.rules['auto_clean'] = ['rm -f config.status'] # do not re-use old configuration (no need for escaping here, obviously) -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' - ] - def makefileRules(r, config): r.dh += ["--buildsystem=makefile"] @@ -168,7 +159,6 @@ def noneRules(r, config): buildSystems = { 'cmake': BuildSystem(cmakeRules, ["cmake"]), 'automake': BuildSystem(automakeRules), - 'python': BuildSystem(pythonRules, ["python-setuptools"], ["${python:Depends}"]), 'makefile': BuildSystem(makefileRules), 'none': BuildSystem(noneRules), } @@ -196,6 +186,7 @@ def createDebianFiles(config): config = ConfigDict(config) sourceName = config.getstr('sourceName') binaryName = config.getstr('binaryName', sourceName+'-local') + config['binaryName'] = binaryName # make it usable by build systems name = config.getstr('name', os.getenv('USER')) # os.getlogin() fails in minimal chroots email = config.getstr('email', os.getenv('USER')+'@'+os.uname()[1]) # user@hostname debDir = os.path.expanduser(config.getstr('debDir')) @@ -206,8 +197,12 @@ def createDebianFiles(config): parallelJobs = config.getint('parallelJobs', 2) packageArchitecture = config.getstr('architecture', 'any') withPython2 = config.getbool('withPython2', False) + withAutoreconf = config.getbool('withAutoreconf', False) + # add some build dependencies (a bit hacky adding it to the build system...) if withPython2: - buildSystem.binaryDepends.append("${python:Depends}") # HACK, but it works: make sure dependencies on binary are added + buildSystem.binaryDepends.append("${python:Depends}") + if withAutoreconf: + buildSystem.binaryDepends.append("dh-autoreconf") # we return the list of files generated, so we need to know the architecture arch = getArchitecture(config) files = [] @@ -329,7 +324,9 @@ def createDebianFiles(config): r.dh += ['--parallel'] if withPython2: r.dhWith.add('python2') - r.rules['python2'] = ['dh_python2 --no-guessing-versions'] + r.rules['python2'] = ['dh_python2 --no-guessing-versions --no-shebang-rewrite'] + if withAutoreconf: + r.dhWith.add('autoreconf') 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...) # installation rule if 'binarySkipFiles' in config: