mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
Merge branch 'master' of git://github.com/shafirov/JPS
This commit is contained in:
@@ -249,7 +249,7 @@ class ProjectBuilder {
|
||||
|
||||
private def chunkOutput(ModuleChunk chunk) {
|
||||
if (outputs[chunk] == null) {
|
||||
binding.project.warning("Dependency module ${chunk.name} haven't yet been built, now building it");
|
||||
project.info("Dependency module ${chunk.name} haven't yet been built, now building it");
|
||||
makeChunk(chunk)
|
||||
}
|
||||
return outputs[chunk]
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
@@ -46,6 +46,7 @@ class Java16ApiCompiler {
|
||||
options << targetLevel
|
||||
}
|
||||
options << "-g"
|
||||
options << "-nowarn"
|
||||
// options << "-verbose"
|
||||
|
||||
List<File> filesToCompile = []
|
||||
|
||||
Reference in New Issue
Block a user