Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Niefer2011-05-06 18:38:35 +0000
committerAndrew Niefer2011-05-06 18:38:35 +0000
commit418023e17bfa1078cdce1ebb72a7aab2816739c3 (patch)
tree1d1b31b64567d8cd3346f60691ed8447cfc15e99 /bundles/org.eclipse.equinox.frameworkadmin.equinox
parent0b1f06577c6e0dcd2bc82e68f7dceb3ed68bc72b (diff)
downloadrt.equinox.p2-418023e17bfa1078cdce1ebb72a7aab2816739c3.tar.gz
rt.equinox.p2-418023e17bfa1078cdce1ebb72a7aab2816739c3.tar.xz
rt.equinox.p2-418023e17bfa1078cdce1ebb72a7aab2816739c3.zip
bug 343458 - export on mac
Diffstat (limited to 'bundles/org.eclipse.equinox.frameworkadmin.equinox')
-rw-r--r--bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EclipseLauncherParser.java9
1 files changed, 7 insertions, 2 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 38eb443e4..b714e8e06 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
@@ -27,8 +27,13 @@ public class EclipseLauncherParser {
private static final String CONFIGURATION_FOLDER = "configuration"; //$NON-NLS-1$
//this figures out the location of the data area on partial data read from the <eclipse>.ini
- private URI getOSGiInstallArea(List lines, URI base) {
+ private URI getOSGiInstallArea(List lines, URI base, LauncherData launcherData) {
+ //does the eclipse.ini say anything for osgi.install.area?
File osgiInstallArea = ParserUtils.getOSGiInstallArea(lines, null, base);
+ if (osgiInstallArea == null) {
+ //otherwise use the launcherData to figure it out
+ osgiInstallArea = ParserUtils.getOSGiInstallArea(lines, null, launcherData);
+ }
if (osgiInstallArea != null)
return URIUtil.makeAbsolute(osgiInstallArea.toURI(), base);
return null;
@@ -58,7 +63,7 @@ public class EclipseLauncherParser {
URI launcherFolder = launcherData.getLauncher().getParentFile().toURI();
getStartup(lines, launcherFolder);
getFrameworkJar(lines, launcherFolder, launcherData);
- URI osgiInstallArea = getOSGiInstallArea(lines, launcherFolder);
+ URI osgiInstallArea = getOSGiInstallArea(lines, launcherFolder, launcherData);
if (osgiInstallArea == null) {
osgiInstallArea = launcherData.getFwJar() != null ? ParserUtils.fromOSGiJarToOSGiInstallArea(launcherData.getFwJar().getAbsolutePath()).toURI() : launcherFolder;
}

Back to the top