From: Ralf Jung Date: Mon, 30 Jul 2012 09:03:00 +0000 (+0200) Subject: Simplify build system interface: There is simply a single function to trigger configu... X-Git-Url: https://git.ralfj.de/mass-build.git/commitdiff_plain/b1d915653a9f8a415a0d4a8d66027508881361d3?ds=sidebyside;hp=d8db4c363bdec84a2f0b2a53ec176ac8f2419342 Simplify build system interface: There is simply a single function to trigger configuration, compilation and installation --- diff --git a/build_system.py b/build_system.py index 979a47a..78039f1 100644 --- a/build_system.py +++ b/build_system.py @@ -14,25 +14,21 @@ class CMake: self.installCmdPrefix = config['installCmdPrefix'] self.cmakeParameters = module.get('cmakeParameters', []) - def configure(self, force=False): + def build(self, reconfigure=False): + # Make sure we have a build directory if not os.path.exists(self.buildFolder): os.makedirs(self.buildFolder) os.chdir(self.buildFolder) - # check if we actually need to work + # In case of reconfiguration, delete cache file if it exists cacheFile = 'CMakeCache.txt' - if os.path.exists(cacheFile) and os.path.exists('Makefile') and not force: return - # yes we do! make sure we start clean, and then go ahead - if os.path.exists(cacheFile): os.remove(cacheFile) + if os.path.exists(cacheFile) and reconfigure: os.remove(cacheFile) + # Run cmake os.putenv('PKG_CONFIG_PATH', os.path.join(self.installDir, 'lib', 'pkgconfig')) # I found no way to do this within cmake subprocess.check_call(['cmake', self.sourceFolder, '-DCMAKE_BUILD_TYPE='+self.buildType, '-DCMAKE_INSTALL_PREFIX='+self.installDir]+self.cmakeParameters) os.unsetenv('PKG_CONFIG_PATH') - - def build(self): - os.chdir(self.buildFolder) + # run compilation subprocess.check_call(self.buildCmdPrefix + ['make', '-j'+str(self.jobs)]) - - def install(self): - os.chdir(self.buildFolder) + # run installation subprocess.check_call(self.installCmdPrefix + ['make', 'install']) # if auto-debuild is available, provide a wrapper for it @@ -60,32 +56,25 @@ try: if buildSystem == 'cmake': self.copyOption(module, 'cmakeParameters') self.vcs = vcs - self.configured = False # make sure configure is called before build/install def copyOption(self, src, name, dstName = None): if dstName is None: dstName = name # per default, stick with original name if name in src: self.autoDebuildConfig[dstName] = src[name] - def configure(self, force=False): # force is ignored - if self.configured: return # do not configure twice + def build(self, reconfigure=False): # reconfigure is ignored (we always do a reconfiguration) + # Get us a version number self.autoDebuildConfig['version'] = self.vcs.version() # by now, data has been fetched, so this is possible if self.autoDebuildConfig['version'] is None: raise Exception("VCS did not provide us with a proper version, please fix this") + # create Debian files os.chdir(self.sourceFolder) - #print self.autoDebuildConfig - self.files = auto_debuild.createDebianFiles(self.autoDebuildConfig) - self.configured = True - - def build(self): - self.configure() # make sure we are configured (this call is idempotent) - os.chdir(self.sourceFolder) + files = auto_debuild.createDebianFiles(self.autoDebuildConfig) + # build package(s) auto_debuild.buildDebianPackage(self.autoDebuildConfig) + # install package(s) + subprocess.check_call(['sudo', 'dpkg', '--install'] + files) - def install(self): - self.configure() # make sure we are configured (this call is idempotent) - os.chdir(self.sourceFolder) - subprocess.check_call(['sudo', 'dpkg', '--install'] + self.files) except ImportError: print "auto_debuild not found, disabling auto-debuild system" pass diff --git a/kdebuildpy.py b/kdebuildpy.py index 696c76f..38e74c2 100755 --- a/kdebuildpy.py +++ b/kdebuildpy.py @@ -11,9 +11,9 @@ parser.add_argument("-c, --config", parser.add_argument("--reconfigure", action="store_true", dest="reconfigure", help="Force configuration to be run") -parser.add_argument("--phases", choices=["update", "configure", "compile"], nargs='*', metavar='PHASE', - dest="phases", default=["update", "configure", "compile"], - help="For each module, run the given phases in the given order. Possible phases are: update, configure, compile") +parser.add_argument("--no-update", + action="store_false", dest="update", + help="Do not update modules before compilation") parser.add_argument("--resume-from", metavar='MODULE', dest="resume_from", help="Resume building from the given repository") @@ -94,20 +94,12 @@ else: # and do it! for project in workProjects: try: - for phase in args.phases: - if phase == 'update': - print "Updating",project.sourceFolder() - project.vcs.update() - elif phase == 'configure': - print "Configuring",project.sourceFolder() - project.buildSystem.configure(force=args.reconfigure) - elif phase == 'compile': - print "Compiling",project.sourceFolder() - project.buildSystem.build() - print "Installing",project.sourceFolder() - project.buildSystem.install() - else: - raise Exception("Invalid phase "+phase) + if args.update: + print "Updating module",project.sourceFolder() + project.vcs.update() + print "Building module",project.sourceFolder() + project.buildSystem.build(reconfigure=args.reconfigure) + print except (subprocess.CalledProcessError, KeyboardInterrupt) as e: print >> sys.stderr print >> sys.stderr