Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Williams2015-01-20 09:04:28 +0000
committerDavid Williams2015-01-20 09:04:28 +0000
commitcb5d314a8c4440838612ad0c601575903346ddb7 (patch)
tree6796e87157101be4963a1c29132040732c487407
parent9d1f3ecbbd18434be59901dddde7237205d4c362 (diff)
downloadeclipse.platform.releng.aggregator-cb5d314a8c4440838612ad0c601575903346ddb7.tar.gz
eclipse.platform.releng.aggregator-cb5d314a8c4440838612ad0c601575903346ddb7.tar.xz
eclipse.platform.releng.aggregator-cb5d314a8c4440838612ad0c601575903346ddb7.zip
Revert "Bug 407775 - "org.eclipse.rcp.configuration_root.cocoa.macosx.x86(_64)""
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/EclipseRTOSGiStarterKit.p2.inf2
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.sdk.p2.inf4
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/platform/platform.p2.inf2
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 015baf8e7..b7dc4af2b 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(path:${installFolder}/rt);
+units.1.instructions.unconfigure=remove(targetDir:${installFolder},linkName: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 295e32520..184b176b0 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:);remove(path:${installFolder}/eclipse);
+units.1.instructions.unconfigure=setProgramProperty(propName:osgi.instance.area.default,propValue:);
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:);
+units.2.instructions.unconfigure=setProgramProperty(propName:osgi.instance.area.default,propValue:);remove(targetDir:${installFolder},linkName:eclipse);
# 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 db484361d..b3d1bf5b0 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(path:${installFolder}/eclipse);
+units.2.instructions.unconfigure=setProgramProperty(propName:osgi.instance.area.default,propValue:);remove(targetDir:${installFolder},linkName:eclipse);
requires.3.namespace=org.eclipse.equinox.p2.iu
requires.3.name=toolingorg.eclipse.platform.configuration.gtk.linux.x86_64

Back to the top