commit 658a3ab665fa5ee7fbba7ddc6b235372fc46ff2f
author Ed Merks <ed.merks@gmail.com> Sat Apr 21 09:24:11 2018 +0200
committer Ed Merks <ed.merks@gmail.com> Sat Apr 21 09:24:11 2018 +0200
tree c8f43381c49ce9287dfe000c990705424515a5b5
parent da86552b33ff5d3dbf392c1bcec8545208d7cd2c

Bug 533818 - Improve the Oomph setups for the platform projects

Avoid importing eclipse.platform.text; it probably shouldn't have a
.project file in it.

The root Platform.setup in Oomph will manage the fixed value for the
eclipse.target.platform variable so that it only needs to be managed in
a single place in the future.

Change-Id: Ie1bf058b2e7ccd4d01e2182926af0f9faec1d654
Signed-off-by: Ed Merks <ed.merks@gmail.com>

org.eclipse.text.releng/platformText.setup

diff --git a/org.eclipse.text.releng/platformText.setup b/org.eclipse.text.releng/platformText.setup
index bf31573..74b0ed3 100644
--- a/org.eclipse.text.releng/platformText.setup
+++ b/org.eclipse.text.releng/platformText.setup
@@ -54,7 +54,17 @@
           name="*"/>
       <sourceLocator
           rootFolder="${git.clone.platform.text.location}"
-          locateNestedProjects="true"/>
+          locateNestedProjects="true">
+        <predicate
+            xsi:type="predicates:NotPredicate">
+          <operand
+              xsi:type="predicates:AndPredicate">
+            <operand
+                xsi:type="predicates:NamePredicate"
+                pattern="eclipse\.platform\.text"/>
+          </operand>
+        </predicate>
+      </sourceLocator>
     </targlet>
   </setupTask>
   <setupTask
@@ -97,13 +107,7 @@
     </workingSet>
   </setupTask>
   <stream name="master"
-      label="Master">
-    <setupTask
-        xsi:type="setup:VariableTask"
-        name="eclipse.target.platform"
-        value="Oxygen"
-        storageURI="scope://Workspace"/>
-  </stream>
+      label="Master"/>
   <logicalProjectContainer
       xsi:type="setup:Project"
       href="index:/org.eclipse.setup#//@projectCatalogs[name='org.eclipse']/@projects[name='platform']"/>