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

compiler options: set language level for module chunk

Browse Source
This commit is contained in:
Eugene Zhuravlev
2012-02-14 10:43:19 +01:00
parent 3fbf03363e
commit 83e89182f3
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-builders/src/org/jetbrains/jps/incremental/java/JavaBuilder.java
+11 -6
View File
@@ -300,6 +300,9 @@ public class JavaBuilder extends ModuleLevelBuilder {
diagnosticSink.report(new PlainMessageDiagnostic(Diagnostic.Kind.ERROR, "Compilation failed: internal java compiler error"));
}
if (diagnosticSink.getErrorCount() > 0) {
if (!compiledOk) {
diagnosticSink.report(new PlainMessageDiagnostic(Diagnostic.Kind.ERROR, "Errors occurred while compiling module '" + chunkName + "'"));
}
throw new ProjectBuildException(
"Compilation failed: errors: " + diagnosticSink.getErrorCount() + "; warnings: " + diagnosticSink.getWarningCount()
);
@@ -518,12 +521,14 @@ public class JavaBuilder extends ModuleLevelBuilder {
loadJavacOptions(context);
cached = JAVAC_OPTIONS.get(context);
}
return cached;
//final List<String> options = new ArrayList<String>(cached);
//final Module module = chunk.getModules().iterator().next();
//final String langlevel = module.getLanguageLevel();
//final Sdk sdk = module.getSdk();
//return options;
final List<String> options = new ArrayList<String>(cached);
final Module module = chunk.getModules().iterator().next();
final String langlevel = module.getLanguageLevel();
if (!StringUtil.isEmpty(langlevel)) {
options.add("-source");
options.add(langlevel);
}
return options;
}
private static void loadJavacOptions(CompileContext context) {
jps/jps-builders/src/org/jetbrains/jps/javac/JavacMain.java
+4
View File
@@ -73,9 +73,13 @@ public class JavacMain {
task.setProcessors(Collections.singleton(analyzer));
return task.call();
}
catch(IllegalArgumentException e) {
outConsumer.report(new PlainMessageDiagnostic(Diagnostic.Kind.ERROR, e.getMessage()));
}
finally {
fileManager.close();
}
return false;
}
private static boolean shouldSuppressAnnotationProcessing(final Collection<String> options) {