Bug 407775 - "org.eclipse.rcp.configuration_root.cocoa.macosx.x86(_64)"

p2 IU does not delete eclipse symlink during uninstall

3 files changed, 4 insertions, 4 deletions

diff --git a/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/EclipseRTOSGiStarterKit.p2.inf b/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/EclipseRTOSGiStarterKit.p2.inf
index b7dc4af2b..015baf8e7 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/EclipseRTOSGiStarterKit.p2.inf
+++ b/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/EclipseRTOSGiStarterKit.p2.inf
@@ -22,4 +22,4 @@ units.1.touchpoint.id=org.eclipse.equinox.p2.osgi
 units.1.touchpoint.version=1.0.0
 units.1.instructions.configure=ln(linkTarget:rt.app/Contents/MacOS/rt,targetDir:${installFolder},linkName:rt);
 # remove link, from bug 407775
-units.1.instructions.unconfigure=remove(targetDir:${installFolder},linkName:rt);
+units.1.instructions.unconfigure=remove(path:${installFolder}/rt);
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 184b176b0..295e32520 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.sdk.p2.inf
+++ b/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.sdk.p2.inf
@@ -25,7 +25,7 @@ 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.unconfigure=setProgramProperty(propName:osgi.instance.area.default,propValue:);
+units.1.instructions.unconfigure=setProgramProperty(propName:osgi.instance.area.default,propValue:);remove(path:${installFolder}/eclipse);
 
 units.2.id=toolingorg.eclipse.configuration
 units.2.version=1.0.0
@@ -36,7 +36,7 @@ units.2.filter=(!(osgi.os=macosx))
 units.2.touchpoint.id=org.eclipse.equinox.p2.osgi
 units.2.touchpoint.version=1.0.0
 units.2.instructions.configure=setProgramProperty(propName:osgi.instance.area.default,propValue:@user.home/workspace);
-units.2.instructions.unconfigure=setProgramProperty(propName:osgi.instance.area.default,propValue:);remove(targetDir:${installFolder},linkName:eclipse);
+units.2.instructions.unconfigure=setProgramProperty(propName:osgi.instance.area.default,propValue:);
 
 # Restrict range so we are not an automatic update for 3.x.
 update.id = org.eclipse.platform.sdk
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.p2.inf b/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.p2.inf
index b3d1bf5b0..db484361d 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.p2.inf
+++ b/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.p2.inf
@@ -36,7 +36,7 @@ units.2.filter=(!(osgi.os=macosx))
 units.2.touchpoint.id=org.eclipse.equinox.p2.osgi
 units.2.touchpoint.version=1.0.0
 units.2.instructions.configure=setProgramProperty(propName:osgi.instance.area.default,propValue:@user.home/workspace);
-units.2.instructions.unconfigure=setProgramProperty(propName:osgi.instance.area.default,propValue:);remove(targetDir:${installFolder},linkName:eclipse);
+units.2.instructions.unconfigure=setProgramProperty(propName:osgi.instance.area.default,propValue:);remove(path:${installFolder}/eclipse);
 
 requires.3.namespace=org.eclipse.equinox.p2.iu
 requires.3.name=toolingorg.eclipse.platform.configuration.gtk.linux.x86_64