Merge branch 'develop' of github.com:bendisposto/prob into develop

de.bmotionstudio.gef.editor/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: BMotion Studio Editor Plug-in
 Bundle-SymbolicName: de.bmotionstudio.gef.editor;singleton:=true
-Bundle-Version: 5.3.1.qualifier
+Bundle-Version: 5.3.2.qualifier
 Bundle-Activator: de.bmotionstudio.gef.editor.BMotionEditorPlugin
 Require-Bundle: org.eclipse.ui;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.ui.ide;bundle-version="[3.5.0,4.0.0)",

de.bmotionstudio.rodin/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: BMotion Studio Rodin Integration
 Bundle-SymbolicName: de.bmotionstudio.rodin;singleton:=true
-Bundle-Version: 1.0.2.qualifier
+Bundle-Version: 1.0.3.qualifier
 Fragment-Host: de.bmotionstudio.gef.editor;bundle-version="5.2.1"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-Vendor: HHU Düsseldorf STUPS Group

de.prob.core/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ProB Animator Core
 Bundle-SymbolicName: de.prob.core;singleton:=true
-Bundle-Version: 9.2.1.qualifier
+Bundle-Version: 9.2.2.qualifier
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.rodinp.core;bundle-version="[1.3.1,1.7.0)",
  org.eventb.core;bundle-version="[2.1.0,2.6.0)",

de.prob.ui/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ProB Ui Plug-in
 Bundle-SymbolicName: de.prob.ui;singleton:=true
-Bundle-Version: 7.2.1.qualifier
+Bundle-Version: 7.2.2.qualifier
 Require-Bundle: org.eclipse.ui;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)",

de.prob2.feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="de.prob2.feature"
       label="ProB for Rodin2"
-      version="2.3.1.qualifier"
+      version="2.3.2.qualifier"
       provider-name="HHU Düsseldorf STUPS Group">
 
    <description url="http://www.stups.uni-duesseldorf.de/ProB">

tycho_build.gradle

@@ -74,6 +74,14 @@ try{
 	parentID = groupID+".parent"
 }
 
