X-Git-Url: https://git.ralfj.de/mass-build.git/blobdiff_plain/4f9926975fe894b227ab4dfadf080a0e6f3bd125..f5fc2c7cd2999eb0af27dffb9d99b594940d463f:/build_system.py diff --git a/build_system.py b/build_system.py index 290eb6d..c26673d 100644 --- a/build_system.py +++ b/build_system.py @@ -1,5 +1,5 @@ # mass-build - Easily Build Software Involving a Large Amount of Source Repositories -# Copyright (C) 2012 Ralf Jung +# Copyright (C) 2012-2013 Ralf Jung # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -69,9 +69,10 @@ class CMake: if waitAfterConfig: raw_input('Configuration done. Hit "Enter" to build the project. ') # run compilation - subprocess.check_call(self.config.get('buildCmdPrefix', []) + ['make', '-j'+str(self.config['jobs'])]) + jobs = int(self.config['jobs']) + subprocess.check_call(self.config.get('buildCmdPrefix', []) + ['make', '-j'+str(jobs)]) # run installation - subprocess.check_call(self.config.get('installCmdPrefix', []) + ['make', 'install']) + subprocess.check_call(self.config.get('installCmdPrefix', []) + ['make', 'install', '-j'+str((jobs+1)/2)]) # jobs/2, rounded up # if auto-debuild is available, provide a wrapper for it try: @@ -88,7 +89,7 @@ try: # get version name versionName = self.config['versionName'] if 'versionName' in self.config else self.vcs.version() if versionName is None: - raise Exception("VCS did not provide us with a proper version number, please fix this") + raise Exception("VCS did not provide us with a proper version number, please provide one manually") # create auto-debuild configuration autoDebuildConfig = { 'sourceName': self.config['name'],