Use JDK annotations downloaded from a KAnnotator build

andy9775 · Feb 21, 2014 · ff762a4 · ff762a4
1 parent 48df541
commit ff762a4
Show file tree

Hide file tree

Showing 180 changed files with 31 additions and 35,784 deletions.
diff --git a/build.xml b/build.xml
@@ -528,9 +528,7 @@
     </target>
 
     <target name="jdkAnnotations">
-        <pack_annotations jarfile="kotlin-jdk-annotations.jar"
-                          annotationsdir="${basedir}/jdk-annotations"
-                          title="${manifest.impl.title.kotlin.compiler.annotations.jdk}"/>
+      <copy file="dependencies/annotations/kotlin-jdk-annotations.jar" todir="${kotlin-home}/lib"/>
     </target>
 
     <target name="androidSdkAnnotations">

diff --git a/compiler/tests/org/jetbrains/jet/CompileCompilerDependenciesTest.java b/compiler/tests/org/jetbrains/jet/CompileCompilerDependenciesTest.java
@@ -17,13 +17,12 @@
 package org.jetbrains.jet;
 
 import org.jetbrains.jet.codegen.forTestCompile.ForTestCompileRuntime;
-import org.jetbrains.jet.codegen.forTestCompile.ForTestPackJdkAnnotations;
 import org.junit.Test;
 
 public class CompileCompilerDependenciesTest {
     @Test
     public void packJdkAnnotations() {
-        ForTestPackJdkAnnotations.jdkAnnotationsForTests();
+        JetTestUtils.getJdkAnnotationsJar();
     }
 
     @Test

diff --git a/compiler/tests/org/jetbrains/jet/JetTestUtils.java b/compiler/tests/org/jetbrains/jet/JetTestUtils.java
@@ -47,7 +47,6 @@
 import org.jetbrains.jet.cli.jvm.compiler.CliLightClassGenerationSupport;
 import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment;
 import org.jetbrains.jet.codegen.forTestCompile.ForTestCompileRuntime;
-import org.jetbrains.jet.codegen.forTestCompile.ForTestPackJdkAnnotations;
 import org.jetbrains.jet.config.CommonConfigurationKeys;
 import org.jetbrains.jet.config.CompilerConfiguration;
 import org.jetbrains.jet.lang.PlatformToKotlinClassMap;
@@ -272,6 +271,15 @@ public static File getAnnotationsJar() {
         return new File(JetTestCaseBuilder.getHomeDirectory(), "compiler/testData/mockJDK/jre/lib/annotations.jar");
     }
 
+    @NotNull
+    public static File getJdkAnnotationsJar() {
+        File jdkAnnotations = new File("dependencies/annotations/kotlin-jdk-annotations.jar");
+        if (!jdkAnnotations.exists()) {
+            throw new RuntimeException("Kotlin JDK annotations jar not found; please run 'ant dist' to build it");
+        }
+        return jdkAnnotations;
+    }
+
     public static void mkdirs(File file) throws IOException {
         if (file.isDirectory()) {
             return;
@@ -370,7 +378,7 @@ public static CompilerConfiguration compilerConfigurationForTests(@NotNull Confi
         configuration.addAll(CLASSPATH_KEY, extraClasspath);
 
         if (configurationKind == ALL || configurationKind == JDK_AND_ANNOTATIONS) {
-            configuration.add(ANNOTATIONS_PATH_KEY, ForTestPackJdkAnnotations.jdkAnnotationsForTests());
+            configuration.add(ANNOTATIONS_PATH_KEY, getJdkAnnotationsJar());
         }
 
         return configuration;

diff --git a/compiler/tests/org/jetbrains/jet/codegen/forTestCompile/ForTestCompileRuntime.java b/compiler/tests/org/jetbrains/jet/codegen/forTestCompile/ForTestCompileRuntime.java
@@ -91,7 +91,7 @@ private static void compileKotlinToJvm(
                 "-noStdlib",
                 "-noJdkAnnotations",
                 "-suppress", "warnings",
-                "-annotations", "./jdk-annotations",
+                "-annotations", JetTestUtils.getJdkAnnotationsJar().getAbsolutePath(),
                 "-classpath", classPath
         );
         if (exitCode != ExitCode.OK) {

diff --git a/compiler/tests/org/jetbrains/jet/codegen/forTestCompile/ForTestPackJdkAnnotations.java b/compiler/tests/org/jetbrains/jet/codegen/forTestCompile/ForTestPackJdkAnnotations.java
diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileEnvironmentTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileEnvironmentTest.java
@@ -19,9 +19,9 @@
 import com.intellij.openapi.util.io.FileUtil;
 import junit.framework.TestCase;
 import org.jetbrains.jet.JetTestCaseBuilder;
+import org.jetbrains.jet.JetTestUtils;
 import org.jetbrains.jet.cli.common.ExitCode;
 import org.jetbrains.jet.cli.jvm.K2JVMCompiler;
-import org.jetbrains.jet.codegen.forTestCompile.ForTestPackJdkAnnotations;
 import org.jetbrains.jet.codegen.forTestCompile.ForTestCompileRuntime;
 import org.jetbrains.jet.lang.resolve.java.PackageClassUtils;
 import org.jetbrains.jet.lang.resolve.name.FqName;
@@ -42,7 +42,7 @@ public void testSmokeWithCompilerJar() throws IOException {
 
         try {
             File stdlib = ForTestCompileRuntime.runtimeJarForTests();
-            File jdkAnnotations = ForTestPackJdkAnnotations.jdkAnnotationsForTests();
+            File jdkAnnotations = JetTestUtils.getJdkAnnotationsJar();
             File resultJar = new File(tempDir, "result.jar");
             ExitCode rv = new K2JVMCompiler().exec(System.out,
                                                    "-module", JetTestCaseBuilder.getTestDataPathBase() + "/compiler/smoke/Smoke.kts",
@@ -78,7 +78,7 @@ public void testSmokeWithCompilerOutput() throws IOException {
         try {
             File out = new File(tempDir, "out");
             File stdlib = ForTestCompileRuntime.runtimeJarForTests();
-            File jdkAnnotations = ForTestPackJdkAnnotations.jdkAnnotationsForTests();
+            File jdkAnnotations = JetTestUtils.getJdkAnnotationsJar();
             ExitCode exitCode = new K2JVMCompiler()
                     .exec(System.out, "-src", JetTestCaseBuilder.getTestDataPathBase() + "/compiler/smoke/Smoke.kt",
                           "-output", out.getAbsolutePath(),

diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/IdeaJdkAnnotationsReflectedTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/IdeaJdkAnnotationsReflectedTest.java
@@ -49,7 +49,7 @@ protected JetCoreEnvironment createEnvironment() {
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        kotlinAnnotationsRoot = VirtualFileManager.getInstance().findFileByUrl("file://jdk-annotations");
+        kotlinAnnotationsRoot = VirtualFileManager.getInstance().findFileByUrl("jar://dependencies/annotations/kotlin-jdk-annotations.jar!/");
         ideaAnnotationsRoot = VirtualFileManager.getInstance().findFileByUrl("jar://ideaSDK/lib/jdkAnnotations.jar!/");
     }
 

diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/JdkAnnotationsValidityTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/JdkAnnotationsValidityTest.java
@@ -101,7 +101,7 @@ protected void tearDown() throws Exception {
     }
 
     public void testNoErrorsInAlternativeSignatures() {
-        List<FqName> affectedClasses = getAffectedClasses("file://jdk-annotations");
+        List<FqName> affectedClasses = getAffectedClasses("jar://dependencies/annotations/kotlin-jdk-annotations.jar!/");
 
         Map<String, List<String>> errors = Maps.newLinkedHashMap();
 

diff --git a/idea/tests/org/jetbrains/jet/plugin/PluginTestCaseBase.java b/idea/tests/org/jetbrains/jet/plugin/PluginTestCaseBase.java
@@ -26,7 +26,7 @@
 import com.intellij.openapi.vfs.VirtualFile;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.JetTestCaseBuilder;
-import org.jetbrains.jet.codegen.forTestCompile.ForTestPackJdkAnnotations;
+import org.jetbrains.jet.JetTestUtils;
 
 import java.io.File;
 
@@ -44,7 +44,7 @@ public static String getTestDataPathBase() {
     private static Sdk getSdk(String sdkHome) {
         Sdk sdk = new JavaSdkImpl().createJdk("JDK", sdkHome, true);
         SdkModificator modificator = sdk.getSdkModificator();
-        VirtualFile file = LocalFileSystem.getInstance().findFileByIoFile(ForTestPackJdkAnnotations.jdkAnnotationsForTests());
+        VirtualFile file = LocalFileSystem.getInstance().findFileByIoFile(JetTestUtils.getJdkAnnotationsJar());
         assert file != null;
         modificator.addRoot(JarFileSystem.getInstance().getJarRootForLocalFile(file), AnnotationOrderRootType.getInstance());
         modificator.commitChanges();

diff --git a/jdk-annotations/java/applet/annotations.xml b/jdk-annotations/java/applet/annotations.xml