From 3a6b5ad415ec7aed415210d80107605149689e68 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Fri, 3 Aug 2012 19:36:38 +0200 Subject: [PATCH] Add option to wait for confirmation after configuration --- build_system.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/build_system.py b/build_system.py index 253348e..41061d3 100644 --- a/build_system.py +++ b/build_system.py @@ -1,4 +1,4 @@ -import os, subprocess +import os, shutil, subprocess '''A build system has three methods: "configure" (with optionak "force" parameter), "build" and "install"''' @@ -12,6 +12,7 @@ class CMake: self.jobs = config['jobs'] self.buildCmdPrefix = config['buildCmdPrefix'] self.installCmdPrefix = config['installCmdPrefix'] + self.waitAfterConfig = config.get('waitAfterConfig', False) self.module = module def build(self, reconfigure=False): @@ -26,6 +27,9 @@ class CMake: subprocess.check_call(['cmake', self.sourceFolder, '-DCMAKE_BUILD_TYPE='+self.buildType, '-DCMAKE_INSTALL_PREFIX='+self.installDir]+self.module.get('cmakeParameters', [])) os.unsetenv('PKG_CONFIG_PATH') + # if asked to do so, wait + if self.waitAfterConfig: + raw_input('Configuration done. Hit "Enter" to build the module. ') # run compilation subprocess.check_call(self.buildCmdPrefix + ['make', '-j'+str(self.jobs)]) # run installation @@ -42,6 +46,7 @@ try: self.debDir = os.path.abspath(config['debDir']) self.debName = config['debName'] self.debEMail = config['debEMail'] + self.waitAfterConfig = config.get('waitAfterConfig', False) self.module = module self.vcs = vcs @@ -55,7 +60,8 @@ try: 'name': self.debName, 'email': self.debEMail, 'parallelJobs': self.jobs, - 'version': self.vcs.version() + 'version': self.vcs.version(), + 'waitAfterConfig': self.waitAfterConfig, } if autoDebuildConfig['version'] is None: raise Exception("VCS did not provide us with a proper version number, please fix this") @@ -67,6 +73,8 @@ try: autoDebuildConfig[option] = self.module[option] # create Debian files os.chdir(self.sourceFolder) + if os.path.isdir('debian'): # clean previous build attempts + shutil.rmtree('debian') files = auto_debuild.createDebianFiles(autoDebuildConfig) # build package(s) auto_debuild.buildDebianPackage(autoDebuildConfig) -- 2.30.2