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

JS: drop "-kjsm" flag, merge logic with "-meta-info"

Browse Source 
#KT-16049 Fixed
This commit is contained in:
Alexander Udalov
2017-01-26 13:44:55 +03:00
parent 17b0b7704f
commit e5680565b3
18 changed files with 30 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common/org/jetbrains/kotlin/test/MockLibraryUtil.java
+4 -11
View File
@@ -21,7 +21,6 @@ import com.intellij.openapi.util.text.StringUtil;
import com.intellij.util.ArrayUtil;
import com.intellij.util.io.ZipUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.cli.common.ExitCode;
import org.jetbrains.kotlin.cli.js.K2JSCompiler;
import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler;
@@ -135,7 +134,7 @@ public class MockLibraryUtil {
}
@NotNull
public static File compileJsLibraryToJar(
private static File compileJsLibraryToJar(
@NotNull String sourcesPath,
@NotNull String jarName,
boolean addSources
@@ -145,8 +144,7 @@ public class MockLibraryUtil {
File outDir = new File(contentDir, "out");
File outputFile = new File(outDir, jarName + ".js");
File outputMetaFile = new File(outDir, jarName + ".meta.js");
compileKotlin2JS(sourcesPath, outputFile, outputMetaFile, true);
compileKotlin2JS(sourcesPath, outputFile);
return createJarFile(contentDir, outDir, sourcesPath, jarName, addSources);
}
@@ -221,15 +219,10 @@ public class MockLibraryUtil {
runJvmCompiler(args);
}
public static void compileKotlin2JS(@NotNull String sourcesPath, @NotNull File outputFile, @Nullable File metaFile, boolean kjsm) {
private static void compileKotlin2JS(@NotNull String sourcesPath, @NotNull File outputFile) {
List<String> args = new ArrayList<String>();
if (metaFile != null) {
args.add("-meta-info");
}
if (kjsm) {
args.add("-kjsm");
}
args.add("-meta-info");
args.add("-output");
args.add(outputFile.getAbsolutePath());