install packages after creating them; add support for debug packages

diff --git a/auto_debuild.py b/auto_debuild.py
index f8ff6419255c39784c9a9ff21254629b36b67440..77493c350166f48755a36317f009fb869a58649a 100755 (executable)
--- a/auto_debuild.py
+++ b/auto_debuild.py
@@ -26,12 +26,13 @@ def getArchitecture():
        return res[0:len(res)-1] # chop of the \n at the end
 
 # build-system specific part of rules file
        return res[0:len(res)-1] # chop of the \n at the end
 
 # build-system specific part of rules file

-def cmakeRules(config):
+def cmakeRules(dbg, config):
+       buildType = 'RelWithDebInfo' if dbg else 'Release'

        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',
        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', []))
+               "cd build.dir && cmake .. "+' '.join(['-DCMAKE_INSTALL_PREFIX=/usr', '-DCMAKE_BUILD_TYPE='+buildType] + config.get('cmakeParameters', []))

        ]
        r.rules['auto_clean'] = ['rm -f build.dir/CMakeCache.txt'] # clean old cmake cache
        return r
        ]
        r.rules['auto_clean'] = ['rm -f build.dir/CMakeCache.txt'] # clean old cmake cache
        return r


@@ -47,6 +48,8 @@ def createDebianFiles(config):
        debDir = os.path.expanduser(config['debDir'])
        buildSystem = config['buildSystem']
        version = config['version']
        debDir = os.path.expanduser(config['debDir'])
        buildSystem = config['buildSystem']
        version = config['version']

+       dbgPackage = config.get('dbgPackage', False)
+       packageArchitecture = config.get('architecture', 'any')

        # we return the list of files generated
        arch = getArchitecture()
        files = []
        # we return the list of files generated
        arch = getArchitecture()
        files = []


@@ -77,28 +80,37 @@ def createDebianFiles(config):
                print >>f, "Standards-Version: 3.9.3"
                print >>f, ""
                print >>f, "Package:",binaryName
                print >>f, "Standards-Version: 3.9.3"
                print >>f, ""
                print >>f, "Package:",binaryName

-               print >>f, "Architecture:",config.get('architecture', 'any')
+               print >>f, "Architecture:",packageArchitecture

                print >>f, "Depends:",writeDebList(["${shlibs:Depends}", "${misc:Depends}"] + config.get('binaryDepends', []))
                print >>f, "Provides:",writeDebList(config.get('binaryProvides', [sourceName]))
                print >>f, "Description:",sourceName,"(auto-debuild)"
                print >>f, "Depends:",writeDebList(["${shlibs:Depends}", "${misc:Depends}"] + config.get('binaryDepends', []))
                print >>f, "Provides:",writeDebList(config.get('binaryProvides', [sourceName]))
                print >>f, "Description:",sourceName,"(auto-debuild)"

-               print >>f, " Package auto-generated by auto-debuild"
+               print >>f, " Package auto-generated by auto-debuild."

                files.append(os.path.join(debDir, "%s_%s_%s.deb" % (binaryName, version, arch)))
                files.append(os.path.join(debDir, "%s_%s_%s.deb" % (binaryName, version, arch)))

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

        # rules file: build system specific
        with open('debian/rules', 'w') as f:
        # rules file: build system specific
        with open('debian/rules', 'w') as f:

-               # get rule file for build system
+               # get rule file for build system: may only touch auto_config and auto_clean rules and the dh options

                if buildSystem == 'cmake':
                if buildSystem == 'cmake':

-                       r = cmakeRules(config)
+                       r = cmakeRules(dbgPackage, config)

                else:
                        raise Exception("Invalid build system "+buildSystem)
                # global rules
                r.buildOptions = "parallel=2"
                r.dh += ['--parallel']
                else:
                        raise Exception("Invalid build system "+buildSystem)
                # 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'] = []
+               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...)
+               r.rules['auto_test'] = []
+               # for debug packages
+               if dbgPackage:
+                       r.rules['strip'] = ['dh_strip --dbg-package='+binaryName+"-dbg"]
+                       r.rules['auto_install'] = ['dh_auto_install --destdir=debian/'+binaryName]
+                       r.rules['installdocs'] = ['dh_installdocs --link-doc='+binaryName]

                # dump it to a file
                r.write(f)
        mode = os.stat('debian/rules').st_mode
                # dump it to a file
                r.write(f)
        mode = os.stat('debian/rules').st_mode


@@ -127,3 +139,5 @@ if __name__ == "__main__":
                                sys.exit(1)
        # run compilation
        buildDebianPackage()
                                sys.exit(1)
        # run compilation
        buildDebianPackage()

+       # install files
+       subprocess.check_call(['sudo', 'dpkg', '--install'] + files)