Move loading a module by filename into a helper function

[mass-build.git] / mass-build.conf.kde.sample

diff --git a/mass-build.conf.kde.sample b/mass-build.conf.kde.sample
index 875f5a43fbcd242102c3f1e35b850a729258b12e..4af7aafc172a2f47b10b98eea2187a87f157454c 100644 (file)
--- a/mass-build.conf.kde.sample
+++ b/mass-build.conf.kde.sample
@@ -1,36 +1,36 @@
 # global configuration
 installDir = '/opt/kde'
+buildSystem = 'cmake'
 buildDir = 'build'
 buildType = 'Debug'
 jobs = 2
 buildCmdPrefix = ['nice']
 installCmdPrefix = []
-# helper function for the modules - per default, they assume an SC module
-defaultGitVersion = 'origin/master' # or 'origin/KDE/4.8' or 'v4.8.4'
-defaultSvnVersion = 'trunk/KDE' # or 'branches/KDE/4.8' or 'tags/KDE/4.8.4'
-def KDEGitModule(name, version=defaultGitVersion, **module):
+# helper function for the modules
+def KDEGitModule(name, **module):
        module['name'] = name
-       module['build-system'] = 'cmake'
        module['vcs'] = 'git'
-       module['url'] = 'kde:'+name # relies on the kde: prefix being set up for git
-       module['version'] = version
+       if 'url' not in module: module['url'] = 'kde:'+name
        return module
-def KDESvnModule(name, svnPath=defaultSvnVersion, **module):
+def KDESCSvnModule(name, svnPath='trunk/KDE', **module):
        module['name'] = name
-       module['build-system'] = 'cmake'
        module['vcs'] = 'svn'
-       module['url'] = 'svn://svn.kde.org/home/kde/'+svnPath+'/'+name
+       if 'url' not in module: module['url'] = 'svn://svn.kde.org/home/kde/'+svnPath+'/'+name
        return module
 # the modules we are interested in
-modules = [
+projects = [
        # KDE support
-       {'folder': 'kdesupport', 'modules': [
+       {'name': 'kdesupport',
+        'projects': [
        ]},
        # KDE SC
-       {'folder': 'kde-sc', 'modules': [
+       {'name': 'kde-sc',
+        'version': 'origin/master',
+        'projects': [
                # KDE core
-               KDESvnModule('oxygen-icons', '/trunk/kdesupport'), # released within the SC, but located in kdesupport...
+               KDESCSvnModule('oxygen-icons', '/trunk/kdesupport'), # released within the SC, but located in kdesupport...
                KDEGitModule('kdelibs'),
+               KDEGitModule('nepomuk-core'),
                KDEGitModule('kactivities'),
                KDEGitModule('kdepimlibs'),
                KDEGitModule('kde-runtime'),
@@ -38,13 +38,13 @@ modules = [
                KDEGitModule('kde-baseapps'),
                KDEGitModule('kdepim-runtime'),
                # KDE applications
-               KDESvnModule('kde-wallpapers'),
                KDEGitModule('konsole'),
                KDEGitModule('kate'),
                KDEGitModule('kwallet'),
        ]},
        # Extragear
-       {'folder': 'extragear', 'modules': [
-               KDEGitModule('networkmanagement', 'v0.9.0.4')
+       {'name': 'extragear',
+        'projects': [
+               KDEGitModule('networkmanagement', version='v0.9.0.4')
        ]},
 ]