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

use in-process javac only if source level of module matches with jdk version

Browse Source
This commit is contained in:
nik
2010-07-15 10:27:55 +04:00
parent 55a1dde61a
commit 92d6803a0c
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/src/org/jetbrains/jps/builders/StandardBuilders.groovy
+8 -5
View File
@@ -14,13 +14,15 @@ class JavacBuilder implements ModuleBuilder {
String sourceLevel = module["sourceLevel"]
String targetLevel = module["targetLevel"]
String customArgs = module["javac_args"]
def javacExecutable = getJavacExecutable(module)
if (module.project.builder.useInProcessJavac) {
if (javacExecutable != null) {
module.project.warning("In-process Javac instead of '${javacExecutable}' will be used for '${module.name}'")
String version = System.getProperty("java.version")
if (sourceLevel == null || version.startsWith(sourceLevel)) {
if (Java16ApiCompilerRunner.compile(module, state, sourceLevel, targetLevel, customArgs)) {
return
}
}
if (Java16ApiCompilerRunner.compile(module, state, sourceLevel, targetLevel, customArgs)) {
return
else {
module.project.info("In-process Javac won't be used for '${module.name}', because Java version ($version) doesn't match to source level ($sourceLevel)")
}
}
@@ -33,6 +35,7 @@ class JavacBuilder implements ModuleBuilder {
params.fork = "true"
params.debug = "on"
def javacExecutable = getJavacExecutable(module)
if (javacExecutable != null) {
params.executable = javacExecutable
}