Bug 457071 - Inconsistencies in org.eclipes.rcp.configuration for Mac OS

X platform

6 files changed, 20 insertions, 7 deletions

diff --git a/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.sdk.p2.inf b/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.sdk.p2.inf
index 992db792d..89b5192d3 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.sdk.p2.inf
+++ b/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.sdk.p2.inf
@@ -24,7 +24,7 @@ units.1.provides.1.version=1.0.0
 units.1.filter=(osgi.os=macosx)
 units.1.touchpoint.id=org.eclipse.equinox.p2.osgi
 units.1.touchpoint.version=1.0.0
-units.1.instructions.configure=setProgramProperty(propName:osgi.instance.area.default,propValue:@user.home/Documents/workspace);
+units.1.instructions.configure=setProgramProperty(propName:osgi.instance.area.default,propValue:@user.home/Documents/workspace);ln(linkTarget:Eclipse.app/Contents/MacOS/eclipse,targetDir:${installFolder},linkName:eclipse,force:true);
 units.1.instructions.unconfigure=setProgramProperty(propName:osgi.instance.area.default,propValue:);org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/eclipse);
 
 units.2.id=toolingorg.eclipse.configuration
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.sdk.product b/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.sdk.product
index 7a5312bff..1f51af37c 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.sdk.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.5.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.5.0.qualifier" useFeatures="true" includeLaunchers="true">
 
    <configIni use="default">
    </configIni>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.p2.inf b/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.p2.inf
index b15dd318f..99978ba49 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.p2.inf
+++ b/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.p2.inf
@@ -24,7 +24,7 @@ units.1.provides.1.version=1.0.0
 units.1.filter=(osgi.os=macosx)
 units.1.touchpoint.id=org.eclipse.equinox.p2.osgi
 units.1.touchpoint.version=1.0.0
-units.1.instructions.configure=setProgramProperty(propName:osgi.instance.area.default,propValue:@user.home/Documents/workspace);
+units.1.instructions.configure=setProgramProperty(propName:osgi.instance.area.default,propValue:@user.home/Documents/workspace);ln(linkTarget:Eclipse.app/Contents/MacOS/eclipse,targetDir:${installFolder},linkName:eclipse,force:true);
 units.1.instructions.unconfigure=setProgramProperty(propName:osgi.instance.area.default,propValue:);org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/eclipse);
 
 units.2.id=toolingorg.eclipse.platform.configuration
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
index 113b20fc9..d6c4f4e6c 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
+++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
@@ -15,9 +15,17 @@ root.win32.win32.x86.permissions.755=eclipse.exe
 root.win32.win32.x86_64=../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/win32/win32/x86_64
 root.win32.win32.x86_64.permissions.755=eclipse.exe
 
-# Using "macosx" here results in "application requires Java 6" (see bug 445026)
-#root.macosx.cocoa.x86_64=../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/cocoa/macosx/x86_64
-#root.macosx.cocoa.x86_64.permissions.755=Eclipse.app/Contents/MacOS/eclipse
+# 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
+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.permissions.755=Eclipse.app/Contents/MacOS/eclipse
+root.macosx.cocoa.x86.link=Eclipse.app/Contents/MacOS/eclipse,eclipse
 
 # from org.eclipse.equinox.core.feature
 #root.win32.win32.x86=file:executables/win32.win32.x86/eclipsec.exe
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp.deltapack/build.xml b/eclipse.platform.releng.tychoeclipsebuilder/rcp.deltapack/build.xml
index 6653298e3..efc910387 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/rcp.deltapack/build.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp.deltapack/build.xml
@@ -71,6 +71,11 @@
       <iu
         id="org.eclipse.jdt.source.feature.group"
         version="" />
+      <!-- Why isn't rcp.config used here, instead of 'executable' directly?
+      <iu
+        id="org.eclipse.rcp.configuration.feature.group"
+        version="" />
+      -->
       <iu
         id="org.eclipse.equinox.executable"
         version="" />
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.p2.inf b/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.p2.inf
index 534552866..957a3e2ba 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.p2.inf
+++ b/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.p2.inf
@@ -30,7 +30,7 @@ units.1.provides.1.version=1.0.0
 units.1.filter=(osgi.os=macosx)
 units.1.touchpoint.id=org.eclipse.equinox.p2.osgi
 units.1.touchpoint.version=1.0.0
-units.1.instructions.configure=setProgramProperty(propName:osgi.instance.area.default,propValue:@user.home/Documents/workspace);
+units.1.instructions.configure=setProgramProperty(propName:osgi.instance.area.default,propValue:@user.home/Documents/workspace);ln(linkTarget:Eclipse.app/Contents/MacOS/eclipse,targetDir:${installFolder},linkName:eclipse,force:true);
 units.1.instructions.unconfigure=setProgramProperty(propName:osgi.instance.area.default,propValue:);org.eclipse.equinox.p2.touchpoint.natives.remove(path:${installFolder}/eclipse);
 
 units.2.id=toolingorg.eclipse.sdk.configuration