MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

OOM fixed

Browse Source
This commit is contained in:
Vladimir Orlov
2014-06-11 18:23:47 +04:00
parent 5085b755f2
commit 8f9770e7d5
2 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/conf/mac/Contents/MacOS/idea
BIN
View File
Binary file not shown.
native/MacLauncher/Launcher.m
+17 -3
View File
@@ -226,10 +226,23 @@ NSString *getDefaultPropertiesFilePath() {
return [[[NSBundle mainBundle] bundlePath] stringByAppendingString:@"/bin/idea.properties"];
}
NSString *getDefaultVMOptionsFilePath() {
return [[[NSBundle mainBundle] bundlePath] stringByAppendingString:@"/bin/idea.vmoptions"];
// NSString *getDefaultVMOptionsFilePath() {
// return [[[NSBundle mainBundle] bundlePath] stringByAppendingString:@fileName];
NSString *getDefaultFilePath(NSString *fileName) {
NSString *fullFileName = [[[NSBundle mainBundle] bundlePath] stringByAppendingString:@"/Contents"];
fullFileName = [fullFileName stringByAppendingString:fileName];
NSLog(@"fullFileName is: %@", fullFileName);
if ([[NSFileManager defaultManager] fileExistsAtPath:fullFileName]) {
NSLog(@"fullFileName exists: %@", fullFileName);
} else{
fullFileName = [[[NSBundle mainBundle] bundlePath] stringByAppendingString:fileName];
NSLog(@"fullFileName exists: %@", fullFileName);
}
return fullFileName;
}
NSString *getVMOptionsFilePath() {
return [getPreferencesFolderPath() stringByAppendingString:@"/idea.vmoptions"];
}
@@ -237,7 +250,8 @@ NSString *getVMOptionsFilePath() {
NSArray *parseVMOptions() {
NSArray *inConfig=[VMOptionsReader readFile:getVMOptionsFilePath()];
if (inConfig) return inConfig;
return [VMOptionsReader readFile:getDefaultVMOptionsFilePath()];
//return [VMOptionsReader readFile:getDefaultVMOptionsFilePath()];
return [VMOptionsReader readFile:getDefaultFilePath(@"/bin/idea.vmoptions")];
}
NSDictionary *parseProperties() {