MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-08 15:09:39 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-157767 [mac] IDEA doesn't pick up bundled JRE

Browse Source 
[Temporarily] tought the mac launcher to be able to pickup Contents/jdk if Contents/jre fails.
This commit is contained in:
Anton Tarasov
2016-06-22 16:18:56 +03:00
parent 65e6b524aa
commit bfcb31edd2
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
build/conf/mac/Contents/MacOS/idea
View File

Binary file not shown.

14
native/MacLauncher/Launcher.m
View File

@@ -91,24 +91,28 @@ void showWarning(NSString* messageText){
}
void appendBundle(NSString *path, NSMutableArray *sink) {
BOOL appendBundle(NSString *path, NSMutableArray *sink) {
if ([path hasSuffix:@"jdk"] || [path hasSuffix:@".jre"]) {
NSBundle *bundle = [NSBundle bundleWithPath:path];
if (bundle != nil) {
[sink addObject:bundle];
return true;
}
}
return false;
}
void appendJvmBundlesAt(NSString *path, NSMutableArray *sink) {
BOOL appendJvmBundlesAt(NSString *path, NSMutableArray *sink) {
NSError *error = nil;
NSArray *names = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:path error:&error];
BOOL res = false;
if (names != nil) {
for (NSString *name in names) {
appendBundle([path stringByAppendingPathComponent:name], sink);
res |= appendBundle([path stringByAppendingPathComponent:name], sink);
}
}
return res;
}
NSArray *allVms() {
@@ -130,7 +134,9 @@ NSArray *allVms() {
NSBundle *bundle = [NSBundle mainBundle];
NSString *appDir = [bundle.bundlePath stringByAppendingPathComponent:@"Contents"];
appendJvmBundlesAt([appDir stringByAppendingPathComponent:@"/jre"], jvmBundlePaths);
if (!appendJvmBundlesAt([appDir stringByAppendingPathComponent:@"/jre"], jvmBundlePaths)) {
appendBundle([appDir stringByAppendingPathComponent:@"/jdk"], jvmBundlePaths);
}
if ((jvmBundlePaths.count > 0) && (satisfies(jvmVersion(jvmBundlePaths[jvmBundlePaths.count-1]), required))) return jvmBundlePaths;
appendJvmBundlesAt([NSHomeDirectory() stringByAppendingPathComponent:@"Library/Java/JavaVirtualMachines"], jvmBundlePaths);