From 70a134325b2ffd2f2999dbf0e4997279f1eff3c0 Mon Sep 17 00:00:00 2001 From: Eugene Zhuravlev Date: Wed, 4 Jul 2012 17:27:31 +0200 Subject: [PATCH] use javac's optimized file manager for javac only --- jps/jps-builders/src/org/jetbrains/jps/javac/JavacMain.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/jps/jps-builders/src/org/jetbrains/jps/javac/JavacMain.java b/jps/jps-builders/src/org/jetbrains/jps/javac/JavacMain.java index c2a82ab975cc..1491d8e1a6bc 100644 --- a/jps/jps-builders/src/org/jetbrains/jps/javac/JavacMain.java +++ b/jps/jps-builders/src/org/jetbrains/jps/javac/JavacMain.java @@ -16,7 +16,7 @@ import java.util.*; */ public class JavacMain { private static final boolean IS_VM_6_VERSION = System.getProperty("java.version", "1.6").contains("1.6"); - private static final boolean ECLIPSE_COMPILER_SINGLE_THREADED_MODE = Boolean.parseBoolean(System.getProperty("jdt.compiler.useSingleThread", "false")); + //private static final boolean ECLIPSE_COMPILER_SINGLE_THREADED_MODE = Boolean.parseBoolean(System.getProperty("jdt.compiler.useSingleThread", "false")); private static final Set FILTERED_OPTIONS = new HashSet(Arrays.asList( "-d", "-classpath", "-cp", "-bootclasspath" )); @@ -59,8 +59,7 @@ public class JavacMain { for (File outputDir : outputDirToRoots.keySet()) { outputDir.mkdirs(); } - final boolean canUseOptimizedmanager = nowUsingJavac || ECLIPSE_COMPILER_SINGLE_THREADED_MODE; - final JavacFileManager fileManager = new JavacFileManager(new ContextImpl(compiler, outConsumer, outputSink, canceledStatus, canUseOptimizedmanager)); + final JavacFileManager fileManager = new JavacFileManager(new ContextImpl(compiler, outConsumer, outputSink, canceledStatus, nowUsingJavac)); fileManager.handleOption("-bootclasspath", Collections.singleton("").iterator()); // this will clear cached stuff fileManager.handleOption("-extdirs", Collections.singleton("").iterator()); // this will clear cached stuff