azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Providing the same command line for in-process and out-of-process compilation

Browse Source
This commit is contained in:
Andrey Breslav
2012-04-25 11:52:30 +04:00
parent fe9f8a0312
commit 890e9f5c43
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/compiler/JetCompiler.java
+9 -5
View File
@@ -274,7 +274,7 @@ public class JetCompiler implements TranslatingCompiler {
Class<?> kompiler = Class.forName(compilerClassName, true, loader); Class<?> kompiler = Class.forName(compilerClassName, true, loader);
Method exec = kompiler.getDeclaredMethod("exec", PrintStream.class, String[].class); Method exec = kompiler.getDeclaredMethod("exec", PrintStream.class, String[].class);
String[] arguments = { "-module", scriptFile.getAbsolutePath(), "-output", path(outputDir), "-tags", "-verbose", "-version", "-mode", "stdlib" }; String[] arguments = commandLineArguments(outputDir, scriptFile);
context.addMessage(INFORMATION, "Using kotlinHome=" + kotlinHome, "", -1, -1); context.addMessage(INFORMATION, "Using kotlinHome=" + kotlinHome, "", -1, -1);
context.addMessage(INFORMATION, "Invoking in-process compiler " + compilerClassName + " with arguments " + Arrays.asList(arguments), "", -1, -1); context.addMessage(INFORMATION, "Invoking in-process compiler " + compilerClassName + " with arguments " + Arrays.asList(arguments), "", -1, -1);
@@ -294,6 +294,10 @@ public class JetCompiler implements TranslatingCompiler {
} }
} }
private static String[] commandLineArguments(VirtualFile outputDir, File scriptFile) {
return new String[]{ "-module", scriptFile.getAbsolutePath(), "-output", path(outputDir), "-tags", "-verbose", "-version", "-mode", "stdlib" };
}
private static SoftReference<URLClassLoader> ourClassLoaderRef = new SoftReference<URLClassLoader>(null); private static SoftReference<URLClassLoader> ourClassLoaderRef = new SoftReference<URLClassLoader>(null);
private static URLClassLoader getOrCreateClassLoader(File kotlinHome, CompileContext context) { private static URLClassLoader getOrCreateClassLoader(File kotlinHome, CompileContext context) {
@@ -323,10 +327,10 @@ public class JetCompiler implements TranslatingCompiler {
final SimpleJavaParameters params = new SimpleJavaParameters(); final SimpleJavaParameters params = new SimpleJavaParameters();
params.setJdk(new SimpleJavaSdkType().createJdk("tmp", SystemProperties.getJavaHome())); params.setJdk(new SimpleJavaSdkType().createJdk("tmp", SystemProperties.getJavaHome()));
params.setMainClass("org.jetbrains.jet.cli.KotlinCompiler"); params.setMainClass("org.jetbrains.jet.cli.KotlinCompiler");
params.getProgramParametersList().add("-module", scriptFile.getAbsolutePath());
params.getProgramParametersList().add("-output", path(outputDir)); for (String arg : commandLineArguments(outputDir, scriptFile)) {
params.getProgramParametersList().add("-tags"); params.getProgramParametersList().add(arg);
params.getProgramParametersList().add("-verbose"); }
for (File jar : kompilerClasspath(kotlinHome, compileContext)) { for (File jar : kompilerClasspath(kotlinHome, compileContext)) {
params.getClassPath().add(jar); params.getClassPath().add(jar);