diff options
| author | Simon Kaegi | 2009-03-05 21:37:10 +0000 |
|---|---|---|
| committer | Simon Kaegi | 2009-03-05 21:37:10 +0000 |
| commit | a1b59ceccda4974f0a3df10ad4228ba22ee91746 (patch) | |
| tree | 77b3e8ba001bd0c4ae2a5e00f8b234b5519a2ac9 /bundles/org.eclipse.equinox.frameworkadmin.equinox/src | |
| parent | 057d4fe69f11271aa6c5a4b3bf5bd6d8a4637a89 (diff) | |
| download | rt.equinox.p2-a1b59ceccda4974f0a3df10ad4228ba22ee91746.tar.gz rt.equinox.p2-a1b59ceccda4974f0a3df10ad4228ba22ee91746.tar.xz rt.equinox.p2-a1b59ceccda4974f0a3df10ad4228ba22ee91746.zip | |
Bug 234930 [fwkAdmin] Frameworkadmin does not create proper paths when doing cross-platform installation
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.java | 10 |
1 files changed, 5 insertions, 5 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 c11d65eb7..cd190247b 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 @@ -45,7 +45,7 @@ public class EclipseLauncherParser { launcherFolder = launcherFolder.getParentFile().getParentFile().getParentFile(); } if (!ParserUtils.fromOSGiJarToOSGiInstallArea(launcherData.getFwJar().getParentFile().getAbsolutePath()).equals(launcherFolder)) { - ParserUtils.setValueForArgument(EquinoxConstants.OPTION_INSTALL, launcherFolder.getAbsolutePath(), lines); + ParserUtils.setValueForArgument(EquinoxConstants.OPTION_INSTALL, launcherFolder.getAbsolutePath().replace('\\', '/'), lines); } } @@ -103,7 +103,7 @@ public class EclipseLauncherParser { return; } URI VMRelativePath = URIUtil.makeRelative(vm.toURI(), launcherFolder); - ParserUtils.setValueForArgument(EquinoxConstants.OPTION_VM, FileUtils.toPath(VMRelativePath), lines); + ParserUtils.setValueForArgument(EquinoxConstants.OPTION_VM, FileUtils.toPath(VMRelativePath).replace('\\', '/'), lines); } private void getJVMArgs(List lines, LauncherData launcherData) { @@ -169,7 +169,7 @@ public class EclipseLauncherParser { try { URI result = URIUtil.makeRelative(FileUtils.fromPath(launcherLibrary), launcherFolder); - ParserUtils.setValueForArgument(EquinoxConstants.OPTION_LAUNCHER_LIBRARY, FileUtils.toPath(result), lines); + ParserUtils.setValueForArgument(EquinoxConstants.OPTION_LAUNCHER_LIBRARY, FileUtils.toPath(result).replace('\\', '/'), lines); } catch (URISyntaxException e) { Log.log(LogService.LOG_ERROR, "can't make absolute of:" + launcherLibrary); return; @@ -207,7 +207,7 @@ public class EclipseLauncherParser { } if (ParserUtils.getValueForArgument(EquinoxConstants.OPTION_CONFIGURATION, lines) == null) { - ParserUtils.setValueForArgument(EquinoxConstants.OPTION_CONFIGURATION, result, lines); + ParserUtils.setValueForArgument(EquinoxConstants.OPTION_CONFIGURATION, result.replace('\\', '/'), lines); } return; } @@ -235,7 +235,7 @@ public class EclipseLauncherParser { try { URI result = URIUtil.makeRelative(FileUtils.fromPath(startup), launcherFolder); - ParserUtils.setValueForArgument(EquinoxConstants.OPTION_STARTUP, FileUtils.toPath(result), lines); + ParserUtils.setValueForArgument(EquinoxConstants.OPTION_STARTUP, FileUtils.toPath(result).replace('\\', '/'), lines); } catch (URISyntaxException e) { Log.log(LogService.LOG_ERROR, "can't make relative of:" + startup); return; |