Build autoconf projects out-of-tree; put debian/ folder on /tmp

diff --git a/auto_debuild.py b/auto_debuild.py
index 8149e58ef9006893541d71daac60f7f7f2bb1e13..94c7c14cce1e67da623dfa60c530dedc8da207d3 100755 (executable)
--- a/auto_debuild.py
+++ b/auto_debuild.py
@@ -16,7 +16,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
-import os, shutil, stat, time, subprocess, sys, shlex
+import os, shutil, stat, time, subprocess, sys, shlex, tempfile
 from collections import OrderedDict
 
 # a dict with some useful additional getters which can convert types and handle one-element lists like their single member
@@ -131,19 +131,24 @@ def cmakeRules(r, config):
        r.rules['auto_clean'] = [safeCall('rm', '-f', os.path.join(buildDir, 'CMakeCache.txt'))] # clean old cmake cache
 
 def automakeRules(r, config):
+       buildDir = config.getstr('buildDir', 'build')
+       srcDir = os.getcwd()
        # "build" is what we are building *on*, and "host" is what we are building *for* (and GNU is weird...)
-       # also, we don't really support cross-building... ;-) (to do, we'd have to write shell code that checks whether BUILD_GNU_TYPE
+       # also, we don't really support cross-building... ;-) (to do so, we'd have to write shell code that checks whether BUILD_GNU_TYPE
        #  and HOST_GNU_TYPE are equal, and if they are not, add a --host parameter)
-       r.dh += ["--buildsystem=autoconf"]
+       r.dh += ["--buildsystem=autoconf", "--builddirectory="+config.getstr('buildDir')]
        r.rules['auto_configure'] = [
+               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
                'MULTIARCH=$$(dpkg-architecture -qDEB_HOST_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)
+               safeCall(srcDir+"/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 '+
                        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'] = [safeCall("rm", "-f", "--", buildDir+"/config.status")] # do not re-use old configuration
 
 def makefileRules(r, config):
        r.dh += ["--buildsystem=makefile"]
@@ -181,6 +186,15 @@ def writeDependency(f, name, list):
        if len(list):
                print >>f, name+": "+', '.join(list)
 
+def deleteDebianFolder():
+       if os.path.islink('debian'):
+               target = os.readlink('debian')
+               if os.path.exists(target):
+                       shutil.rmtree(target)
+               os.remove('debian')
+       else:
+               shutil.rmtree('debian')
+
 # actual work functions
 def createDebianFiles(config):
        if not isinstance(config, ConfigDict):
@@ -214,9 +228,10 @@ def createDebianFiles(config):
        arch = getArchitecture(config)
        files = []
        # create folders
-       if os.path.exists('debian'): raise Exception('debian folder already exists?')
-       os.mkdir('debian')
-       os.mkdir('debian/source')
+       if os.path.exists('debian') or os.path.islink('debian'): raise Exception('debian folder already exists?')
+       tempdir = tempfile.mkdtemp(prefix='auto-debuild-')
+       os.mkdir(tempdir+'/source')
+       os.symlink(tempdir, 'debian')
        if not os.path.exists(debDir): os.makedirs(debDir)
        # source format file
        with open('debian/source/format', 'w') as f:
@@ -362,7 +377,7 @@ def buildDebianPackage(config):
        commands = ['dpkg-checkbuilddeps', 'debian/rules clean', 'debian/rules build', 'fakeroot debian/rules binary']
        command = ['bash', '-c', ' && '.join(commands)] # make it all one command, so we don't have to open and close the chroot too often
        subprocess.check_call(commandInBuildEnv(config, command))
-       shutil.rmtree('debian') # cleanup: the debian folder only contains what we just created
+       deleteDebianFolder() # cleanup: the debian folder only contains what we just created
 
 ###################################################################
 # if we are called directly as script
@@ -371,10 +386,10 @@ if __name__ == "__main__":
                # get config
                config = loadConfigFile('auto-debuild.conf')
                # generate debian files
-               if os.path.exists('debian'):
-                       if raw_input("A debian folder already exists, do you want to remove it (y/N)? ").lower() != "y":
+               if os.path.exists('debian') or os.path.islink('debian'):
+                       if raw_input("A debian folder already exists, do you want to remove it and whatever it links to (y/N)? ").lower() != "y":
                                sys.exit(1)
-                       shutil.rmtree('debian')
+                       deleteDebianFolder()
                files = createDebianFiles(config)
                # check if a file is overwritten
                for file in files: