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

Output to the current directory by default ("-output .")

Browse Source
This commit is contained in:
Alexander Udalov
2014-06-23 17:40:22 +04:00
parent ca219f9880
commit 71262bdf14
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CompileEnvironmentUtil.java
+1 -4
View File
@@ -278,11 +278,8 @@ public class CompileEnvironmentUtil {
if (jar != null) { if (jar != null) {
writeToJar(jar, includeRuntime, mainClass, outputFiles); writeToJar(jar, includeRuntime, mainClass, outputFiles);
} }
else if (outputDir != null) {
OutputUtilsPackage.writeAll(outputFiles, outputDir, messageCollector);
}
else { else {
throw new CompileEnvironmentException("Output directory or jar file is not specified - no files will be saved to the disk"); OutputUtilsPackage.writeAll(outputFiles, outputDir == null ? new File(".") : outputDir, messageCollector);
} }
} }
compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/KotlinToJVMBytecodeCompiler.java
+8 -7
View File
@@ -22,6 +22,7 @@ import com.google.common.collect.Maps;
import com.intellij.openapi.Disposable; import com.intellij.openapi.Disposable;
import com.intellij.openapi.util.Disposer; import com.intellij.openapi.util.Disposer;
import com.intellij.psi.PsiFile; import com.intellij.psi.PsiFile;
import com.intellij.util.ArrayUtil;
import kotlin.Function0; import kotlin.Function0;
import kotlin.Function1; import kotlin.Function1;
import kotlin.Unit; import kotlin.Unit;
@@ -91,12 +92,12 @@ public class KotlinToJVMBytecodeCompiler {
} }
private static void writeOutput( private static void writeOutput(
CompilerConfiguration configuration, @NotNull CompilerConfiguration configuration,
ClassFileFactory outputFiles, @NotNull ClassFileFactory outputFiles,
File outputDir, @Nullable File outputDir,
File jarPath, @Nullable File jarPath,
boolean jarRuntime, boolean jarRuntime,
FqName mainClass @Nullable FqName mainClass
) { ) {
MessageCollector messageCollector = configuration.get(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY, MessageCollector.NONE); MessageCollector messageCollector = configuration.get(CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY, MessageCollector.NONE);
CompileEnvironmentUtil.writeOutputToDirOrJar(jarPath, outputDir, jarRuntime, mainClass, outputFiles, messageCollector); CompileEnvironmentUtil.writeOutputToDirOrJar(jarPath, outputDir, jarRuntime, mainClass, outputFiles, messageCollector);
@@ -192,7 +193,7 @@ public class KotlinToJVMBytecodeCompiler {
} }
public static boolean compileBunchOfSources( public static boolean compileBunchOfSources(
JetCoreEnvironment environment, @NotNull JetCoreEnvironment environment,
@Nullable File jar, @Nullable File jar,
@Nullable File outputDir, @Nullable File outputDir,
boolean includeRuntime boolean includeRuntime
@@ -223,7 +224,7 @@ public class KotlinToJVMBytecodeCompiler {
if (scriptClass == null) return; if (scriptClass == null) return;
try { try {
scriptClass.getConstructor(String[].class).newInstance(new Object[]{scriptArgs.toArray(new String[scriptArgs.size()])}); scriptClass.getConstructor(String[].class).newInstance(new Object[] {ArrayUtil.toStringArray(scriptArgs)});
} }
catch (RuntimeException e) { catch (RuntimeException e) {
throw e; throw e;