Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rapicault2008-03-13 17:17:56 -0400
committerPascal Rapicault2008-03-13 17:17:56 -0400
commite8ba85e6e7121bf05acf69297d9aaf33d080cec4 (patch)
treedc7dd92d57c1ef84da0aba235f29817e173314fa /bundles/org.eclipse.equinox.frameworkadmin.equinox/src
parent53b79311d527f77e3b2045273d4199d80df3d17e (diff)
downloadrt.equinox.p2-e8ba85e6e7121bf05acf69297d9aaf33d080cec4.tar.gz
rt.equinox.p2-e8ba85e6e7121bf05acf69297d9aaf33d080cec4.tar.xz
rt.equinox.p2-e8ba85e6e7121bf05acf69297d9aaf33d080cec4.zip
Bug 221706 - path to configuration needs to be specified when install is not colocatedv20080313-1723
Diffstat (limited to 'bundles/org.eclipse.equinox.frameworkadmin.equinox/src')
-rw-r--r--bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EclipseLauncherParser.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EclipseLauncherParser.java b/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EclipseLauncherParser.java
index 8d9875c0e..85f005796 100644
--- a/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EclipseLauncherParser.java
+++ b/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EclipseLauncherParser.java
@@ -229,9 +229,10 @@ public class EclipseLauncherParser {
return null;
}
+ //Return the base against which the path needs to be resolved, if resolution is needed.
private String needsPathResolution(String entry, String osgiInstallArea, String launcherFolder) {
if (EquinoxConstants.OPTION_CONFIGURATION.equalsIgnoreCase(entry))
- return launcherFolder;
+ return osgiInstallArea;
if ("--launcher.library".equalsIgnoreCase(entry))
return launcherFolder;
if (EquinoxConstants.OPTION_STARTUP.equalsIgnoreCase(entry))
@@ -270,10 +271,9 @@ public class EclipseLauncherParser {
lines[i] = EquinoxManipulatorImpl.makeRelative(lines[i], resolveNextLine);
resolveNextLine = null;
} else {
- resolveNextLine = needsPathResolution(lines[i], osgiInstallArea, launcherData.getLauncher().getParentFile().getAbsolutePath() + File.separator);
//We don't write -configuration when it is the default value
- if (resolveNextLine != null && EquinoxConstants.OPTION_CONFIGURATION.equalsIgnoreCase(lines[i])) {
- if ("configuration".equals(EquinoxManipulatorImpl.makeRelative(lines[i + 1], resolveNextLine))) { //$NON-NLS-1$
+ if (EquinoxConstants.OPTION_CONFIGURATION.equalsIgnoreCase(lines[i])) {
+ if (new Path(lines[i + 1]).removeLastSegments(1).equals(new Path(osgiInstallArea))) {
i++;
resolveNextLine = null;
continue;

Back to the top