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

even more compiler logging

Browse Source
This commit is contained in:
Eugene Zhuravlev
2011-02-14 17:59:46 +01:00
parent 4b0502ec88
commit 366a97ca98
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/BackendCompilerWrapper.java
+9 -2
View File
@@ -21,11 +21,11 @@
*/
package com.intellij.compiler.impl.javaCompiler;
import com.intellij.codeInsight.AnnotationUtil;
import com.intellij.codeInsight.NullableNotNullManager;
import com.intellij.compiler.*;
import com.intellij.compiler.classParsing.AnnotationConstantValue;
import com.intellij.compiler.classParsing.MethodInfo;
import com.intellij.compiler.impl.CompileDriver;
import com.intellij.compiler.impl.CompilerUtil;
import com.intellij.compiler.make.Cache;
import com.intellij.compiler.make.CacheCorruptedException;
@@ -348,7 +348,7 @@ public class BackendCompilerWrapper {
int exitValue = 0;
try {
Process process = myCompiler.launchProcess(chunk, outputDir, myCompileContext);
final Process process = myCompiler.launchProcess(chunk, outputDir, myCompileContext);
final long compilationStart = System.currentTimeMillis();
final ClassParsingThread classParsingThread = new ClassParsingThread(isJdk6(chunk.getJdk()), outputDir);
final Future<?> classParsingThreadFuture = ApplicationManager.getApplication().executeOnPooledThread(classParsingThread);
@@ -377,10 +377,17 @@ public class BackendCompilerWrapper {
exitValue = process.waitFor();
}
catch (InterruptedException e) {
if (CompileDriver.ourDebugMode) {
System.out.println("Compiler interrupted; ");
e.printStackTrace();
}
process.destroy();
exitValue = process.exitValue();
}
finally {
if (CompileDriver.ourDebugMode) {
System.out.println("Compiler exit code is " + exitValue);
}
if (errorParsingThread != null) {
errorParsingThread.setProcessTerminated(true);
}
java/java-runtime/src/com/intellij/rt/compiler/JavacRunner.java
+7 -1
View File
@@ -67,7 +67,13 @@ public class JavacRunner {
System.arraycopy(args, 2, newArgs, 0, newArgs.length);
}
expandClasspath(newArgs);
mainMethod.invoke(null, new Object[] {newArgs});
try {
mainMethod.invoke(null, new Object[] {newArgs});
}
catch (Throwable e) {
System.err.print(e.getMessage());
e.printStackTrace(System.err);
}
}
private static void addFilesToCompile(Vector arguments, String path) throws IOException {