commit ab23cf6f9d6660101659e7d964d24c947e32061a
author Abel Hegedus <abel.hegedus@incquerylabs.com> Thu Aug 03 18:59:51 2017 +0200
committer Abel Hegedus <abel.hegedus@incquerylabs.com> Fri Aug 04 10:22:07 2017 +0200
tree 9a0d42ef634378c0536e1e315900059de2dc3535
parent 2ea61677252c550bace65dae91cc0386d02c724b

[cps] updated Oomph setup

added JavaSE-1.8
updated Working Sets

Change-Id: I1bce8d796b657878ca9f30003594b014a4a5d45b
Signed-off-by: Abel Hegedus <abel.hegedus@incquerylabs.com>

cps/releng/org.eclipse.viatra.examples.cps.setup/CPSExample.setup

diff --git a/cps/releng/org.eclipse.viatra.examples.cps.setup/CPSExample.setup b/cps/releng/org.eclipse.viatra.examples.cps.setup/CPSExample.setup
index 12ed2f0..8d221aa 100644
--- a/cps/releng/org.eclipse.viatra.examples.cps.setup/CPSExample.setup
+++ b/cps/releng/org.eclipse.viatra.examples.cps.setup/CPSExample.setup
@@ -41,6 +41,10 @@
       version="JavaSE-1.7"
       location="${jre.location-1.7}"/>
   <setupTask
+      xsi:type="jdt:JRETask"
+      version="JavaSE-1.8"
+      location="${jre.location-1.8}"/>
+  <setupTask
       xsi:type="setup:CompoundTask"
       name="Preferences">
     <setupTask
@@ -229,12 +233,7 @@
   <setupTask
       xsi:type="setup:EclipseIniTask"
       option="-Xms"
-      value="512M"
-      vm="true"/>
-  <setupTask
-      xsi:type="setup:EclipseIniTask"
-      option="-XX:MaxPermSize="
-      value="256M"
+      value="1G"
       vm="true"/>
   <stream name="master">
     <setupTask
@@ -242,47 +241,107 @@
       <workingSet
           name="CPS Domains">
         <predicate
-            xsi:type="predicates:LocationPredicate"
-            pattern=".*/cps/domains/.*"/>
+            xsi:type="predicates:AndPredicate">
+          <operand
+              xsi:type="predicates:RepositoryPredicate"
+              project="cps"/>
+          <operand
+              xsi:type="predicates:OrPredicate">
+            <operand
+                xsi:type="predicates:LocationPredicate"
+                pattern=".*/cps/domains/.*"/>
+            <operand
+                xsi:type="predicates:LocationPredicate"
+                pattern=".*/cps/models/.*"/>
+          </operand>
+        </predicate>
       </workingSet>
       <workingSet
-          name="CPS Queries">
+          name="CPS Queries and Addons">
         <predicate
-            xsi:type="predicates:LocationPredicate"
-            pattern=".*/cps/queries/.*"/>
+            xsi:type="predicates:AndPredicate">
+          <operand
+              xsi:type="predicates:RepositoryPredicate"
+              project="cps"/>
+          <operand
+              xsi:type="predicates:OrPredicate">
+            <operand
+                xsi:type="predicates:LocationPredicate"
+                pattern=".*/cps/queries/.*"/>
+            <operand
+                xsi:type="predicates:LocationPredicate"
+                pattern=".*/cps/addons/.*"/>
+          </operand>
+        </predicate>
       </workingSet>
       <workingSet
           name="CPS Transformations">
         <predicate
-            xsi:type="predicates:LocationPredicate"
-            pattern=".*/cps/transformations/.*"/>
+            xsi:type="predicates:AndPredicate">
+          <operand
+              xsi:type="predicates:RepositoryPredicate"
+              project="cps"/>
+          <operand
+              xsi:type="predicates:OrPredicate">
+            <operand
+                xsi:type="predicates:LocationPredicate"
+                pattern=".*/cps/transformations/.*"/>
+            <operand
+                xsi:type="predicates:LocationPredicate"
+                pattern=".*/cps/application/.*"/>
+          </operand>
+        </predicate>
       </workingSet>
       <workingSet
           name="CPS Tests">
         <predicate
-            xsi:type="predicates:LocationPredicate"
-            pattern=".*/cps/tests/.*"/>
-        <predicate
-            xsi:type="predicates:LocationPredicate"
-            pattern=".*/cps/frameworktests/.*"/>
+            xsi:type="predicates:AndPredicate">
+          <operand
+              xsi:type="predicates:RepositoryPredicate"
+              project="cps"/>
+          <operand
+              xsi:type="predicates:OrPredicate">
+            <operand
+                xsi:type="predicates:LocationPredicate"
+                pattern=".*/cps/tests/.*"/>
+            <operand
+                xsi:type="predicates:LocationPredicate"
+                pattern=".*/cps/frameworktests/.*"/>
+            <operand
+                xsi:type="predicates:LocationPredicate"
+                pattern=".*/cps/prototypes/.*"/>
+          </operand>
+        </predicate>
       </workingSet>
       <workingSet
-          name="CPS Addons">
+          name="CPS Model Generator">
         <predicate
-            xsi:type="predicates:LocationPredicate"
-            pattern=".*/cps/addons/.*"/>
+            xsi:type="predicates:AndPredicate">
+          <operand
+              xsi:type="predicates:RepositoryPredicate"
+              project="cps"/>
+          <operand
+              xsi:type="predicates:LocationPredicate"
+              pattern=".*/cps/generator/.*"/>
+        </predicate>
       </workingSet>
       <workingSet
-          name="CPS Generator">
+          name="CPS Releng">
         <predicate
-            xsi:type="predicates:LocationPredicate"
-            pattern=".*/cps/generator/.*"/>
-      </workingSet>
-      <workingSet
-          name="CPS Prototypes">
-        <predicate
-            xsi:type="predicates:LocationPredicate"
-            pattern=".*/cps/prototypes/.*"/>
+            xsi:type="predicates:AndPredicate">
+          <operand
+              xsi:type="predicates:RepositoryPredicate"
+              project="cps"/>
+          <operand
+              xsi:type="predicates:OrPredicate">
+            <operand
+                xsi:type="predicates:LocationPredicate"
+                pattern=".*/cps/releng/.*"/>
+            <operand
+                xsi:type="predicates:NamePredicate"
+                pattern="cps"/>
+          </operand>
+        </predicate>
       </workingSet>
     </setupTask>
   </stream>