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 91ce798dcd2caaeac6ec131987110d0e36ad57c2..99267e8aecb2129d48b00faeedbb9a40d1b1d176 100755 (executable)
--- a/kdebuildpy.py
+++ b/kdebuildpy.py
@@ -35,16 +35,16 @@ class Project:
                # VCS
                vcsName = module['vcs']
                if vcsName == 'git':
-                       self.vcs = vcs.Git(self.sourceFolder(), module['name'], module['version'])
+                       self.vcs = vcs.Git(self.sourceFolder(), module['url'], module['version'])
                elif vcsName == 'svn':
-                       self.vcs = vcs.SVN(self.sourceFolder(), module['svn-path'], module.get('versionName'))
+                       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['build-system']
+                       buildSystemName = module['buildSystem']
                        if buildSystemName == 'cmake':
                                self.buildSystem = build_system.CMake(self.sourceFolder(), self.buildFolder(), module, config)
                        else: