Simplify build system interface: There is simply a single function to trigger configu...

[mass-build.git] / config.py.sample

diff --git a/config.py.sample b/config.py.sample
index e406591d559e05e7cd38ce4ad4491fba9c8b001d..cf1b36e3ac50355b8adca125654cf24425bc017a 100644 (file)
--- a/config.py.sample
+++ b/config.py.sample
@@ -5,19 +5,28 @@ buildType = 'Debug'
 jobs = 2
 buildCmdPrefix = ['nice']
 installCmdPrefix = []
 jobs = 2
 buildCmdPrefix = ['nice']
 installCmdPrefix = []

-# helper function for the modules
-defaultGitVersion = 'origin/master' # or 'origin/4.8' or 'v4.8.4'
+# 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'
 defaultSvnVersion = 'trunk/KDE' # or 'branches/KDE/4.8' or 'tags/KDE/4.8.4'

-def KDEGitModule(name, version=defaultGitVersion):
-       return {'name':name, 'vcs':'kde+git', 'version':version}
-def KDESvnModule(name, svnPath=defaultSvnVersion):
-       return {'name':name, 'vcs':'kde+svn', 'svn-path':svnPath+'/'+name}
+def KDEGitModule(name, version=defaultGitVersion, **module):
+       module['name'] = name
+       module['vcs'] = 'kde+git'
+       module['version'] = version
+       return module
+def KDESvnModule(name, svnPath=defaultSvnVersion, **module):
+       module['name'] = name
+       module['vcs'] = 'kde+svn'
+       module['version'] = svnPath+'/'+name
+       return module

 # the modules we are interested in
 modules = [
 # the modules we are interested in
 modules = [

+       # KDE support
+       {'folder': 'kdesupport', 'modules': [
+       ]},

        # KDE SC
        {'folder': 'kde', 'modules': [
                # KDE core
        # KDE SC
        {'folder': 'kde', 'modules': [
                # KDE core

-               KDESvnModule('oxygen-icons', '/trunk/kdesupport/oxygen-icons'), # released within the SC, but located in kdesupport...
+               KDESvnModule('oxygen-icons', '/trunk/kdesupport'), # released within the SC, but located in kdesupport...

                KDEGitModule('kdelibs'),
                KDEGitModule('kactivities'),
                KDEGitModule('kdepimlibs'),
                KDEGitModule('kdelibs'),
                KDEGitModule('kactivities'),
                KDEGitModule('kdepimlibs'),