Streamlined setups

com.minres.projects.setup

@@ -45,7 +45,7 @@
   <project href="projects/RDL-Editor.setup?name='RDL.Editor'#/"/>
   <project href="projects/SCViewer.setup?name='SCViewer'#/"/>
   <project href="projects/SystemC-Quickstart.setup?name='systemc.quickstart'#/"/>
-  <project href="projects/JIT-ISS-CoreDsl.setup?name='JIT.ISS.CoreDsl'#/"/>
+  <project href="projects/JIT-ISS-CoreDsl.setup?name='CoreDsl'#/"/>
-  <project href="projects/Mendel.setup?name='mendel'#/"/>
+  <project href="projects/Mendel.setup?name='Mendel'#/"/>
   <description>MINRES provided cool projects.</description>
 </setup:ProjectCatalog>

projects/DBT-RISE-RISCV.setup

@@ -124,6 +124,16 @@
           label="HTTPS (read-only, anonymous)"/>
       <description>Choose from the available Github URIs</description>
     </setupTask>
+    <setupTask
+        xsi:type="setup:VariableTask"
+        name="git-stream"
+        label="Stream to checkout">
+      <choice
+          value="master"/>
+      <choice
+          value="develop"/>
+      <description>Stream to checkout</description>
+    </setupTask>
   </setupTask>
   <setupTask
       xsi:type="setup:EclipseIniTask"
@@ -182,18 +192,7 @@
     <sourceLocator
         rootFolder="${git.clone.dbt_rise_riscv.location}"/>
   </setupTask>
-  <stream name="master">
+  <stream name="${git-stream}"
-    <setupTask
+      label="Stream to checkout"/>
-        xsi:type="setup:EclipseIniTask"
-        option="-Doomph.redirection.dbt_rise_riscv"
-        value="=https://git.eclipse.org/c/Minres/oomph-setups.git.git/plain//DBT-RISE-RISCV.setup->${git.clone.dbt_rise_riscv.location|uri}//DBT-RISE-RISCV.setup"
-        vm="true">
-      <description>
-        Set an Oomph redirection system property to redirect the
-        logical location of this setup to its physical location in the Git
-        clone.
-      </description>
-    </setupTask>
-  </stream>
   <description>An instruction set simulator based on DBT-RISE implementing the RISC-V ISA.</description>
 </setup:Project>

projects/JIT-ISS-CoreDsl.setup

@@ -12,8 +12,8 @@
     xmlns:setup.p2="http://www.eclipse.org/oomph/setup/p2/1.0"
     xmlns:setup.workingsets="http://www.eclipse.org/oomph/setup/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/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"
-    name="JIT.ISS.CoreDsl"
+    name="CoreDsl"
-    label="JIT ISS CoreDsl (non-public)">
+    label="CoreDsl (non-public)">
   <setupTask
       xsi:type="setup:CompoundTask"
       name="Global Variables">
@@ -28,10 +28,10 @@
         xsi:type="setup:VariableTask"
         name="minres-git-stream"
         label="Stream to checkout">
-      <choice
-          value="develop"/>
       <choice
           value="master"/>
+      <choice
+          value="develop"/>
       <description>Stream to checkout</description>
     </setupTask>
   </setupTask>
@@ -73,7 +73,7 @@
   </setupTask>
   <setupTask
       xsi:type="git:GitCloneTask"
-      id="git.clone.JIT.ISS.CoreDsl"
+      id="git.clone.CoreDsl"
       filter=""
       remoteURI="https://${minres.git.user.id}@minres.com/git/SystemC/JIT-ISS-CoreDsl.git">
     <description>${scope.project.label}</description>
@@ -81,7 +81,7 @@
   <setupTask
       xsi:type="projects:ProjectsImportTask">
     <sourceLocator
-        rootFolder="${git.clone.JIT.ISS.CoreDsl.location}"
+        rootFolder="${git.clone.CoreDsl.location}"
         locateNestedProjects="true"/>
   </setupTask>
   <setupTask
