rely on dh to auto-generate the dbgsym packages

[auto-debuild.git] / auto_debuild.py

diff --git a/auto_debuild.py b/auto_debuild.py
index 410d8489cd3118b5d5fd2e4cd0f79db5c06e43a9..208010984fcc4da949235725420e0f2609598595 100755 (executable)
--- a/auto_debuild.py
+++ b/auto_debuild.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/env python3

 # auto-debuild - Automatic Generation of Debian Packages
 # Copyright (C) 2012 Ralf Jung <post@ralfj.de>
 #
 # auto-debuild - Automatic Generation of Debian Packages
 # Copyright (C) 2012 Ralf Jung <post@ralfj.de>
 #


@@ -105,7 +105,7 @@ class RulesFile:
                print(file=f)
                print(".PHONY: build", file=f) # there may be a directory called "build"
                print(file=f)
                print(file=f)
                print(".PHONY: build", file=f) # there may be a directory called "build"
                print(file=f)

-               print("build %:", file=f) # need to mention "build" here again explicitly so PHONY takes effect
+               print("%:", file=f)

                # write proper dh call
                dh = self.dh
                if self.dhWith:
                # write proper dh call
                dh = self.dh
                if self.dhWith:


@@ -138,6 +138,7 @@ def automakeRules(r, config):
        #  and HOST_GNU_TYPE are equal, and if they are not, add a --host parameter)
        r.dh += ["--buildsystem=autoconf", "--builddirectory="+config.getstr('buildDir')]
        r.rules['auto_configure'] = [
        #  and HOST_GNU_TYPE are equal, and if they are not, add a --host parameter)
        r.dh += ["--buildsystem=autoconf", "--builddirectory="+config.getstr('buildDir')]
        r.rules['auto_configure'] = [

+        (safeCall(*config['autogen']) + " && " if 'autogen' in config else '') +

                safeCall("mkdir", "-p", buildDir),
                safeCall("cd", buildDir) + " && " +
                'BUILD_TYPE=$$(dpkg-architecture -qDEB_BUILD_GNU_TYPE) && ' + # doing the expansion beforehand ensures that we cancel if it fails
                safeCall("mkdir", "-p", buildDir),
                safeCall("cd", buildDir) + " && " +
                'BUILD_TYPE=$$(dpkg-architecture -qDEB_BUILD_GNU_TYPE) && ' + # doing the expansion beforehand ensures that we cancel if it fails


@@ -177,25 +178,23 @@ def commandInBuildEnv(config, command):
 
 def getArchitecture(config):
        cmd = commandInBuildEnv(config, ['dpkg-architecture', '-qDEB_HOST_ARCH'])
 
 def getArchitecture(config):
        cmd = commandInBuildEnv(config, ['dpkg-architecture', '-qDEB_HOST_ARCH'])

-       with subprocess.Popen(cmd, stdout=subprocess.PIPE) as p:
-               res = p.communicate()[0] # get only stdout
-               if p.returncode != 0: raise Exception("Querying dpkg for the architecture failed")
-       return res[0:len(res)-1] # chop of the \n at the end
+       output = subprocess.check_output(cmd)
+       return output.decode('utf-8').strip('\n') # chop off the \n at the end

 
 def writeDependency(f, name, list):
        if len(list):
                print(name+": "+', '.join(list), file=f)
 
 
 def writeDependency(f, name, list):
        if len(list):
                print(name+": "+', '.join(list), file=f)
 

+# actual work functions

 def deleteDebianFolder():
        if os.path.islink('debian'):
                target = os.readlink('debian')
                if os.path.exists(target):
                        shutil.rmtree(target)
                os.remove('debian')
 def deleteDebianFolder():
        if os.path.islink('debian'):
                target = os.readlink('debian')
                if os.path.exists(target):
                        shutil.rmtree(target)
                os.remove('debian')

-       else:
+       elif os.path.exists('debian'):

                shutil.rmtree('debian')
 
                shutil.rmtree('debian')
 

-# actual work functions

 def createDebianFiles(config):
        if not isinstance(config, ConfigDict):
                config = ConfigDict(config)
 def createDebianFiles(config):
        if not isinstance(config, ConfigDict):
                config = ConfigDict(config)


@@ -208,7 +207,6 @@ def createDebianFiles(config):
        buildSystem = buildSystems[config.getstr('buildSystem')] # get the data immediately
        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
        buildSystem = buildSystems[config.getstr('buildSystem')] # get the data immediately
        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', multiprocessing.cpu_count()+1)
        packageArchitecture = config.getstr('architecture', 'any')
        withPython2 = config.getbool('withPython2', False)
        parallelJobs = config.getint('parallelJobs', multiprocessing.cpu_count()+1)
        packageArchitecture = config.getstr('architecture', 'any')
        withPython2 = config.getbool('withPython2', False)


@@ -277,18 +275,8 @@ def createDebianFiles(config):
                writeDependency(f, "Replaces", config.get('binaryReplaces', []) + config.get('binaryBreaksReplaces', []))
                print("Description:",sourceName,"(auto-debuild)", file=f)
                print(" Package auto-generated by auto-debuild.", file=f)
                writeDependency(f, "Replaces", config.get('binaryReplaces', []) + config.get('binaryBreaksReplaces', []))
                print("Description:",sourceName,"(auto-debuild)", file=f)
                print(" Package auto-generated by auto-debuild.", file=f)

-               files.append(os.path.join(debDir, "%s_%s_%s.deb" % (binaryName, version, arch)))
-               # debug package
-               if dbgPackage:
-                       print(file=f)
-                       print("Package:",binaryName+"-dbg", file=f)
-                       print("Section: debug", file=f)
-                       print("Priority: extra", file=f)
-                       print("Architecture:",packageArchitecture, file=f)
-                       writeDependency(f, "Depends", ["${misc:Depends}", binaryName+" (= ${binary:Version})"])
-                       print("Description:",sourceName,"debug smbols (auto-debuild)", file=f)
-                       print(" Package containing debug symbols for "+sourceName+", auto-generated by auto-debuild.", file=f)
-                       files.append(os.path.join(debDir, "%s-dbg_%s_%s.deb" % (binaryName, version, arch)))
+               files.append(os.path.join(debDir, "{}_{}_{}.deb".format(binaryName, version, arch)))
+               files.append(os.path.join(debDir, "{}-dbgsym_{}_{}.deb".format(binaryName, version, arch)))

                # shim packages
                for shim in config.get('binaryShims', []):
                        print(file=f)
                # shim packages
                for shim in config.get('binaryShims', []):
                        print(file=f)


@@ -299,7 +287,7 @@ def createDebianFiles(config):
                        writeDependency(f, "Depends", ["${misc:Depends}", binaryName+" (= ${binary:Version})"])
                        print("Description:",sourceName,"shim for",shim,"(auto-debuild)", file=f)
                        print(" Package pretending to be "+shim+", auto-generated by auto-debuild.", file=f)
                        writeDependency(f, "Depends", ["${misc:Depends}", binaryName+" (= ${binary:Version})"])
                        print("Description:",sourceName,"shim for",shim,"(auto-debuild)", file=f)
                        print(" Package pretending to be "+shim+", auto-generated by auto-debuild.", file=f)

-                       files.append(os.path.join(debDir, "%s_%s_%s.deb" % (shim, version, arch)))
+                       files.append(os.path.join(debDir, "{}_{}_{}.deb".format(shim, version, arch)))

        # install file
        with open('debian/'+binaryName+'.install', 'w') as f:
                for line in config.get('binaryInstallFiles', []):
        # install file
        with open('debian/'+binaryName+'.install', 'w') as f:
                for line in config.get('binaryInstallFiles', []):


@@ -343,10 +331,6 @@ def createDebianFiles(config):
                buildSystem.ruleMaker(r, config)
                # global rules
                r.env["DEB_BUILD_OPTIONS"] = 'parallel='+str(parallelJobs)
                buildSystem.ruleMaker(r, config)
                # global rules
                r.env["DEB_BUILD_OPTIONS"] = 'parallel='+str(parallelJobs)

-               if not dbgPackage:
-                       # disable debug information
-                       r.env["DEB_CFLAGS_APPEND"] = '-g0'
-                       r.env["DEB_CXXFLAGS_APPEND"] = '-g0'

                r.dh += ['--parallel']
                if withPython2:
                        r.dhWith.add('python2')
                r.dh += ['--parallel']
                if withPython2:
                        r.dhWith.add('python2')


@@ -359,9 +343,6 @@ def createDebianFiles(config):
                # installation rule
                if 'binarySkipFiles' in config:
                        r.rules['auto_install'].append(safeCall('cd', 'debian/'+binaryName) + " && " + safeCall('rm', *config.get('binarySkipFiles')))
                # installation rule
                if 'binarySkipFiles' in config:
                        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

                # make the doc folder of the other packages a symlink (dbg, shims)
                r.rules['installdocs'] = [safeCall('dh_installdocs', '--link-doc='+binaryName)]
                # wait after configuration?
                # make the doc folder of the other packages a symlink (dbg, shims)
                r.rules['installdocs'] = [safeCall('dh_installdocs', '--link-doc='+binaryName)]
                # wait after configuration?