Removed obsolete -stdlib CLI parameter.

This commit is contained in:
Evgeny Gerashchenko
2012-07-05 17:51:25 +04:00
parent b958886e23
commit a2765899b5
2 changed files with 4 additions and 14 deletions
@@ -66,10 +66,6 @@ public class K2JVMCompilerArguments extends CompilerArguments {
@Argument(value = "builtins", description = "compile builtin classes (internal)") @Argument(value = "builtins", description = "compile builtin classes (internal)")
public boolean builtins; public boolean builtins;
@Deprecated
@Argument(value = "stdlib", description = "Path to the stdlib.jar")
public String stdlib;
@Argument(value = "output", description = "output directory") @Argument(value = "output", description = "output directory")
public String outputDir; public String outputDir;
@@ -148,14 +144,6 @@ public class K2JVMCompilerArguments extends CompilerArguments {
this.src = src; this.src = src;
} }
public String getStdlib() {
return stdlib;
}
public void setStdlib(String stdlib) {
this.stdlib = stdlib;
}
@Override @Override
public boolean isTags() { public boolean isTags() {
return tags; return tags;
@@ -49,7 +49,8 @@ public class CompileEnvironmentTest extends TestCase {
ExitCode rv = new K2JVMCompiler().exec(System.out, ExitCode rv = new K2JVMCompiler().exec(System.out,
"-module", JetParsingTest.getTestDataDir() + "/compiler/smoke/Smoke.kts", "-module", JetParsingTest.getTestDataDir() + "/compiler/smoke/Smoke.kts",
"-jar", resultJar.getAbsolutePath(), "-jar", resultJar.getAbsolutePath(),
"-stdlib", stdlib.getAbsolutePath(), "-noStdlib",
"-classpath", stdlib.getAbsolutePath(),
"-noJdkAnnotations", "-noJdkAnnotations",
"-annotations", jdkAnnotations.getAbsolutePath()); "-annotations", jdkAnnotations.getAbsolutePath());
Assert.assertEquals("compilation completed with non-zero code", ExitCode.OK, rv); Assert.assertEquals("compilation completed with non-zero code", ExitCode.OK, rv);
@@ -83,7 +84,8 @@ public class CompileEnvironmentTest extends TestCase {
ExitCode exitCode = new K2JVMCompiler() ExitCode exitCode = new K2JVMCompiler()
.exec(System.out, "-src", JetParsingTest.getTestDataDir() + "/compiler/smoke/Smoke.kt", .exec(System.out, "-src", JetParsingTest.getTestDataDir() + "/compiler/smoke/Smoke.kt",
"-output", out.getAbsolutePath(), "-output", out.getAbsolutePath(),
"-stdlib", stdlib.getAbsolutePath(), "-noStdlib",
"-classpath", stdlib.getAbsolutePath(),
"-noJdkAnnotations", "-noJdkAnnotations",
"-annotations", jdkAnnotations.getAbsolutePath()); "-annotations", jdkAnnotations.getAbsolutePath());
Assert.assertEquals(ExitCode.OK, exitCode); Assert.assertEquals(ExitCode.OK, exitCode);