Google Git
Sign in
eclipse/ecoretools/org.eclipse.ecoretools/1c495be59ecc06db63bab47b6cefc00fbd03a5e4^!/.
commit
1c495be59ecc06db63bab47b6cefc00fbd03a5e4
[log]
author
Ed Merks <ed.merks@gmail.com>
Sun Mar 13 11:48:22 2016 +0100
committer
cbrun <cedric.brun@obeo.fr>
Mon Mar 14 16:17:13 2016 +0100
tree
1cfdbfd0d70542ab135e327cb7a927e7fc13e18a
parent
5e9c35acb656391b358eba25652da0c0fb74cba4 [diff]
Fix broken/invalid EcoreTools.setup

diff --git a/org.eclipse.emf.ecoretools.build/EcoreTools.setup b/org.eclipse.emf.ecoretools.build/EcoreTools.setup
index 02b78bb..d8e1e11 100644
--- a/org.eclipse.emf.ecoretools.build/EcoreTools.setup
+++ b/org.eclipse.emf.ecoretools.build/EcoreTools.setup

@@ -6,12 +6,14 @@
     xmlns:git="http://www.eclipse.org/oomph/setup/git/1.0"
     xmlns:jdt="http://www.eclipse.org/oomph/setup/jdt/1.0"
     xmlns:mylyn="http://www.eclipse.org/oomph/setup/mylyn/1.0"
+    xmlns:pde="http://www.eclipse.org/oomph/setup/pde/1.0"
     xmlns:predicates="http://www.eclipse.org/oomph/predicates/1.0"
+    xmlns:projects="http://www.eclipse.org/oomph/setup/projects/1.0"
     xmlns:setup="http://www.eclipse.org/oomph/setup/1.0"
     xmlns:setup.p2="http://www.eclipse.org/oomph/setup/p2/1.0"
     xmlns:setup.workingsets="http://www.eclipse.org/oomph/setup/workingsets/1.0"
     xmlns:workingsets="http://www.eclipse.org/oomph/workingsets/1.0"
-    xsi:schemaLocation="http://www.eclipse.org/oomph/setup/git/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Git.ecore http://www.eclipse.org/oomph/setup/jdt/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/JDT.ecore http://www.eclipse.org/oomph/setup/mylyn/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Mylyn.ecore http://www.eclipse.org/oomph/predicates/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Predicates.ecore http://www.eclipse.org/oomph/setup/workingsets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupWorkingSets.ecore http://www.eclipse.org/oomph/workingsets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/WorkingSets.ecore"
+    xsi:schemaLocation="http://www.eclipse.org/oomph/setup/git/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Git.ecore http://www.eclipse.org/oomph/setup/jdt/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/JDT.ecore http://www.eclipse.org/oomph/setup/mylyn/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Mylyn.ecore http://www.eclipse.org/oomph/setup/pde/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/PDE.ecore http://www.eclipse.org/oomph/predicates/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Predicates.ecore http://www.eclipse.org/oomph/setup/projects/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Projects.ecore http://www.eclipse.org/oomph/setup/workingsets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupWorkingSets.ecore http://www.eclipse.org/oomph/workingsets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/WorkingSets.ecore"
     name="ecoretools"
     label="EcoreTools">
   <setupTask
@@ -60,7 +62,7 @@
       xsi:type="projects:ProjectsImportTask">
     <sourceLocator
         rootFolder="${git.clone.ecoretools.location}"/>
-  </setupTask>      
+  </setupTask>
   <setupTask
       xsi:type="setup:VariableTask"
       id="ecoretools.target.platform"
@@ -104,7 +106,7 @@
     <repository
         url="http://download.eclipse.org/mylyn/releases/3.13"/>
     <repository
-        url="http://download.eclipse.org/sirius/updates/releases/3.0.0/mars"/>
+        url="http://download.eclipse.org/sirius/updates/releases/3.1.0/mars"/>
     <description>Install the tools needed in the IDE to work with the source code for ${scope.project.label}</description>
   </setupTask>
   <setupTask
@@ -139,7 +141,7 @@
             project="org.eclipse.emf.ecoretools"/>
         <operand
             xsi:type="workingsets:ExclusionPredicate"
-            excludedWorkingSet="//@setupTasks.9/@workingSets.3 //@setupTasks.9/@workingSets.2 //@setupTasks.9/@workingSets.1"/>
+            excludedWorkingSet="//@setupTasks.10/@workingSets.3 //@setupTasks.10/@workingSets.1 //@setupTasks.10/@workingSets.2"/>
       </predicate>
     </workingSet>
     <workingSet
@@ -274,6 +276,12 @@
     <buildPlan
         name="ecoretools.gerrit"/>
   </setupTask>
+  <setupTask
+      xsi:type="pde:TargetPlatformTask"
+      id="Target Platform - EcoreTools"
+      name="${ecoretools.target.platform}">
+    <description>Target Platform used for the new install.</description>
+  </setupTask>
   <stream name="master"
       label="Master"/>
   <logicalProjectContainer