Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Williams2015-01-24 04:39:14 +0000
committerDavid Williams2015-01-24 04:39:14 +0000
commit0aaf201e33059c533f3610e7db458e0edc2de5d0 (patch)
tree1eb2cdfd2a36ab65c6a075d9b3e6e121b28909ac
parent6faa1186a1693ad05663a07709db7f1c43150ce7 (diff)
downloadeclipse.platform.releng.aggregator-0aaf201e33059c533f3610e7db458e0edc2de5d0.tar.gz
eclipse.platform.releng.aggregator-0aaf201e33059c533f3610e7db458e0edc2de5d0.tar.xz
eclipse.platform.releng.aggregator-0aaf201e33059c533f3610e7db458e0edc2de5d0.zip
Bug 457071 - Inconsistencies in org.eclipes.rcp.configuration for Mac OS
X platform
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties8
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/rcp.config/pom.xml38
2 files changed, 18 insertions, 28 deletions
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
index d6c4f4e6c..8b247df45 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
+++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2000, 2014 IBM Corporation and others.
+# Copyright (c) 2000, 2015 IBM Corporation and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
@@ -18,12 +18,12 @@ root.win32.win32.x86_64.permissions.755=eclipse.exe
# Care is need there, for "macosx", as several forms will appear to work, but end up
# 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
+# configuration_roots complete (see bug 457071).
+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..b255323c4 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/pom.xml
@@ -172,59 +172,49 @@
</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>
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-p2-plugin</artifactId>
- <version>${tycho.version}</version>
- <executions>
- <execution>
- <id>attached-p2-metadata</id>
- <phase>package</phase>
- <goals>
- <goal>p2-metadata</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</project>

Back to the top