cli works
This commit is contained in:
@@ -3,6 +3,17 @@
|
|||||||
<component name="AntConfiguration">
|
<component name="AntConfiguration">
|
||||||
<defaultAnt bundledAnt="true" />
|
<defaultAnt bundledAnt="true" />
|
||||||
</component>
|
</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">
|
<component name="CompilerConfiguration">
|
||||||
<option name="DEFAULT_COMPILER" value="Javac" />
|
<option name="DEFAULT_COMPILER" value="Javac" />
|
||||||
<resourceExtensions />
|
<resourceExtensions />
|
||||||
|
|||||||
Binary file not shown.
@@ -0,0 +1,3 @@
|
|||||||
|
Manifest-Version: 1.0
|
||||||
|
Main-Class: org.jetbrains.jet.j2k.JavaToKotlinTranslator
|
||||||
|
|
||||||
@@ -50,8 +50,10 @@ public class JavaToKotlinTranslator {
|
|||||||
});
|
});
|
||||||
|
|
||||||
javaCoreEnvironment.addToClasspath(findRtJar(true));
|
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(
|
return PsiFileFactory.getInstance(javaCoreEnvironment.getProject()).createFileFromText(
|
||||||
name, JavaLanguage.INSTANCE, text
|
name, JavaLanguage.INSTANCE, text
|
||||||
);
|
);
|
||||||
@@ -108,6 +110,18 @@ public class JavaToKotlinTranslator {
|
|||||||
return null;
|
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) {
|
public static File findActiveRtJar(boolean failOnError) {
|
||||||
ClassLoader systemClassLoader = ClassLoader.getSystemClassLoader();
|
ClassLoader systemClassLoader = ClassLoader.getSystemClassLoader();
|
||||||
if (systemClassLoader instanceof URLClassLoader) {
|
if (systemClassLoader instanceof URLClassLoader) {
|
||||||
|
|||||||
Reference in New Issue
Block a user