diff options
| author | Christian Georgi | 2015-06-09 20:41:56 +0000 |
|---|---|---|
| committer | Christian Georgi | 2016-03-12 08:34:39 +0000 |
| commit | 8212782d77fdb4398b407273fcefb694605793a1 (patch) | |
| tree | 13c0238e9b941f6ab24fa959e560d7b8d9fc3f66 /features/org.eclipse.equinox.executable.feature | |
| parent | d7822f4d8b2782d566ded8a8d199fc91b3b8bd06 (diff) | |
| download | rt.equinox.framework-8212782d77fdb4398b407273fcefb694605793a1.tar.gz rt.equinox.framework-8212782d77fdb4398b407273fcefb694605793a1.tar.xz rt.equinox.framework-8212782d77fdb4398b407273fcefb694605793a1.zip | |
Bug 469766 - Support embedded JREs on MacOS
Instead of assuming Oracle's JDK layout (Contents/Home/jre/bin), support
pure JREs (Contents/Home/bin) as well. This is in line with the other
platforms that assume the bin/ dir only, i.e. work with both JDK and JRE
layouts.
Bug 469766
Change-Id: I2be6bd9a28f06297ec2b89ff03dac75bd81fbae2
Signed-off-by: Christian Georgi <christian.georgi@sap.com>
Diffstat (limited to 'features/org.eclipse.equinox.executable.feature')
| -rw-r--r-- | features/org.eclipse.equinox.executable.feature/library/cocoa/eclipseCocoa.c | 2 |
1 files changed, 1 insertions, 1 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 8d0fbf346..6bfa9def6 100644 --- a/features/org.eclipse.equinox.executable.feature/library/cocoa/eclipseCocoa.c +++ b/features/org.eclipse.equinox.executable.feature/library/cocoa/eclipseCocoa.c @@ -43,7 +43,7 @@ char *findCommand(char *command); /* Global Variables */ char* defaultVM = "java"; char* vmLibrary = "JavaVM"; -char* shippedVMDir = "../../jre/Contents/Home/jre/bin/"; // relative to launcher +char* shippedVMDir = "../../jre/Contents/Home/bin/"; // relative to launcher int isSunMaxPermSizeVM = 0; static void adjustLibraryPath(char * vmLibrary); |