Bug 419092 - [Mac] Kepler doesn't launch without JRE 6, even if JDK 7 is

installed (Platform Runtime build)

4 files changed, 37 insertions, 34 deletions

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 000000000..875e32dde
--- /dev/null
+++ b/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/Eclipse.icns
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.p2.inf b/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.sdk.p2.inf
index 45092a984..45092a984 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 138855fa5..016dfc795 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 a5dd4f96d..26c012bcc 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>