commit be781ff4dc94338097f9feb7cbc7c9d4a85bcd03
author Ed Merks <ed.merks@gmail.com> Mon Apr 23 09:26:24 2018 +0200
committer Ed Merks <ed.merks@gmail.com> Mon Apr 23 09:26:24 2018 +0200
tree 294b04217accdadecb3e227a5366dc20d901ce27
parent aadfe509fd42cfb312ae488f4f0481571adc2894

Bug 533818 - Improve the Oomph setups for the platform projects

When all target platforms are resolved, projects from the
eclipse.platform.swt.binaries repo are imported but they have errors.
Change the source locator to exclude all platform-specific projects and
then include only the one project for the current specific platform.

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

bundles/org.eclipse.swt.tools/Oomph/platformSwt.setup

diff --git a/bundles/org.eclipse.swt.tools/Oomph/platformSwt.setup b/bundles/org.eclipse.swt.tools/Oomph/platformSwt.setup
index 9862a75..cfb0d53 100644
--- a/bundles/org.eclipse.swt.tools/Oomph/platformSwt.setup
+++ b/bundles/org.eclipse.swt.tools/Oomph/platformSwt.setup
@@ -96,7 +96,20 @@
           name="*"/>
       <sourceLocator
           rootFolder="${git.clone.platform.swt.binaries.location}"
-          locateNestedProjects="true"/>
+          locateNestedProjects="true">
+        <predicate
+            xsi:type="predicates:OrPredicate">
+          <operand
+              xsi:type="predicates:NotPredicate">
+            <operand
+                xsi:type="predicates:NamePredicate"
+                pattern=".*(cocoa|gtk|win32)(\.(macosx|aix|hpux|linux|solaris|win32)(\.(x86_64|ppc64|ia64|aarch64|arm|ppc64|ppc64le|s390|s390x|x86|sparcv9))?)?"/>
+          </operand>
+          <operand
+              xsi:type="predicates:NamePredicate"
+              pattern=".*\.${osgi.ws}(\.${osgi.os}(\.${osgi.arch})?)?"/>
+        </predicate>
+      </sourceLocator>
     </targlet>
     <targlet
         name="SWT"