From ab368c4c90289bba563727abcdb8dd1238193bbb Mon Sep 17 00:00:00 2001 From: Eugene Zhuravlev Date: Sun, 5 Feb 2012 12:26:00 +0100 Subject: [PATCH] correct option filtering --- .../src/org/jetbrains/jps/javac/JavacMain.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 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 d4c60aec5dab..79526c3785b5 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,10 @@ import java.util.*; */ public class JavacMain { private static final Set FILTERED_OPTIONS = new HashSet(Arrays.asList( - "-verbose", "-d", "-classpath", "-cp", "-bootclasspath"/*, "-proc:none"*/ + "-d", "-classpath", "-cp", "-bootclasspath" + )); + private static final Set FILTERED_SINGLE_OPTIONS = new HashSet(Arrays.asList( + "-verbose", "-proc:none" )); public static boolean compile(Collection options, @@ -86,7 +89,9 @@ public class JavacMain { continue; } if (!skip) { - result.add(option); + if (!FILTERED_SINGLE_OPTIONS.contains(option)) { + result.add(option); + } } skip = false; }