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-126847 support jdk 1.6+ on osx

Browse Source
This commit is contained in:
Vladimir.Orlov
2014-11-13 17:27:32 +03:00
parent 73e7703db2
commit 004ea34f88
3 changed files with 13 additions and 10 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.

19
native/MacLauncher/Launcher.m
View File

@@ -15,6 +15,7 @@
typedef jint (JNICALL *fun_ptr_t_CreateJavaVM)(JavaVM **pvm, void **env, void *args);
NSBundle *vm;
NSString *const JVMOptions = @"JVMOptions";
NSString *JVMVersion = NULL;
NSString* minRequiredJavaVersion = @"1.6.0_65-b14-466.1";
NSString* osxVersion = @"10.10";
BOOL javaUpdateRequired = false;
@@ -128,12 +129,8 @@ void showWarning(NSString* installedJava){
BOOL isJavaUpdateRequired(NSString *vmVersion, NSString *requiredVersion){
BOOL needUpdate = false;
NSString* currentOSXVersion = getOSXVersion();
//installedJava = vmVersion;
if ([osxVersion compare:currentOSXVersion options:NSNumericSearch] <= 0){
if ([minRequiredJavaVersion compare:vmVersion options:NSNumericSearch] <= 0){
NSLog(@"find Java: %@", vmVersion);
}else{
//NSLog(@" --- Installed Java is not meet the requirements. Please visit http://support.apple.com/kb/DL1572 and update Java.");
if ([minRequiredJavaVersion compare:vmVersion options:NSNumericSearch] > 0){
NSLog(@"find Java: %@", vmVersion);
NSLog(@"required JavaVersion: %@", minRequiredJavaVersion);
needUpdate = true;
@@ -167,13 +164,19 @@ void appendJvmBundlesAt(NSString *path, NSMutableArray *sink) {
NSArray *allVms() {
NSMutableArray *jvmBundlePaths = [NSMutableArray array];
// search java info in user's idea.properties
NSDictionary *inConfig = [PropertyFileReader readFile:getPropertiesFilePath()];
NSString* userJavaVersion = [inConfig objectForKey:@"JVMVersion"];
if (userJavaVersion != nil) JVMVersion = userJavaVersion;
NSString *required = requiredJvmVersion();
NSString *explicit = [[[NSProcessInfo processInfo] environment] objectForKey:@"IDEA_JDK"];
if (explicit != nil) {
// check if IDEA_JDK value corresponds with JVMVersion from Info.plist
NSLog(@"value of IDEA_JDK: %@", explicit);
NSBundle *jdkBundle = [NSBundle bundleWithPath:explicit];
NSString *required = requiredJvmVersion();
if (jdkBundle != nil && required != NULL) {
if (satisfies(jvmVersion(jdkBundle), required)) {
appendBundle(explicit, jvmBundlePaths);
@@ -187,7 +190,7 @@ NSArray *allVms() {
NSString *appDir = [bundle.bundlePath stringByAppendingPathComponent:@"Contents"];
appendJvmBundlesAt([appDir stringByAppendingPathComponent:@"/jre"], jvmBundlePaths);
if (jvmBundlePaths.count > 0) return jvmBundlePaths;
if ((jvmBundlePaths.count > 0) && (satisfies(jvmVersion(jvmBundlePaths[jvmBundlePaths.count-1]), required))) return jvmBundlePaths;
appendJvmBundlesAt([NSHomeDirectory() stringByAppendingPathComponent:@"Library/Java/JavaVirtualMachines"], jvmBundlePaths);
appendJvmBundlesAt(@"/Library/Java/JavaVirtualMachines", jvmBundlePaths);
@@ -204,7 +207,7 @@ NSString *jvmVersion(NSBundle *bundle) {
}
NSString *requiredJvmVersion() {
return [[NSBundle mainBundle].infoDictionary valueForKey:@"JVMVersion" inDictionary: JVMOptions defaultObject:@"1.7*"];
return (JVMVersion != NULL) ? JVMVersion : [[NSBundle mainBundle].infoDictionary valueForKey:@"JVMVersion" inDictionary: JVMOptions defaultObject:@"1.7*"];
}
BOOL satisfies(NSString *vmVersion, NSString *requiredVersion) {

4
native/MacLauncher/MacLauncher.xcodeproj/project.pbxproj
View File

@@ -164,7 +164,7 @@
MACOSX_DEPLOYMENT_TARGET = 10.5;
ONLY_ACTIVE_ARCH = NO;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx10.8;
SDKROOT = macosx10.9;
WRAPPER_EXTENSION = app;
};
name = Release;
@@ -182,7 +182,7 @@
MACOSX_DEPLOYMENT_TARGET = 10.5;
ONLY_ACTIVE_ARCH = NO;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx10.8;
SDKROOT = macosx10.9;
WRAPPER_EXTENSION = app;
};
name = Debug;