Bug 407956 - Can not launch starter kit on Mac

14 files changed, 46 insertions, 118 deletions

diff --git a/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/EclipseRTOSGiStarterKit.product b/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/EclipseRTOSGiStarterKit.product
index 23106c144..7643f1304 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/EclipseRTOSGiStarterKit.product
+++ b/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/EclipseRTOSGiStarterKit.product
@@ -15,10 +15,12 @@
    <windowImages/>
 
    <launcher name="rt">
+      <linux icon="/rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/x86_64/icon.xpm"/>
       <macosx icon="rt.icns"/>
-      <solaris/>
+      <solaris
+            solarisLarge="/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/bin/gtk/solaris/sparc/Eclipse.l.pm"/>
       <win useIco="true">
-         <ico path="rt.ico"/>
+         <ico path="/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/rt.ico"/>
          <bmp/>
       </win>
    </launcher>
@@ -30,7 +32,7 @@
         <url>http://eclipse.org/legal/epl/notice.php</url>
         <text>
    Eclipse Foundation Software User Agreement
-April 14, 2010
+February 1, 2011
 
 Usage Of Content
 
@@ -99,6 +101,7 @@ THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER
 TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.
 SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):
 
+       - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)
        - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)
        - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)
        - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml
index 4cbd326d7..db44542ea 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/pom.xml
@@ -32,56 +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>
@@ -98,7 +48,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 000000000..f7c492d99
--- /dev/null
+++ b/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/rt.icns
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 000000000..8ac493786
--- /dev/null
+++ b/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/rt.ico
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 8d2b56fad..8d2b56fad 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 23b090f00..ee63366e1 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.product
+++ b/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.sdk.product
@@ -84,7 +84,7 @@ including, but not limited to the following locations:
        - Feature directories
 
 Note: if a Feature made available by the Eclipse Foundation is installed using the
-Provisioning Technology (as defined below), you must agree to a license (&quot;Feature
+Provisioning Technology (as defined below), you must agree to a license (&quot;Feature 
 Update License&quot;) during the installation process. If the Feature contains
 Included Features, the Feature Update License should either provide you
 with the terms and conditions governing the Included Features or inform
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/pom.xml
index 234dee58a..b43176450 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 000000000..875e32dde
--- /dev/null
+++ b/eclipse.platform.releng.tychoeclipsebuilder/platform/Eclipse.icns
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/platform/pom.xml
index 2fed53555..ad75aa7d6 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 000000000..875e32dde
--- /dev/null
+++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/Eclipse.icns
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/rcp.product b/eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/rcp.sdk.product
index fdca8bafb..7abef1013 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/rcp.product
+++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp.sdk/rcp.sdk.product
@@ -12,6 +12,8 @@
       <vmArgsMac>-Xdock:icon=../Resources/Eclipse.icns -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
    </launcherArgs>
 
+   <windowImages/>
+
    <launcher name="eclipse">
       <macosx icon="Eclipse.icns"/>
       <solaris/>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp/Eclipse.icns b/eclipse.platform.releng.tychoeclipsebuilder/rcp/Eclipse.icns
new file mode 100644
index 000000000..875e32dde
--- /dev/null
+++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp/Eclipse.icns
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/sdk/Eclipse.icns b/eclipse.platform.releng.tychoeclipsebuilder/sdk/Eclipse.icns
new file mode 100644
index 000000000..875e32dde
--- /dev/null
+++ b/eclipse.platform.releng.tychoeclipsebuilder/sdk/Eclipse.icns