From a2765899b51962874517c92f03f587d08accfd4f Mon Sep 17 00:00:00 2001
From: Evgeny Gerashchenko <Evgeny.Gerashchenko@jetbrains.com>
Date: Thu, 5 Jul 2012 17:51:25 +0400
Subject: [PATCH] Removed obsolete -stdlib CLI parameter.

---
 .../jet/cli/jvm/K2JVMCompilerArguments.java          | 12 ------------
 .../jet/jvm/compiler/CompileEnvironmentTest.java     |  6 ++++--
 2 files changed, 4 insertions(+), 14 deletions(-)

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 a549bc4e91d..19b17432a3c 100644
--- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/K2JVMCompilerArguments.java
+++ b/compiler/cli/src/org/jetbrains/jet/cli/jvm/K2JVMCompilerArguments.java
@@ -66,10 +66,6 @@ public class K2JVMCompilerArguments extends CompilerArguments {
     @Argument(value = "builtins", description = "compile builtin classes (internal)")
     public boolean builtins;
 
-    @Deprecated
-    @Argument(value = "stdlib", description = "Path to the stdlib.jar")
-    public String stdlib;
-
     @Argument(value = "output", description = "output directory")
     public String outputDir;
 
@@ -148,14 +144,6 @@ public class K2JVMCompilerArguments extends CompilerArguments {
         this.src = src;
     }
 
-    public String getStdlib() {
-        return stdlib;
-    }
-
-    public void setStdlib(String stdlib) {
-        this.stdlib = stdlib;
-    }
-
     @Override
     public boolean isTags() {
         return tags;
diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileEnvironmentTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileEnvironmentTest.java
index af5f1214c27..d33b780623a 100644
--- a/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileEnvironmentTest.java
+++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileEnvironmentTest.java
@@ -49,7 +49,8 @@ public class CompileEnvironmentTest extends TestCase {
             ExitCode rv = new K2JVMCompiler().exec(System.out,
                                                    "-module", JetParsingTest.getTestDataDir() + "/compiler/smoke/Smoke.kts",
                                                    "-jar", resultJar.getAbsolutePath(),
-                                                   "-stdlib", stdlib.getAbsolutePath(),
+                                                   "-noStdlib",
+                                                   "-classpath", stdlib.getAbsolutePath(),
                                                    "-noJdkAnnotations",
                                                    "-annotations", jdkAnnotations.getAbsolutePath());
             Assert.assertEquals("compilation completed with non-zero code", ExitCode.OK, rv);
@@ -83,7 +84,8 @@ public class CompileEnvironmentTest extends TestCase {
             ExitCode exitCode = new K2JVMCompiler()
                     .exec(System.out, "-src", JetParsingTest.getTestDataDir() + "/compiler/smoke/Smoke.kt",
                           "-output", out.getAbsolutePath(),
-                          "-stdlib", stdlib.getAbsolutePath(),
+                          "-noStdlib",
+                          "-classpath", stdlib.getAbsolutePath(),
                           "-noJdkAnnotations",
                           "-annotations", jdkAnnotations.getAbsolutePath());
             Assert.assertEquals(ExitCode.OK, exitCode);