From af1f3ef0710c532a56dc6632670de12639802ba1 Mon Sep 17 00:00:00 2001
From: David Williams
Date: Fri, 23 Jan 2015 21:24:26 -0500
Subject: Bug 457071 - Inconsistencies in org.eclipes.rcp.configuration for Mac
 OS X platform

---
 .../rcp.config/build.properties                    |  4 ++--
 .../rcp.config/pom.xml                             | 24 +++++++++++++---------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
index d6c4f4e6c..c8e8e8488 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
+++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
@@ -19,11 +19,11 @@ root.win32.win32.x86_64.permissions.755=eclipse.exe
 # having wrong value in plist.info, resulting in "application requires Java 6" (see bug 445026, and bug 457071)
 # These are not required at all, for our "product build", but are to get 
 # configuration_roots complete.
-root.macosx.cocoa.x86_64=rootfiles/macosx.cocoa.x86_64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/cocoa/macosx/x86_64/Eclipse.app/Contents/MacOS
+root.macosx.cocoa.x86_64=rootfiles/macosx.cocoa.x86_64
 root.macosx.cocoa.x86_64.permissions.755=Eclipse.app/Contents/MacOS/eclipse
 root.macosx.cocoa.x86_64.link=Eclipse.app/Contents/MacOS/eclipse,eclipse
 
-root.macosx.cocoa.x86=rootfiles/macosx.cocoa.x86,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/cocoa/macosx/x86/Eclipse.app/Contents/MacOS
+root.macosx.cocoa.x86=rootfiles/macosx.cocoa.x86
 root.macosx.cocoa.x86.permissions.755=Eclipse.app/Contents/MacOS/eclipse
 root.macosx.cocoa.x86.link=Eclipse.app/Contents/MacOS/eclipse,eclipse
 
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/pom.xml
index 1cbee922e..91ce92aa4 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/pom.xml
@@ -172,39 +172,43 @@
             </configuration>
           </execution>
           <execution>
-            <id>copy-resources-cocoa.macosx.x86</id>
+            <id>copy-resources-macosx.cocoa.x86_64</id>
             <phase>validate</phase>
             <goals>
               <goal>copy-resources</goal>
             </goals>
             <configuration>
-              <outputDirectory>${basedir}/rootfiles/macosx.cocoa.x86</outputDirectory>
+              <outputDirectory>${basedir}/rootfiles/macosx.cocoa.x86_64</outputDirectory>
               <resources>
                 <resource>
-                  <directory>../../eclipse.platform.swt.binaries/bundles/org.eclipse.swt.cocoa.macosx</directory>
+                  <directory>../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/cocoa/macosx/x86_64</directory>
                   <includes>
-                    <include>about_files/*</include>
-                    <include>about.html</include>
+                    <include>**/*</include>
                   </includes>
+                  <excludes>
+                    <exclude>**/Info.plist</exclude>
+                  </excludes>
                 </resource>
               </resources>
             </configuration>
           </execution>
           <execution>
-            <id>copy-resources-cocoa.macosx.x86_64</id>
+            <id>copy-resources-macosx.cocoa.x86</id>
             <phase>validate</phase>
             <goals>
               <goal>copy-resources</goal>
             </goals>
             <configuration>
-              <outputDirectory>${basedir}/rootfiles/macosx.cocoa.x86_64</outputDirectory>
+              <outputDirectory>${basedir}/rootfiles/macosx.cocoa.x86</outputDirectory>
               <resources>
                 <resource>
-                  <directory>../../eclipse.platform.swt.binaries/bundles/org.eclipse.swt.cocoa.macosx.x86_64</directory>
+                  <directory>../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/cocoa/macosx/x86</directory>
                   <includes>
-                    <include>about_files/*</include>
-                    <include>about.html</include>
+                    <include>**/*</include>
                   </includes>
+                  <excludes>
+                    <exclude>**/Info.plist</exclude>
+                  </excludes>
                 </resource>
               </resources>
             </configuration>
-- 
cgit v1.2.3