@@ -103,14 +103,6 @@
     <description>Sets the CoreDSL target platform</description>
   </setupTask>
   <stream name="${minres-git-stream}"
-      label="Stream to checkout">
+      label="Stream to checkout"/>
-    <setupTask
-        xsi:type="setup:EclipseIniTask"
-        option="-Doomph.redirection.JIT.ISS.CoreDsl"
-        value="=https://git.eclipse.org/c/Minres/oomph-setups.git.git/plain//JITISSCoreDsl.setup->${git.clone.JIT.ISS.CoreDsl.location|uri}//JITISSCoreDsl.setup"
-        vm="true">
-      <description>Set an Oomph redirection system property to redirect the logical location of this setup to its physical location in the Git clone.</description>
-    </setupTask>
-  </stream>
   <description>A Xtext based CoreDSL editor with syntax highlighting and context sensitive help.</description>
 </setup:Project>

projects/Mendel.setup

@@ -12,7 +12,7 @@
     xmlns:setup.p2="http://www.eclipse.org/oomph/setup/p2/1.0"
     xmlns:setup.workingsets="http://www.eclipse.org/oomph/setup/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/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"
-    name="mendel"
+    name="Mendel"
     label="Mendel (non-public)">
   <setupTask
       xsi:type="setup:CompoundTask"
@@ -28,10 +28,10 @@
         xsi:type="setup:VariableTask"
         name="minres-git-stream"
         label="Stream to checkout">
-      <choice
-          value="develop"/>
       <choice
           value="master"/>
+      <choice
+          value="develop"/>
       <description>Stream to checkout</description>
     </setupTask>
   </setupTask>
@@ -99,11 +99,8 @@
     <workingSet
         name="${scope.project.name} Features">
       <predicate
-          xsi:type="predicates:AndPredicate">
-        <operand
           xsi:type="predicates:LocationPredicate"
           pattern="${git.clone.mendel.location}/features/.*"/>
-      </predicate>
     </workingSet>
     <description>The dynamic working sets for ${scope.project.label}</description>
   </setupTask>
@@ -121,7 +118,10 @@
               pattern="com.minres.sbml_editor.product"/>
           <operand
               xsi:type="predicates:NamePredicate"
-              pattern="com\.minres\.mendel\.models\.sbml"/>
+              pattern="com\.minres\.mendel\.models\.sbml\.diagram\..*"/>
+          <operand
+              xsi:type="predicates:NamePredicate"
+              pattern="com\.minres\.mendel\.models\.sbml\.editor"/>
         </operand>
         <operand
             xsi:type="predicates:LocationPredicate"
@@ -135,11 +135,8 @@
     <workingSet
         name="${scope.project.name} Tests">
       <predicate
-          xsi:type="predicates:AndPredicate">
-        <operand
           xsi:type="predicates:LocationPredicate"
           pattern="${git.clone.mendel.location}/tests/.*"/>
-      </predicate>
     </workingSet>
     <description>The dynamic working sets for ${scope.project.label}</description>
   </setupTask>
@@ -148,11 +145,8 @@
     <workingSet
         name="${scope.project.name} Releng">
       <predicate
-          xsi:type="predicates:AndPredicate">
-        <operand
           xsi:type="predicates:LocationPredicate"
           pattern="${git.clone.mendel.location}/releng/.*"/>
-      </predicate>
     </workingSet>
     <description>The dynamic working sets for ${scope.project.label}</description>
   </setupTask>
@@ -161,11 +155,8 @@
     <workingSet
         name="${scope.project.name} 3rd Party">
       <predicate
-          xsi:type="predicates:AndPredicate">
-        <operand
           xsi:type="predicates:LocationPredicate"
           pattern="${git.clone.mendel.location}/3rdparty/.*"/>
-      </predicate>
     </workingSet>
     <description>The dynamic working sets for ${scope.project.label}</description>
   </setupTask>
