Ensure auto_install and auto_configure are always overriden, to ease appending to...

[auto-debuild.git] / auto_debuild.py

diff --git a/auto_debuild.py b/auto_debuild.py
index d3a6527da1dd9427bc3f22c8ac56a8c6db34a506..5f1fd3e30513f27b54f9cfb3cbf41866dd0f3b96 100755 (executable)
--- a/auto_debuild.py
+++ b/auto_debuild.py
@@ -141,24 +141,15 @@ 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 '+
                        './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)
 
        ]
        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"]
 def makefileRules(r, config):
        r.dh += ["--buildsystem=makefile"]

+       r.rules['auto_configure'] = []

 
 

-def noneRules(config):
-       r = RulesFile()
+def noneRules(r, config):

        r.dh += ["--buildsystem=makefile"] # makefile does the least possible harm
        r.rules['auto_configure'] = []
        r.rules['auto_build'] = []
        r.dh += ["--buildsystem=makefile"] # makefile does the least possible harm
        r.rules['auto_configure'] = []
        r.rules['auto_build'] = []


@@ -169,7 +160,6 @@ def noneRules(config):
 buildSystems = {
        'cmake': BuildSystem(cmakeRules, ["cmake"]),
        'automake': BuildSystem(automakeRules),
 buildSystems = {
        'cmake': BuildSystem(cmakeRules, ["cmake"]),
        'automake': BuildSystem(automakeRules),

-       'python': BuildSystem(pythonRules, ["python-setuptools"], ["${python:Depends}"]),

        'makefile': BuildSystem(makefileRules),
        'none': BuildSystem(noneRules),
 }
        'makefile': BuildSystem(makefileRules),
        'none': BuildSystem(noneRules),
 }


@@ -197,6 +187,7 @@ def createDebianFiles(config):
                config = ConfigDict(config)
        sourceName = config.getstr('sourceName')
        binaryName = config.getstr('binaryName', sourceName+'-local')
                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'))
        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'))


@@ -207,8 +198,12 @@ def createDebianFiles(config):
        parallelJobs = config.getint('parallelJobs', 2)
        packageArchitecture = config.getstr('architecture', 'any')
        withPython2 = config.getbool('withPython2', False)
        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:
        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 = []
        # we return the list of files generated, so we need to know the architecture
        arch = getArchitecture(config)
        files = []


@@ -319,6 +314,7 @@ def createDebianFiles(config):
                r = RulesFile()
                r.rules['auto_test'] = []
                r.rules['auto_install'] = [safeCall('dh_auto_install', '--destdir=debian/'+binaryName)] # install everything into the binary package
                r = RulesFile()
                r.rules['auto_test'] = []
                r.rules['auto_install'] = [safeCall('dh_auto_install', '--destdir=debian/'+binaryName)] # install everything into the binary package

+               r.rules['auto_configure'] = ['dh_auto_configure'] # make sure there is an override (we may just append to it later)

                # patch rule file for build system: may only touch auto_* rules and the dh options
                buildSystem.ruleMaker(r, config)
                # global rules
                # patch rule file for build system: may only touch auto_* rules and the dh options
                buildSystem.ruleMaker(r, config)
                # global rules


@@ -330,11 +326,12 @@ def createDebianFiles(config):
                r.dh += ['--parallel']
                if withPython2:
                        r.dhWith.add('python2')
                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:
                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:

-                       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['auto_install'].append(safeCall('cd', 'debian/'+binaryName) + " && " + safeCall('rm', *config.get('binarySkipFiles')))
                # debug packages
                if dbgPackage:


@@ -343,7 +340,6 @@ def createDebianFiles(config):
                r.rules['installdocs'] = [safeCall('dh_installdocs', '--link-doc='+binaryName)]
                # wait after configuration?
                if config.getbool('waitAfterConfig', False):
                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

                        r.rules['auto_configure'].append("@"+safeCall('read', '-p', 'Configuration done. Hit "Enter" to build the package. ', 'DUMMY_VAR')) # if we run in dash, we need to tell it which variable to use for the result...
                # dump it to a file
                r.write(f)
                        r.rules['auto_configure'].append("@"+safeCall('read', '-p', 'Configuration done. Hit "Enter" to build the package. ', 'DUMMY_VAR')) # if we run in dash, we need to tell it which variable to use for the result...
                # dump it to a file
                r.write(f)