rename some options for a more consistent naming; fix auto-debuild build system

[mass-build.git] / kdebuildpy.py

diff --git a/kdebuildpy.py b/kdebuildpy.py
index 38e74c23905f541085bd99c478f2f4236d0d9587..99267e8aecb2129d48b00faeedbb9a40d1b1d176 100755 (executable)
--- 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: