For SVN, the version must be manually specified

[mass-build.git] / kdebuildpy.py

diff --git a/kdebuildpy.py b/kdebuildpy.py
index 4363bd44c60e308c90dd5de4bb01d9439c2d28ba..696c76f1e223e9cbb8b4b5b87779ff827371b77d 100755 (executable)
--- a/kdebuildpy.py
+++ b/kdebuildpy.py
@@ -37,16 +37,16 @@ class Project:
                if vcsName == 'kde+git':
                        self.vcs = vcs.KDEGit(self.sourceFolder(), module['name'], module['version'])
                elif vcsName == 'kde+svn':
                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'])
+                       self.vcs = vcs.KDESVN(self.sourceFolder(), module['svn-path'], module.get('versionName'))

                else:
                        raise Exception("Unknown VCS type "+vcsName)
                # build system
                if config.get('buildDeb', False):
                else:
                        raise Exception("Unknown VCS type "+vcsName)
                # build system
                if config.get('buildDeb', False):

-                       self.buildSystem = build_system.AutoDebuild(self.sourceFolder(), module, self.vcs, config)
+                       self.buildSystem = build_system.AutoDebuild(self.sourceFolder(), self.buildFolder(), module, self.vcs, config)

                else:
                        buildSystemName = module.get('build-system', 'cmake')
                        if buildSystemName == 'cmake':
                else:
                        buildSystemName = module.get('build-system', 'cmake')
                        if buildSystemName == 'cmake':

-                               self.buildSystem = build_system.CMake(self.sourceFolder(), self.buildFolder(), config)
+                               self.buildSystem = build_system.CMake(self.sourceFolder(), self.buildFolder(), module, config)

                        else:
                                raise Exception("Unknown build system type "+buildSystemName)
        
                        else:
                                raise Exception("Unknown build system type "+buildSystemName)