From: Ralf Jung Date: Fri, 27 Jul 2012 15:30:50 +0000 (+0200) Subject: Pass parallel job count to auto-debuild X-Git-Url: https://git.ralfj.de/mass-build.git/commitdiff_plain/85991dba45f220dc4f5e94e6238bb0e36dd39862?hp=08936d4ee431ed67dbc75214b364fad42fb72900 Pass parallel job count to auto-debuild --- diff --git a/build_system.py b/build_system.py index 9a64653..8ebf6f3 100644 --- a/build_system.py +++ b/build_system.py @@ -50,16 +50,19 @@ try: 'name': config['debName'], 'email': config['debEMail'], } - self.copyFromModule(module, 'buildDepends') - self.copyFromModule(module, 'binaryDepends') + self.copyOption(config, 'jobs', 'parallelJobs') + self.copyOption(module, 'dbgPackage') + self.copyOption(module, 'buildDepends') + self.copyOption(module, 'binaryDepends') if buildSystem == 'cmake': - self.copyFromModule(module, 'cmakeParameters') + self.copyOption(module, 'cmakeParameters') self.vcs = vcs self.configured = False # make sure configure is called before build/install - def copyFromModule(self, module, name): - if name in module: - self.autoDebuildConfig[name] = module[name] + 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 self.autoDebuildConfig['version'] = self.vcs.version() # by now, data has been fetched, so this is possible