+Boolean noDescriptions = false					// in case of using own CategoryDescription Map
+
+try{
+	categoryDescriptions = categoryDescriptions
+}catch(MissingPropertyException e){
+	categoryDescriptions = [ [:],[:] ]		// label and descriptions of the features
+	noDescriptions = true
+}							// 	categoryDescriptions	=	[["feature": "labelName","feature2": "label"],["feature": "featureDescription","feature2": "feature2Description"]]		// label and descriptions of the features
 
 try{
 	targetRepositories = targetRepositories
@@ -120,8 +128,36 @@ def groupId(){
 *	This Group ID will be used in every sub project
 */
 
+def addLibToCP(def project, File filePar, def libPar){
 	
+	boolean notYetAdded = true	
+	filePar.eachLine{ line ->
+		def pattern = ".*${dependencyFolder}${libPar}.*"
+		if(line ==~ /${pattern}/){
+			notYetAdded = false
+		}
 		
+	}
+	if(notYetAdded){
+		File newCP = new File(project+'/.cp') 
+		filePar.eachLine{ line ->
+			 if(line ==~ /.*<\/classpath>.*/){
+				
+				String entry = '<classpathentry exported="true" kind="lib" path="lib/dependencies/'+libPar+'"/>'+'\n</classpath>\n'
+				line = line.replaceAll(/<\/classpath>/, entry)
+				println line
+				newCP << line+"\n"
+			}else{
+				newCP << line+"\n"
+			}
+		}
+		filePar.delete()
+		newCP.renameTo(project+'/.classpath')
+	}else{
+		println project + " : "+ libPar +" classpath entry already present"
+	}
+	
+}
 
 /////////////////////////////////////////////////////////////////////////////////////////
 //		--	!!! 				DEFINING SUB PROJECTS 							!!!	-- //
@@ -138,28 +174,46 @@ subprojects {
 	}
 	
 	/////				Copy Dependencies into subprojects DependencyFolder 				///// 
-	task collectDependencies(type: Copy , dependsOn: ['eclipse']){
+	task collectDependencies(type: Copy){
 
 		   	from configurations.compile
 	   	
-			
 			into "${dependencyFolder}" 	
 			
+	}
+
+	
+	task setClassPath(dependsOn: 'collectDependencies'){
 
-			eclipse {
+		def dependencyList = []
+		try{
+			def dir = new File(project.name+"/"+dependencyFolder).eachFile() { file->  
+			    dependencyList << file.getName()  
+			}
 	
-			  classpath {
-			    //adding extra configurations:
-			    plusConfigurations += configurations.compile
+			if(features.every{ it != project.name }){	
 			
-			    //default settings for dependencies sources/javadoc download:
-			    downloadSources = true
-			    downloadJavadoc = false
+				def cpFile = new File(project.name+"/.classpath")
+				for(int icp = 0; icp < dependencyList.size; icp++){
+					addLibToCP(project.name, cpFile, dependencyList[icp])
 				}
+				/*dependencyList.each{ dep->
+					println project.name+": "+ dep	
+				}*/
+
+			}
+		}catch(Exception e){
+			println project.name+" has no dependencies in '${dependencyFolder}' defined: Classpath will not be changed"
 		}
 	
+	}// setClassPath
 	
+	eclipse.classpath.file {
+	    whenMerged { classpath ->
+	        classpath.entries.findAll { entry -> entry.kind == 'lib' }*.exported = true	
+	    }
 	}
+
 	////////////////////////////////////////////////////////////////////////////////////////////	
 	
 	task deploy() <<{
@@ -206,7 +260,6 @@ subprojects {
 	
 			content.eachLine( printFileLine )
 	
-	
 			println artifactId
 			println "\t"+versionNumber
 	
@@ -243,7 +296,6 @@ subprojects {
 				def f = new File(workspacePath+artifactId+'/pom.xml') 
 				f.delete()
 				f << feature(artifactId, versionNumber)				
-							
 			}
 		}
 	}//deploy
@@ -283,11 +335,8 @@ task createRepository() << {
 
 	//			------------	 	define Repository			---------		//
 						
-			
 	new File(workspacePath+"${repositoryName}").mkdir() 
 				
-	descriptions = [ [:],[:] ]		// label and descriptions of the features
-				
 	String versionNumber 	=	'1.0.0.qualifier'
 	String artifactId		=	repositoryName
 	String featureVersionNumber = '1.0.0.qualifier'
@@ -302,17 +351,21 @@ task createRepository() << {
 		featureVersionNumber  = parsedXml.attribute("version")
 		featureArtifactId  = parsedXml.attribute("id")
 		
-		
-		descriptions[0].put( features[i], parsedXml.attribute("label") )
-		descriptions[1].put( features[i], parsedXml.description.text() )
-		
+		if(noDescriptions){
+			categoryDescriptions[0].put( features[i], parsedXml.attribute("label") )
+			categoryDescriptions[1].put( features[i], parsedXml.description.text() )
+		}
 		f << categoryFeatures(featureArtifactId.replace(workspacePath,''), featureVersionNumber)
 	}// for
 			
 	for( int i = 0; i < features.size(); i++ ){
 	
-		f << categoryDescription(features[i], descriptions[0][features[i]] ,descriptions[1][features[i]] )
+		if(noDescriptions){
+			f << categoryDescription(features[i], categoryDescriptions[0][features[i]] ,categoryDescriptions[1][features[i]] )
 			//						featureName,			label,							description
+		}else{
+			f << categoryDescription(features[i], categoryDescriptions[features[i]][0] ,categoryDescriptions[features[i]][1])
+		}
 	}//for
 				
 	f << categoryEnd()
@@ -518,8 +571,6 @@ def feature(artifactId, versionNumber) { """
 """}
 // end of feature pom
 
-
-
 //	Build Script can be executed via gradle install
 //	Pom Generation can be executed via gradle deploy