X-Git-Url: https://git.ralfj.de/mass-build.git/blobdiff_plain/9c80fba35dbdb845f4b53515a73b52b27d5ee660..08936d4ee431ed67dbc75214b364fad42fb72900:/build_system.py?ds=sidebyside diff --git a/build_system.py b/build_system.py index a46e6e8..9a64653 100644 --- a/build_system.py +++ b/build_system.py @@ -51,7 +51,8 @@ try: 'email': config['debEMail'], } self.copyFromModule(module, 'buildDepends') - if buildSystem == 'cmakeParameters': + self.copyFromModule(module, 'binaryDepends') + if buildSystem == 'cmake': self.copyFromModule(module, 'cmakeParameters') self.vcs = vcs self.configured = False # make sure configure is called before build/install @@ -62,9 +63,11 @@ try: def configure(self, force=False): # force is ignored 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") self.vcs.ignore('/debian/') # make sure the debian folder is ignored os.chdir(self.sourceFolder) - print self.autoDebuildConfig + #print self.autoDebuildConfig self.files = auto_debuild.createDebianFiles(self.autoDebuildConfig) self.configured = True