Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Williams2013-10-20 21:24:36 +0000
committerDavid Williams2013-10-20 21:24:36 +0000
commit9868bde9df4c0344c01580398837e4f3ca3fded9 (patch)
tree146cd5f7f8682b84d7c71aff0f14780bf0396867 /eclipse.platform.releng.tychoeclipsebuilder
parentd349c827cb9ffc3f1f1ae123d11176fe2b8eceb9 (diff)
downloadeclipse.platform.releng.aggregator-9868bde9df4c0344c01580398837e4f3ca3fded9.tar.gz
eclipse.platform.releng.aggregator-9868bde9df4c0344c01580398837e4f3ca3fded9.tar.xz
eclipse.platform.releng.aggregator-9868bde9df4c0344c01580398837e4f3ca3fded9.zip
Bug 419092 - [Mac] Kepler doesn't launch without JRE 6, even if JDK 7 is
installed (Platform Runtime build)
Diffstat (limited to 'eclipse.platform.releng.tychoeclipsebuilder')
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/EclipseRTOSGiStarterKit.product5
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml53
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/rt.icnsbin0 -> 118560 bytes
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/rt.icobin0 -> 22486 bytes
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/osgistarter.config.launcher/config.kit.p2.inf (renamed from eclipse.platform.releng.tychoeclipsebuilder/osgistarter.config.launcher/config.p2.inf)0
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/osgistarter.config.launcher/config.kit.product (renamed from eclipse.platform.releng.tychoeclipsebuilder/osgistarter.config.launcher/config.product)0
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/Eclipse.icnsbin0 -> 286605 bytes
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.sdk.p2.inf (renamed from eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.p2.inf)0
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.sdk.product (renamed from eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.product)3
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/pom.xml68
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/platform/Eclipse.icnsbin0 -> 286605 bytes
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/platform/platform.product1
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml31
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/Eclipse.icnsbin0 -> 286605 bytes
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/rcp.sdk.product (renamed from eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/rcp.product)5
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/rcp/Eclipse.icnsbin0 -> 286605 bytes
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/sdk/Eclipse.icnsbin0 -> 286605 bytes
17 files changed, 45 insertions, 121 deletions
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/EclipseRTOSGiStarterKit.product b/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/EclipseRTOSGiStarterKit.product
index fd33b1ad..b79c4615 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/EclipseRTOSGiStarterKit.product
+++ b/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/EclipseRTOSGiStarterKit.product
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
-<product name="EclipseRT OSGi Starter Kit" uid="org.eclipse.rt.osgistarterkit.product" version="1.0.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="EclipseRT OSGi Starter Kit" uid="org.eclipse.rt.osgistarterkit.product" id="org.eclipse.rt.osgistarterkit.product" version="1.0.0.qualifier" useFeatures="true" includeLaunchers="true">
<configIni use="default">
</configIni>
@@ -18,7 +18,7 @@
<macosx icon="rt.icns"/>
<solaris/>
<win useIco="true">
- <ico path="rt.ico"/>
+ <ico path="/eclipse.platform.releng.aggregator/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/rt.ico"/>
<bmp/>
</win>
</launcher>
@@ -159,7 +159,6 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
<features>
<feature id="org.eclipse.equinox.starterkit.product.feature"/>
- <feature id="org.eclipse.osgi.configuration"/>
</features>
<configurations>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml
index d07b4d9e..c4626422 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml
@@ -32,57 +32,6 @@
<format>'${buildId}'</format>
</configuration>
</plugin>
- <!--
- This is necessary as the icons can't be found otherwise.
- Tycho seems to resolve the icons from the target/products/<product.id>
- directory whereas PDE seems to prefix with 'platform:/plugin' and then
- resolve it appropriately...
- -->
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.6</version>
- <executions>
- <execution>
- <phase>prepare-package</phase>
- <id>copy-icons</id>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${basedir}</outputDirectory>
- <resources>
- <resource>
- <directory>../../rt.equinox.bundles/features/org.eclipse.equinox.starterkit.product.feature
- </directory>
- <includes>
- <include>rt.icns</include>
- </includes>
- </resource>
- </resources>
- </configuration>
- </execution>
- <execution>
- <phase>prepare-package</phase>
- <id>copy-windows-icons</id>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${basedir}</outputDirectory>
- <resources>
- <resource>
- <directory>../../rt.equinox.bundles/features/org.eclipse.equinox.starterkit.product.feature
- </directory>
- <includes>
- <include>rt.ico</include>
- </includes>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
<plugin>
<groupId>org.eclipse.tycho</groupId>
@@ -98,7 +47,7 @@
<products>
<product>
<id>org.eclipse.rt.osgistarterkit.product</id>
- <rootFolder>eclipse</rootFolder>
+ <rootFolder>rt</rootFolder>
</product>
</products>
</configuration>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/rt.icns b/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/rt.icns
new file mode 100644
index 00000000..f7c492d9
--- /dev/null
+++ b/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/rt.icns
Binary files differ
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/rt.ico b/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/rt.ico
new file mode 100644
index 00000000..8ac49378
--- /dev/null
+++ b/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/rt.ico
Binary files differ
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/osgistarter.config.launcher/config.p2.inf b/eclipse.platform.releng.tychoeclipsebuilder/osgistarter.config.launcher/config.kit.p2.inf
index 1571e362..1571e362 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/osgistarter.config.launcher/config.p2.inf
+++ b/eclipse.platform.releng.tychoeclipsebuilder/osgistarter.config.launcher/config.kit.p2.inf
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/osgistarter.config.launcher/config.product b/eclipse.platform.releng.tychoeclipsebuilder/osgistarter.config.launcher/config.kit.product
index 3f9babb2..3f9babb2 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/osgistarter.config.launcher/config.product
+++ b/eclipse.platform.releng.tychoeclipsebuilder/osgistarter.config.launcher/config.kit.product
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/Eclipse.icns b/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/Eclipse.icns
new file mode 100644
index 00000000..875e32dd
--- /dev/null
+++ b/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/Eclipse.icns
Binary files differ
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.p2.inf b/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.sdk.p2.inf
index 45092a98..45092a98 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.p2.inf
+++ b/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.sdk.p2.inf
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.product b/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.sdk.product
index 138855fa..016dfc79 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.product
+++ b/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.sdk.product
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
-<product name="Eclipse Platform SDK" uid="org.eclipse.platform.sdk" id="org.eclipse.platform.ide" application="org.eclipse.ui.ide.workbench" version="4.4.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="Eclipse Platform SDK" uid="org.eclipse.platform.sdk" id="org.eclipse.platform.sdk" application="org.eclipse.ui.ide.workbench" version="4.4.0.qualifier" useFeatures="true" includeLaunchers="true">
<configIni use="default">
</configIni>
@@ -158,7 +158,6 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
</plugins>
<features>
- <feature id="org.eclipse.rcp.configuration"/>
<feature id="org.eclipse.platform"/>
<feature id="org.eclipse.platform.source"/>
<feature id="org.eclipse.equinox.p2.user.ui"/>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/pom.xml
index a5dd4f96..26c012bc 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/pom.xml
@@ -32,37 +32,6 @@
<format>'${buildId}'</format>
</configuration>
</plugin>
- <!--
- This is necessary as the icons can't be found otherwise.
- Tycho seems to resolve the icons from the target/products/<product.id>
- directory whereas PDE seems to prefix with 'platform:/plugin' and then
- resolve it appropriately...
- -->
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.6</version>
- <executions>
- <execution>
- <phase>prepare-package</phase>
- <id>copy-icons</id>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${basedir}</outputDirectory>
- <resources>
- <resource>
- <directory>../../rt.equinox.framework/features/org.eclipse.equinox.executable.feature/bin/cocoa/macosx/x86/Eclipse.app/Contents/Resources
- </directory>
- <includes>
- <include>Eclipse.icns</include>
- </includes>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
@@ -85,6 +54,7 @@
</execution>
<execution>
<id>archive-products</id>
+ <phase>pre-integration-test</phase>
<goals>
<goal>archive-products</goal>
</goals>
@@ -100,5 +70,39 @@
</plugin>
</plugins>
</build>
-
+ <profiles>
+ <profile>
+ <id>eclipse-sign</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.cbi.maven.plugins</groupId>
+ <artifactId>eclipse-winsigner-plugin</artifactId>
+ <version>${cbi-plugins.version}</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ <phase>package</phase>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.cbi.maven.plugins</groupId>
+ <artifactId>eclipse-macsigner-plugin</artifactId>
+ <version>${cbi-plugins.version}</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>sign</goal>
+ </goals>
+ <phase>package</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/platform/Eclipse.icns b/eclipse.platform.releng.tychoeclipsebuilder/platform/Eclipse.icns
new file mode 100644
index 00000000..875e32dd
--- /dev/null
+++ b/eclipse.platform.releng.tychoeclipsebuilder/platform/Eclipse.icns
Binary files differ
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.product b/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.product
index 0960d546..a2954956 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.product
+++ b/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.product
@@ -158,7 +158,6 @@ Java and all Java-based trademarks are trademarks of Oracle Corporation in the U
</plugins>
<features>
- <feature id="org.eclipse.rcp.configuration" />
<feature id="org.eclipse.platform"/>
<feature id="org.eclipse.equinox.p2.user.ui"/>
</features>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml
index 14baf5f0..bfd1c97e 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml
@@ -32,37 +32,6 @@
<format>'${buildId}'</format>
</configuration>
</plugin>
- <!--
- This is necessary as the icons can't be found otherwise.
- Tycho seems to resolve the icons from the target/products/<product.id>
- directory whereas PDE seems to prefix with 'platform:/plugin' and then
- resolve it appropriately...
- -->
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.6</version>
- <executions>
- <execution>
- <phase>prepare-package</phase>
- <id>copy-icons</id>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${basedir}</outputDirectory>
- <resources>
- <resource>
- <directory>../../rt.equinox.framework/features/org.eclipse.equinox.executable.feature/bin/cocoa/macosx/x86/Eclipse.app/Contents/Resources
- </directory>
- <includes>
- <include>Eclipse.icns</include>
- </includes>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/Eclipse.icns b/eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/Eclipse.icns
new file mode 100644
index 00000000..875e32dd
--- /dev/null
+++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/Eclipse.icns
Binary files differ
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/rcp.product b/eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/rcp.sdk.product
index c78f870e..13c28840 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/rcp.product
+++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/rcp.sdk.product
@@ -3,6 +3,7 @@
<product name="Eclipse RCP SDK" uid="org.eclipse.rcp.sdk.id" version="4.4.0.qualifier" useFeatures="true" includeLaunchers="true">
+
<configIni use="default">
</configIni>
@@ -12,6 +13,9 @@
<vmArgsMac>-Xdock:icon=../Resources/Eclipse.icns -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
</launcherArgs>
+ <windowImages/>
+
+
<launcher name="eclipse">
<macosx icon="Eclipse.icns"/>
<solaris/>
@@ -20,6 +24,7 @@
</win>
</launcher>
+
<vm>
</vm>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp/Eclipse.icns b/eclipse.platform.releng.tychoeclipsebuilder/rcp/Eclipse.icns
new file mode 100644
index 00000000..875e32dd
--- /dev/null
+++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp/Eclipse.icns
Binary files differ
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/sdk/Eclipse.icns b/eclipse.platform.releng.tychoeclipsebuilder/sdk/Eclipse.icns
new file mode 100644
index 00000000..875e32dd
--- /dev/null
+++ b/eclipse.platform.releng.tychoeclipsebuilder/sdk/Eclipse.icns
Binary files differ

Back to the top