From a02658b1a67bfce95d5099b2c3376112850ed557 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Thu, 5 Jul 2012 17:46:48 +0400 Subject: [PATCH] Removed obsolete -mode CLI parameter. --- build.xml | 4 ---- .../jetbrains/jet/cli/jvm/K2JVMCompilerArguments.java | 11 ----------- .../forTestCompile/ForTestCompileBuiltins.java | 3 +-- .../codegen/forTestCompile/ForTestCompileRuntime.java | 1 - .../jetbrains/jet/plugin/compiler/JetCompiler.java | 3 +-- 5 files changed, 2 insertions(+), 20 deletions(-) diff --git a/build.xml b/build.xml index 790af9bbc87..9c6d25a1d74 100644 --- a/build.xml +++ b/build.xml @@ -415,8 +415,6 @@ - - @@ -448,8 +446,6 @@ - - diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/K2JVMCompilerArguments.java b/compiler/cli/src/org/jetbrains/jet/cli/jvm/K2JVMCompilerArguments.java index 4a711ddaba2..0789f6652c3 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/K2JVMCompilerArguments.java +++ b/compiler/cli/src/org/jetbrains/jet/cli/jvm/K2JVMCompilerArguments.java @@ -74,9 +74,6 @@ public class K2JVMCompilerArguments extends CompilerArguments { @Argument(value = "jdkAnnotations", description = "Path to the kotlin-jdk-annotations.jar") public String jdkAnnotations; - @Argument(value = "mode", description = "Special compiler modes: stubs or jdkHeaders") - public String mode; - @Argument(value = "output", description = "output directory") public String outputDir; @@ -163,14 +160,6 @@ public class K2JVMCompilerArguments extends CompilerArguments { this.stdlib = stdlib; } - public String getMode() { - return mode; - } - - public void setMode(String mode) { - this.mode = mode; - } - @Override public boolean isTags() { return tags; diff --git a/compiler/tests/org/jetbrains/jet/codegen/forTestCompile/ForTestCompileBuiltins.java b/compiler/tests/org/jetbrains/jet/codegen/forTestCompile/ForTestCompileBuiltins.java index 92a4bb7cf67..125ccca7076 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/forTestCompile/ForTestCompileBuiltins.java +++ b/compiler/tests/org/jetbrains/jet/codegen/forTestCompile/ForTestCompileBuiltins.java @@ -39,8 +39,7 @@ public class ForTestCompileBuiltins { @Override protected void doCompile(@NotNull File classesDir) throws Exception { ExitCode exitCode = new K2JVMCompiler().exec( - System.err, "-output", classesDir.getPath(), "-src", "./compiler/frontend/src", "-noStdlib", "-mode", "builtins", - "-builtins"); + System.err, "-output", classesDir.getPath(), "-src", "./compiler/frontend/src", "-noStdlib", "-builtins"); if (exitCode != ExitCode.OK) { throw new IllegalStateException("builtins compilation failed: " + exitCode); } diff --git a/compiler/tests/org/jetbrains/jet/codegen/forTestCompile/ForTestCompileRuntime.java b/compiler/tests/org/jetbrains/jet/codegen/forTestCompile/ForTestCompileRuntime.java index 1192d955ceb..782bebd1763 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/forTestCompile/ForTestCompileRuntime.java +++ b/compiler/tests/org/jetbrains/jet/codegen/forTestCompile/ForTestCompileRuntime.java @@ -62,7 +62,6 @@ public class ForTestCompileRuntime { "-output", destdir.getPath(), "-src", "./libraries/stdlib/src", "-noStdlib", - "-mode", "stdlib", "-classpath", "out/production/runtime"); if (exitCode != ExitCode.OK) { throw new IllegalStateException("stdlib for test compilation failed: " + exitCode); diff --git a/idea/src/org/jetbrains/jet/plugin/compiler/JetCompiler.java b/idea/src/org/jetbrains/jet/plugin/compiler/JetCompiler.java index 313806d3254..a2e35482e99 100644 --- a/idea/src/org/jetbrains/jet/plugin/compiler/JetCompiler.java +++ b/idea/src/org/jetbrains/jet/plugin/compiler/JetCompiler.java @@ -270,8 +270,7 @@ public class JetCompiler implements TranslatingCompiler { "-module", scriptFile.getAbsolutePath(), "-output", path(outputDir), "-tags", "-verbose", "-version", - "-noStdlib", "-noJdkAnnotations", "-noJdk", - "-mode", "idea"}; + "-noStdlib", "-noJdkAnnotations", "-noJdk"}; } private static void runOutOfProcess(final CompileContext compileContext,