Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Williams2015-01-24 04:34:28 +0000
committerDavid Williams2015-01-24 04:34:28 +0000
commit6faa1186a1693ad05663a07709db7f1c43150ce7 (patch)
treef9b6e6a3d40a37370535a196a3ef23b8a99b8bbc
parentaf1f3ef0710c532a56dc6632670de12639802ba1 (diff)
downloadeclipse.platform.releng.aggregator-6faa1186a1693ad05663a07709db7f1c43150ce7.tar.gz
eclipse.platform.releng.aggregator-6faa1186a1693ad05663a07709db7f1c43150ce7.tar.xz
eclipse.platform.releng.aggregator-6faa1186a1693ad05663a07709db7f1c43150ce7.zip
Revert "Bug 457071 - Inconsistencies in org.eclipes.rcp.configuration for Mac OS"
This reverts commit af1f3ef0710c532a56dc6632670de12639802ba1. reverting, to make slight cleanup.
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties4
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/rcp.config/pom.xml24
2 files changed, 12 insertions, 16 deletions
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
index c8e8e8488..d6c4f4e6c 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
+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.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
+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.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 91ce92aa4..1cbee922e 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/pom.xml
@@ -172,43 +172,39 @@
</configuration>
</execution>
<execution>
- <id>copy-resources-macosx.cocoa.x86_64</id>
+ <id>copy-resources-cocoa.macosx.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>../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/cocoa/macosx/x86_64</directory>
+ <directory>../../eclipse.platform.swt.binaries/bundles/org.eclipse.swt.cocoa.macosx</directory>
<includes>
- <include>**/*</include>
+ <include>about_files/*</include>
+ <include>about.html</include>
</includes>
- <excludes>
- <exclude>**/Info.plist</exclude>
- </excludes>
</resource>
</resources>
</configuration>
</execution>
<execution>
- <id>copy-resources-macosx.cocoa.x86</id>
+ <id>copy-resources-cocoa.macosx.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>../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/cocoa/macosx/x86</directory>
+ <directory>../../eclipse.platform.swt.binaries/bundles/org.eclipse.swt.cocoa.macosx.x86_64</directory>
<includes>
- <include>**/*</include>
+ <include>about_files/*</include>
+ <include>about.html</include>
</includes>
- <excludes>
- <exclude>**/Info.plist</exclude>
- </excludes>
</resource>
</resources>
</configuration>

Back to the top