Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Georgi2015-06-09 16:04:37 +0000
committerArun Thondapu2016-03-11 14:52:08 +0000
commitd7822f4d8b2782d566ded8a8d199fc91b3b8bd06 (patch)
tree602864e67814e5dca17a921bacdcf97108b20e75 /features/org.eclipse.equinox.executable.feature/library/cocoa/eclipseCocoa.c
parent7c392ec6b3cbb83cde43785afbb39f175f00db81 (diff)
downloadrt.equinox.framework-d7822f4d8b2782d566ded8a8d199fc91b3b8bd06.tar.gz
rt.equinox.framework-d7822f4d8b2782d566ded8a8d199fc91b3b8bd06.tar.xz
rt.equinox.framework-d7822f4d8b2782d566ded8a8d199fc91b3b8bd06.zip
Bug 469766 - Launcher-relative VM path to honor changed file layout
In the new Eclipse file layout on MacOS the launcher is now 2 levels below the app root dir (Eclipse.app/Contents/MacOS), while it was 3 levels before (eclipse/Eclipse.app/Contents/MacOS). This fix adjusts the relative path the launcher uses to find an embedded JVM in case no -vm launcher argument is given. Bug: 469766 Change-Id: I88f56fb03eaf99233504002b26d999d2dd5b1a15 Signed-off-by: Christian Georgi <christian.georgi@sap.com>
Diffstat (limited to 'features/org.eclipse.equinox.executable.feature/library/cocoa/eclipseCocoa.c')
-rw-r--r--features/org.eclipse.equinox.executable.feature/library/cocoa/eclipseCocoa.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/features/org.eclipse.equinox.executable.feature/library/cocoa/eclipseCocoa.c b/features/org.eclipse.equinox.executable.feature/library/cocoa/eclipseCocoa.c
index 1090d550e..8d0fbf346 100644
--- a/features/org.eclipse.equinox.executable.feature/library/cocoa/eclipseCocoa.c
+++ b/features/org.eclipse.equinox.executable.feature/library/cocoa/eclipseCocoa.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2015 IBM Corporation and others.
+ * Copyright (c) 2000, 2016 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -11,6 +11,7 @@
* David Green - OpenJDK bsd port integration
* Rapicorp, Inc - Default the configuration to Application Support (bug 461725)
* Mikael Barbero - Rename *Carbon* files to *Cocoa* (bug 383545)
+ * Christian Georgi (SAP SE) - Fix VM path for new file layout (bug 469766)
*/
/* MacOS X Cocoa specific logic for displaying the splash screen. */
@@ -42,7 +43,7 @@ char *findCommand(char *command);
/* Global Variables */
char* defaultVM = "java";
char* vmLibrary = "JavaVM";
-char* shippedVMDir = "../../../jre/Contents/Home/jre/bin/";
+char* shippedVMDir = "../../jre/Contents/Home/jre/bin/"; // relative to launcher
int isSunMaxPermSizeVM = 0;
static void adjustLibraryPath(char * vmLibrary);

Back to the top