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

older projects compatibility: read build process heap size from workspace.xml as a fallback value (IDEA-147362)

Browse Source
This commit is contained in:
Eugene Zhuravlev
2015-11-05 15:46:14 +03:00
parent e3bfaeb257
commit d17dc3f475
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/compiler/impl/src/com/intellij/compiler/CompilerConfigurationImpl.java
+5
View File
@@ -685,6 +685,11 @@ public class CompilerConfigurationImpl extends CompilerConfiguration implements
break;
}
}
if (myState.BUILD_PROCESS_HEAP_SIZE == DEFAULT_BUILD_PROCESS_HEAP_SIZE) {
final CompilerWorkspaceConfiguration workspace = CompilerWorkspaceConfiguration.getInstance(myProject);
// older version compatibility: as a fallback load this setting from workspace
myState.BUILD_PROCESS_HEAP_SIZE = workspace.COMPILER_PROCESS_HEAP_SIZE;
}
}
final Element notNullAssertions = parentNode.getChild(JpsJavaCompilerConfigurationSerializer.ADD_NOTNULL_ASSERTIONS);
java/compiler/openapi/src/com/intellij/compiler/CompilerWorkspaceConfiguration.java
+5
View File
@@ -45,6 +45,11 @@ public class CompilerWorkspaceConfiguration implements PersistentStateComponent<
public boolean CLEAR_OUTPUT_DIRECTORY = true;
public boolean MAKE_PROJECT_ON_SAVE = false; // until we fix problems with several open projects (IDEA-104064), daemon slowness (IDEA-104666)
public boolean PARALLEL_COMPILATION = false;
/**
* @Deprecated. Use corresponding value from CompilerConfiguration
* This field is left here for compatibility with older projects
*/
public int COMPILER_PROCESS_HEAP_SIZE = 700;
public String COMPILER_PROCESS_ADDITIONAL_VM_OPTIONS = "";
public boolean REBUILD_ON_DEPENDENCY_CHANGE = true;