From b958886e23ec56819de063cb29db67854a80445c Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Thu, 5 Jul 2012 17:50:16 +0400 Subject: [PATCH] Removed obsolete -jdkAnnotations CLI parameter. --- .../jetbrains/jet/cli/jvm/K2JVMCompilerArguments.java | 4 ---- .../jet/jvm/compiler/CompileEnvironmentTest.java | 10 +++++++--- 2 files changed, 7 insertions(+), 7 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 0789f6652c3..a549bc4e91d 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/K2JVMCompilerArguments.java +++ b/compiler/cli/src/org/jetbrains/jet/cli/jvm/K2JVMCompilerArguments.java @@ -70,10 +70,6 @@ public class K2JVMCompilerArguments extends CompilerArguments { @Argument(value = "stdlib", description = "Path to the stdlib.jar") public String stdlib; - @Deprecated - @Argument(value = "jdkAnnotations", description = "Path to the kotlin-jdk-annotations.jar") - public String jdkAnnotations; - @Argument(value = "output", description = "output directory") public String outputDir; diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileEnvironmentTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileEnvironmentTest.java index c4cf024f8a0..af5f1214c27 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileEnvironmentTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileEnvironmentTest.java @@ -50,7 +50,8 @@ public class CompileEnvironmentTest extends TestCase { "-module", JetParsingTest.getTestDataDir() + "/compiler/smoke/Smoke.kts", "-jar", resultJar.getAbsolutePath(), "-stdlib", stdlib.getAbsolutePath(), - "-jdkAnnotations", jdkAnnotations.getAbsolutePath()); + "-noJdkAnnotations", + "-annotations", jdkAnnotations.getAbsolutePath()); Assert.assertEquals("compilation completed with non-zero code", ExitCode.OK, rv); FileInputStream fileInputStream = new FileInputStream(resultJar); try { @@ -80,8 +81,11 @@ public class CompileEnvironmentTest extends TestCase { File stdlib = ForTestCompileRuntime.runtimeJarForTests(); File jdkAnnotations = ForTestPackJdkAnnotations.jdkAnnotationsForTests(); ExitCode exitCode = new K2JVMCompiler() - .exec(System.out, "-src", JetParsingTest.getTestDataDir() + "/compiler/smoke/Smoke.kt", "-output", - out.getAbsolutePath(), "-stdlib", stdlib.getAbsolutePath(), "-jdkAnnotations", jdkAnnotations.getAbsolutePath()); + .exec(System.out, "-src", JetParsingTest.getTestDataDir() + "/compiler/smoke/Smoke.kt", + "-output", out.getAbsolutePath(), + "-stdlib", stdlib.getAbsolutePath(), + "-noJdkAnnotations", + "-annotations", jdkAnnotations.getAbsolutePath()); Assert.assertEquals(ExitCode.OK, exitCode); assertEquals(1, out.listFiles().length); assertEquals(1, out.listFiles()[0].listFiles().length);