X-Git-Url: https://git.ralfj.de/mass-build.git/blobdiff_plain/546c80d1c559cb94223f9c459db719d143df7291..0ee4d14cae63cd9f029a2dde0773d2ab5d649015:/config.py.sample?ds=sidebyside

diff --git a/config.py.sample b/config.py.sample
index e406591..875f5a4 100644
--- a/config.py.sample
+++ b/config.py.sample
@@ -5,19 +5,31 @@ buildType = 'Debug'
 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'
-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['build-system'] = 'cmake'
+	module['vcs'] = 'git'
+	module['url'] = 'kde:'+name # relies on the kde: prefix being set up for git
+	module['version'] = version
+	return module
+def KDESvnModule(name, svnPath=defaultSvnVersion, **module):
+	module['name'] = name
+	module['build-system'] = 'cmake'
+	module['vcs'] = 'svn'
+	module['url'] = 'svn://svn.kde.org/home/kde/'+svnPath+'/'+name
+	return module
 # the modules we are interested in
 modules = [
+	# KDE support
+	{'folder': 'kdesupport', 'modules': [
+	]},
 	# KDE SC
-	{'folder': 'kde', 'modules': [
+	{'folder': 'kde-sc', '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'),
@@ -33,6 +45,6 @@ modules = [
 	]},
 	# Extragear
 	{'folder': 'extragear', 'modules': [
-		KDEGitModule('networkmanagement', 'v0.9.0.3')
+		KDEGitModule('networkmanagement', 'v0.9.0.4')
 	]},
 ]