Verbose parameter treated correctly

Fixes CompilerSmokeTest broken by previous commit
This commit is contained in:
pTalanov
2012-05-04 18:14:11 +04:00
parent 3e3a22a5c9
commit d327777821
5 changed files with 12 additions and 3 deletions
@@ -108,7 +108,7 @@ public abstract class CLICompiler<A extends CompilerArguments, C extends Compile
final MessageRenderer messageRenderer = getMessageRenderer(arguments);
errStream.print(messageRenderer.renderPreamble());
printVersionIfNeeded(errStream, arguments, messageRenderer);
PrintingMessageCollector messageCollector = new PrintingMessageCollector(errStream, messageRenderer, true);
PrintingMessageCollector messageCollector = new PrintingMessageCollector(errStream, messageRenderer, arguments.isVerbose());
Disposable rootDisposable = CompileEnvironmentUtil.createMockDisposable();
try {
return doExecute(arguments, messageCollector, rootDisposable);
@@ -44,4 +44,5 @@ public abstract class CompilerArguments {
public abstract boolean isHelp();
public abstract boolean isTags();
public abstract boolean isVersion();
public abstract boolean isVerbose();
}
@@ -58,4 +58,9 @@ public class K2JSCompilerArguments extends CompilerArguments {
public boolean isVersion() {
return version;
}
@Override
public boolean isVerbose() {
return verbose;
}
}
@@ -153,6 +153,11 @@ public class K2JVMCompilerArguments extends CompilerArguments {
return version;
}
@Override
public boolean isVerbose() {
return verbose;
}
public void setTags(boolean tags) {
this.tags = tags;
}
@@ -83,9 +83,7 @@ public class KotlinToJVMBytecodeCompiler {
public static boolean compileModules(
K2JVMCompileEnvironmentConfiguration configuration,
@NotNull List<Module> modules,
@NotNull File directory,
@Nullable String jarPath,
@Nullable String outputDir,