From 14eea7bd17de6f7916595bbea8fbd31a6ccbebff Mon Sep 17 00:00:00 2001
From: ignatov <sergey@ignatov.spb.su>
Date: Thu, 29 Dec 2011 13:40:58 +0400
Subject: [PATCH] cli works

---
 j2k.ipr                                       |  11 +++++++++++
 jre/lib/annotations.jar                       | Bin 11632 -> 0 bytes
 src/META-INF/MANIFEST.MF                      |   3 +++
 .../jet/j2k/JavaToKotlinTranslator.java       |  18 ++++++++++++++++--
 4 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 src/META-INF/MANIFEST.MF

diff --git a/j2k.ipr b/j2k.ipr
index f175e7ecb1a..85640093dc3 100644
--- a/j2k.ipr
+++ b/j2k.ipr
@@ -3,6 +3,17 @@
   <component name="AntConfiguration">
     <defaultAnt bundledAnt="true" />
   </component>
+  <component name="ArtifactManager">
+    <artifact type="jar" build-on-make="true" name="j2k:jar">
+      <output-path>$PROJECT_DIR$/out/artifacts/j2k_jar</output-path>
+      <root id="archive" name="j2k.jar">
+        <element id="directory" name="META-INF">
+          <element id="file-copy" path="$PROJECT_DIR$/src/META-INF/MANIFEST.MF" />
+        </element>
+        <element id="module-output" name="j2k" />
+      </root>
+    </artifact>
+  </component>
   <component name="CompilerConfiguration">
     <option name="DEFAULT_COMPILER" value="Javac" />
     <resourceExtensions />
diff --git a/jre/lib/annotations.jar b/jre/lib/annotations.jar
index 5de67805f7b7e97845afa6cd56fd0bef811698cb..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
GIT binary patch
literal 0
HcmV?d00001

literal 11632
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

diff --git a/src/META-INF/MANIFEST.MF b/src/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..558fbaba78d
--- /dev/null
+++ b/src/META-INF/MANIFEST.MF
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Main-Class: org.jetbrains.jet.j2k.JavaToKotlinTranslator
+
diff --git a/src/org/jetbrains/jet/j2k/JavaToKotlinTranslator.java b/src/org/jetbrains/jet/j2k/JavaToKotlinTranslator.java
index 7a7b224f62c..0522750afe0 100644
--- a/src/org/jetbrains/jet/j2k/JavaToKotlinTranslator.java
+++ b/src/org/jetbrains/jet/j2k/JavaToKotlinTranslator.java
@@ -50,8 +50,10 @@ public class JavaToKotlinTranslator {
     });
 
     javaCoreEnvironment.addToClasspath(findRtJar(true));
-    javaCoreEnvironment.addToClasspath(new File("jre/lib/annotations.jar"));
-
+    File annotations = findAnnotations();
+    if (annotations != null && annotations.exists()) {
+      javaCoreEnvironment.addToClasspath(annotations);
+    }
     return PsiFileFactory.getInstance(javaCoreEnvironment.getProject()).createFileFromText(
       name, JavaLanguage.INSTANCE, text
     );
@@ -108,6 +110,18 @@ public class JavaToKotlinTranslator {
     return null;
   }
 
+  @Nullable
+  private static File findAnnotations() {
+    ClassLoader systemClassLoader = ClassLoader.getSystemClassLoader();
+    if (systemClassLoader instanceof URLClassLoader) {
+      URLClassLoader loader = (URLClassLoader) systemClassLoader;
+      for (URL url : loader.getURLs())
+        if ("file".equals(url.getProtocol()) && url.getFile().endsWith("/annotations.jar"))
+          return new File(url.getFile());
+    }
+    return null;
+  }
+
   public static File findActiveRtJar(boolean failOnError) {
     ClassLoader systemClassLoader = ClassLoader.getSystemClassLoader();
     if (systemClassLoader instanceof URLClassLoader) {