@@ -174,11 +165,8 @@
     <workingSet
         name="${scope.project.name} Plugins">
       <predicate
-          xsi:type="predicates:AndPredicate">
-        <operand
           xsi:type="predicates:LocationPredicate"
           pattern="${git.clone.mendel.location}/bundles/.*"/>
-      </predicate>
     </workingSet>
     <description>The dynamic working sets for ${scope.project.label}</description>
   </setupTask>
@@ -187,23 +175,13 @@
     <workingSet
         name="${scope.project.name} C++">
       <predicate
-          xsi:type="predicates:AndPredicate">
-        <operand
           xsi:type="predicates:LocationPredicate"
           pattern="${git.clone.mendel.location}/C\+\+/.*"/>
-      </predicate>
     </workingSet>
     <description>The dynamic working sets for ${scope.project.label}</description>
   </setupTask>
   <stream name="${minres-git-stream}"
-      label="Stream">
+      label="Stream to checkout">
-    <setupTask
-        xsi:type="setup:EclipseIniTask"
-        option="-Doomph.redirection.mendel"
-        value="=https://git.eclipse.org/c/Minres/oomph-setups.git.git/plain//Mendel.setup->${git.clone.mendel.location|uri}//mendel.setup"
-        vm="true">
-      <description>Set an Oomph redirection system property to redirect the logical location of this setup to its physical location in the Git clone.</description>
-    </setupTask>
     <description></description>
   </stream>
   <description>A Xtext based CoreDSL editor with syntax highlighting and context sensitive help.</description>

projects/RDL-Editor.setup

@@ -119,6 +119,16 @@
           label="HTTPS (read-only, anonymous)"/>
       <description>Choose from the available Github URIs</description>
     </setupTask>
+    <setupTask
+        xsi:type="setup:VariableTask"
+        name="git-stream"
+        label="Stream to checkout">
+      <choice
+          value="master"/>
+      <choice
+          value="develop"/>
+      <description>Stream to checkout</description>
+    </setupTask>
   </setupTask>
   <setupTask
       xsi:type="jdt:JRETask"
@@ -202,16 +212,7 @@
       name="com.minres.rdl.target">
     <description>Sets the RDL Editor target platform</description>
   </setupTask>
-    <stream
+  <stream name="${git-stream}"
-        name="master"
+      label="Stream to checkout"/>
-        label="Master">
-      <setupTask
-          xsi:type="setup:EclipseIniTask"
-          option="-Doomph.redirection.JIT.ISS.CoreDsl"
-          value="=https://git.eclipse.org/c/Minres/oomph-setups.git.git/plain//JITISSCoreDsl.setup->${git.clone.JIT.ISS.CoreDsl.location|uri}//JITISSCoreDsl.setup"
-          vm="true">
-        <description>Set an Oomph redirection system property to redirect the logical location of this setup to its physical location in the Git clone.</description>
-      </setupTask>
-    </stream>
   <description>A Xtext based SystemRDL editor with syntax highlighting and context sensitive help.</description>
 </setup:Project>

projects/SCViewer.setup

@@ -120,6 +120,16 @@
           label="HTTPS (read-only, anonymous)"/>
       <description>Choose from the available Github URIs</description>
     </setupTask>
+    <setupTask
+        xsi:type="setup:VariableTask"
+        name="git-stream"
+        label="Stream to checkout">
+      <choice
+          value="master"/>
+      <choice
+          value="develop"/>
+      <description>Stream to checkout</description>
+    </setupTask>
   </setupTask>
   <setupTask
       xsi:type="jdt:JRETask"
@@ -200,7 +210,7 @@
       name="Neon Platform">
     <description>Sets the RDL Editor target platform</description>
   </setupTask>
-  <stream name="master"
+  <stream name="${git-stream}"
-      label="Master"/>
+      label="Stream to checkout"/>
   <description>A lightweight tool to visualize VCD and transaction traces.</description>
 </setup:Project>