Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian W. Damus2017-07-05 19:54:55 +0000
committerLaurent Goubet2017-07-06 11:57:18 +0000
commit56ad5529f9103568e2e7f30569e8e010de011f42 (patch)
tree6b3b7996f77aaa3262ca3546daa2c798f63aaad1 /org.eclipse.emf.compare-parent
parent05cddc96b4e6e7359707344219b92f4284036f21 (diff)
downloadorg.eclipse.emf.compare-56ad5529f9103568e2e7f30569e8e010de011f42.tar.gz
org.eclipse.emf.compare-56ad5529f9103568e2e7f30569e8e010de011f42.tar.xz
org.eclipse.emf.compare-56ad5529f9103568e2e7f30569e8e010de011f42.zip
[519261] [Oomph] Setup model problems for Oxygen
Add target platforms for Neon and Oxygen. Fix the EclEmma feature. Fix the JRE version. Add working sets for Papyrus and Git integrations. Bug: 519261 Change-Id: If0d2732237acde648d2432b3b9c2ca37a8ddd57b Signed-off-by: Christian W. Damus <give.a.damus@gmail.com>
Diffstat (limited to 'org.eclipse.emf.compare-parent')
-rw-r--r--org.eclipse.emf.compare-parent/emf.compare.setup48
1 files changed, 39 insertions, 9 deletions
diff --git a/org.eclipse.emf.compare-parent/emf.compare.setup b/org.eclipse.emf.compare-parent/emf.compare.setup
index 90d5cc44c..e536fd15f 100644
--- a/org.eclipse.emf.compare-parent/emf.compare.setup
+++ b/org.eclipse.emf.compare-parent/emf.compare.setup
@@ -18,8 +18,8 @@
label="EMFCompare">
<setupTask
xsi:type="jdt:JRETask"
- version="JavaSE-1.6"
- location="${jre.location-1.6}">
+ version="JavaSE-1.8"
+ location="${jre.location-1.8}">
<description>Define the JRE needed to compile and run the Java projects of ${scope.project.label}</description>
</setupTask>
<setupTask
@@ -42,9 +42,15 @@
xsi:type="setup:VariableTask"
id="compare.target.platform"
name="compare.target.platform"
- defaultValue="EMF Compare based on Mars SDK with Logical Model and Papyrus"
+ defaultValue="EMF Compare based on Oxygen SDK"
label="Target Platform - Compare">
<choice
+ value="EMF Compare based on Oxygen SDK"
+ label="Eclipse Oxygen 4.7"/>
+ <choice
+ value="EMF Compare based on Neon SDK"
+ label="Eclipse Neon 4.6"/>
+ <choice
value="EMF Compare based on Mars SDK"
label="Eclipse Mars 4.5"/>
<choice
@@ -74,7 +80,7 @@
<requirement
name="edu.umd.cs.findbugs.plugin.eclipse.feature.group"/>
<requirement
- name="com.mountainminds.eclemma.feature.feature.group"/>
+ name="org.eclipse.eclemma.feature.feature.group"/>
<requirement
name="org.eclipse.mylyn.bugzilla_feature.feature.group"/>
<requirement
@@ -149,7 +155,7 @@
name="Core">
<predicate
xsi:type="workingsets:ExclusionPredicate"
- excludedWorkingSet="//@setupTasks.8/@workingSets.6 //@setupTasks.8/@workingSets.1 //@setupTasks.8/@workingSets.2 //@setupTasks.8/@workingSets.3 //@setupTasks.8/@workingSets.4 //@setupTasks.8/@workingSets.7"/>
+ excludedWorkingSet="//@setupTasks.8/@workingSets.8 //@setupTasks.8/@workingSets.1 //@setupTasks.8/@workingSets.2 //@setupTasks.8/@workingSets.3 //@setupTasks.8/@workingSets.4 //@setupTasks.8/@workingSets.9 //@setupTasks.8/@workingSets.5 //@setupTasks.8/@workingSets.6"/>
</workingSet>
<workingSet
name="RCP">
@@ -160,7 +166,7 @@
pattern=".*compare.rcp.*"/>
<operand
xsi:type="workingsets:ExclusionPredicate"
- excludedWorkingSet="//@setupTasks.8/@workingSets.7"/>
+ excludedWorkingSet="//@setupTasks.8/@workingSets.9"/>
</predicate>
</workingSet>
<workingSet
@@ -172,7 +178,7 @@
pattern=".*compare.ide.*"/>
<operand
xsi:type="workingsets:ExclusionPredicate"
- excludedWorkingSet="//@setupTasks.8/@workingSets.7"/>
+ excludedWorkingSet="//@setupTasks.8/@workingSets.9"/>
</predicate>
</workingSet>
<workingSet
@@ -184,7 +190,7 @@
pattern=".*uml.*"/>
<operand
xsi:type="workingsets:ExclusionPredicate"
- excludedWorkingSet="//@setupTasks.8/@workingSets.7"/>
+ excludedWorkingSet="//@setupTasks.8/@workingSets.9 //@setupTasks.8/@workingSets.6"/>
</predicate>
</workingSet>
<workingSet
@@ -196,7 +202,31 @@
pattern=".*diagram.*"/>
<operand
xsi:type="workingsets:ExclusionPredicate"
- excludedWorkingSet="//@setupTasks.8/@workingSets.7"/>
+ excludedWorkingSet="//@setupTasks.8/@workingSets.9"/>
+ </predicate>
+ </workingSet>
+ <workingSet
+ name="Git">
+ <predicate
+ xsi:type="predicates:AndPredicate">
+ <operand
+ xsi:type="predicates:NamePredicate"
+ pattern=".*\.e?git.*"/>
+ <operand
+ xsi:type="workingsets:ExclusionPredicate"
+ excludedWorkingSet="//@setupTasks.8/@workingSets.9"/>
+ </predicate>
+ </workingSet>
+ <workingSet
+ name="Papyrus">
+ <predicate
+ xsi:type="predicates:AndPredicate">
+ <operand
+ xsi:type="predicates:NamePredicate"
+ pattern=".*\.papyrus.*"/>
+ <operand
+ xsi:type="workingsets:ExclusionPredicate"
+ excludedWorkingSet="//@setupTasks.8/@workingSets.9"/>
</predicate>
</workingSet>
<workingSet

Back to the top