Add support for SIP

[auto-debuild.git] / auto_debuild.py

diff --git a/auto_debuild.py b/auto_debuild.py
index f1a3e84856e4edfe3e0340b1747749e50fd837cf..8149e58ef9006893541d71daac60f7f7f2bb1e13 100755 (executable)
--- a/auto_debuild.py
+++ b/auto_debuild.py
@@ -147,6 +147,7 @@ def automakeRules(r, config):
 
 def makefileRules(r, config):
        r.dh += ["--buildsystem=makefile"]
+       r.rules['auto_configure'] = []
 
 def noneRules(r, config):
        r.dh += ["--buildsystem=makefile"] # makefile does the least possible harm
@@ -197,12 +198,18 @@ def createDebianFiles(config):
        parallelJobs = config.getint('parallelJobs', 2)
        packageArchitecture = config.getstr('architecture', 'any')
        withPython2 = config.getbool('withPython2', False)
+       withSIP = config.getbool('withSIP', False)
        withAutoreconf = config.getbool('withAutoreconf', False)
        # add some build dependencies (a bit hacky adding it to the build system...)
+       if withSIP:
+               withPython2 = True
+               buildSystem.buildDepends.append("python-sip")
+               buildSystem.binaryDepends.append("${sip:Depends}")
        if withPython2:
+               buildSystem.buildDepends.append("python")
                buildSystem.binaryDepends.append("${python:Depends}")
        if withAutoreconf:
-               buildSystem.binaryDepends.append("dh-autoreconf")
+               buildSystem.buildDepends.append("dh-autoreconf")
        # we return the list of files generated, so we need to know the architecture
        arch = getArchitecture(config)
        files = []
@@ -313,6 +320,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.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
@@ -325,12 +333,13 @@ def createDebianFiles(config):
                if withPython2:
                        r.dhWith.add('python2')
                        r.rules['python2'] = ['dh_python2 --no-guessing-versions --no-shebang-rewrite']
+                       if withSIP:
+                               r.rules['python2'].append(safeCall('dh_sip', '-p'+binaryName))
                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:
-                       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:
@@ -339,7 +348,6 @@ def createDebianFiles(config):
                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)
@@ -364,7 +372,7 @@ if __name__ == "__main__":
                config = loadConfigFile('auto-debuild.conf')
                # generate debian files
                if os.path.exists('debian'):
-                       if raw_input("A debian folder already exists, to you want to remove it (y/N)? ").lower() != "y":
+                       if raw_input("A debian folder already exists, do you want to remove it (y/N)? ").lower() != "y":
                                sys.exit(1)
                        shutil.rmtree('debian')
                files = createDebianFiles(config)