API baseline for RCP and RAP

Change-Id: I9db3d2a1483897adb8dc9bb403b3f304dbc2ca6c
eclipse-emf-parsley · Jun 16, 2016 · 935c7dd · 935c7dd
1 parent 0df5280
commit 935c7dd
Showing 1 changed file with 19 additions and 19 deletions.
diff --git a/devtools/org.eclipse.emf.parsley.oomph/EMFParsley.setup b/devtools/org.eclipse.emf.parsley.oomph/EMFParsley.setup
@@ -5,7 +5,7 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:git="http://www.eclipse.org/oomph/setup/git/1.0"
     xmlns:jdt="http://www.eclipse.org/oomph/setup/jdt/1.0"
-    xmlns:launching="http://www.eclipse.org/oomph/setup/launching/1.0"
+    xmlns:launching_1.0="http://www.eclipse.org/oomph/setup/launching/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"
@@ -15,7 +15,7 @@
     xmlns:setup.targlets="http://www.eclipse.org/oomph/setup/targlets/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 ../../../../../oomph/org.eclipse.oomph.git/plain/setups/models/Git.ecore http://www.eclipse.org/oomph/setup/jdt/1.0 ../../../../../oomph/org.eclipse.oomph.git/plain/setups/models/JDT.ecore http://www.eclipse.org/oomph/setup/launching/1.0 ../../../../../oomph/org.eclipse.oomph.git/plain/setups/models/Launching.ecore http://www.eclipse.org/oomph/setup/mylyn/1.0 ../../../../../oomph/org.eclipse.oomph.git/plain/setups/models/Mylyn.ecore http://www.eclipse.org/oomph/setup/pde/1.0 ../../../../../oomph/org.eclipse.oomph.git/plain/setups/models/PDE.ecore http://www.eclipse.org/oomph/predicates/1.0 ../../../../../oomph/org.eclipse.oomph.git/plain/setups/models/Predicates.ecore http://www.eclipse.org/oomph/setup/projects/1.0 ../../../../../oomph/org.eclipse.oomph.git/plain/setups/models/Projects.ecore http://www.eclipse.org/oomph/setup/targlets/1.0 ../../../../../oomph/org.eclipse.oomph.git/plain/setups/models/SetupTarglets.ecore http://www.eclipse.org/oomph/setup/workingsets/1.0 ../../../../../oomph/org.eclipse.oomph.git/plain/setups/models/SetupWorkingSets.ecore http://www.eclipse.org/oomph/workingsets/1.0 ../../../../../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/targlets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupTarglets.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="emf.parsley"
     label="EMF Parsley">
   <setupTask
@@ -130,6 +130,12 @@
       xsi:type="setup:VariableTask"
       name="api.baseline.zip"
       value="org.eclipse.emf.parsley.repository-1.0.0.v20160608-1623.zip"/>
+  <setupTask
+      xsi:type="pde:APIBaselineTask"
+      name="parsley-latest"
+      version="${api.baseline.version}"
+      location="${installation.location}/api/${api.baseline.version}/"
+      remoteURI="http://download.eclipse.org/emf-parsley/zips/${api.baseline.zip}"/>
   <setupTask
       xsi:type="setup:CompoundTask"
       name="Eclipse IDE Plugins">
@@ -364,12 +370,6 @@
             url="${mwe2.site}"/>
       </setupTask>
     </setupTask>
-    <setupTask
-        xsi:type="pde:APIBaselineTask"
-        name="parsley-latest"
-        version="${api.baseline.version}"
-        location="${installation.location}/api/${api.baseline.version}/"
-        remoteURI="http://download.eclipse.org/emf-parsley/zips/${api.baseline.zip}"/>
     <setupTask
         xsi:type="projects:ProjectsImportTask">
       <sourceLocator
@@ -601,31 +601,21 @@
               project="org.eclipse.emf.parsley.common"/>
           <operand
               xsi:type="workingsets:ExclusionPredicate"
-              excludedWorkingSet="//@projects[name='rcp']/@setupTasks.4/@workingSets.3 //@projects[name='rcp']/@setupTasks.4/@workingSets.0 //@projects[name='rcp']/@setupTasks.4/@workingSets.4 //@projects[name='rcp']/@setupTasks.4/@workingSets.2 //@projects[name='rcp']/@setupTasks.4/@workingSets.1"/>
+              excludedWorkingSet="//@projects[name='rcp']/@setupTasks.3/@workingSets.3 //@projects[name='rcp']/@setupTasks.3/@workingSets.0 //@projects[name='rcp']/@setupTasks.3/@workingSets.4 //@projects[name='rcp']/@setupTasks.3/@workingSets.2 //@projects[name='rcp']/@setupTasks.3/@workingSets.1"/>
         </predicate>
       </workingSet>
       <description>The dynamic working sets for ${scope.project.label}</description>
     </setupTask>
     <setupTask
         xsi:type="projects:ProjectsBuildTask"
         refresh="true"/>
-    <setupTask
-        xsi:type="launching:LaunchTask"
-        id="GenerateEmfParsleyDsl2"
-        launcher="Generate Language Infrastructure (org.eclipse.emf.parsley.dsl)"/>
     <setupTask
         xsi:type="projects:ProjectsBuildTask"
         id="Clean"
         refresh="true"
         clean="true">
       <description>Clean</description>
     </setupTask>
-    <setupTask
-        xsi:type="launching:LaunchTask"
-        id="GenerateExamplesZips"
-        launcher="Build Zips">
-      <description>Generate Zips of Examples</description>
-    </setupTask>
     <setupTask
         xsi:type="mylyn:MylynQueriesTask"
         repositoryURL="https://bugs.eclipse.org/bugs"
@@ -722,6 +712,16 @@
       <description>Branch for Simrel for Neon</description>
     </stream>
     <description>EMF Parsley version for RCP</description>
+    <setupTask
+        xsi:type="launching_1.0:LaunchTask"
+        id="GenerateEmfParsleyDsl2"
+        launcher="Generate Language Infrastructure (org.eclipse.emf.parsley.dsl)"/>
+    <setupTask
+        xsi:type="launching_1.0:LaunchTask"
+        id="GenerateExamplesZips"
+        launcher="Build Zips">
+      <description>Generate Zips of Examples</description>
+    </setupTask>
   </project>
   <project name="rap"
       label="RAP">