X-Git-Url: https://git.ralfj.de/mass-build.git/blobdiff_plain/b1d915653a9f8a415a0d4a8d66027508881361d3..7cc4b869c9189b01675fae5b8ff9e478c04ec68b:/kdebuildpy.py diff --git a/kdebuildpy.py b/kdebuildpy.py index 38e74c2..99267e8 100755 --- a/kdebuildpy.py +++ b/kdebuildpy.py @@ -33,18 +33,18 @@ class Project: self.folder = folder self.name = module['name'] # VCS - vcsName = module.get('vcs', 'kde+git') - if vcsName == 'kde+git': - self.vcs = vcs.KDEGit(self.sourceFolder(), module['name'], module['version']) - elif vcsName == 'kde+svn': - self.vcs = vcs.KDESVN(self.sourceFolder(), module['svn-path'], module.get('versionName')) + vcsName = module['vcs'] + if vcsName == 'git': + self.vcs = vcs.Git(self.sourceFolder(), module['url'], module['version']) + elif vcsName == 'svn': + self.vcs = vcs.SVN(self.sourceFolder(), module['url'], module.get('versionName')) else: raise Exception("Unknown VCS type "+vcsName) # build system if config.get('buildDeb', False): self.buildSystem = build_system.AutoDebuild(self.sourceFolder(), self.buildFolder(), module, self.vcs, config) else: - buildSystemName = module.get('build-system', 'cmake') + buildSystemName = module['buildSystem'] if buildSystemName == 'cmake': self.buildSystem = build_system.CMake(self.sourceFolder(), self.buildFolder(), module, config) else: