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

[JS] Removing usage of legacy JS compiler #1

Browse Source
This commit is contained in:
Ilya Goncharov
2023-11-28 13:44:37 +00:00
committed by Space Team
parent 662bff7351
commit 093f51c89a
7 changed files with 15 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-compiler-utils/tests/org/jetbrains/kotlin/test/MockLibraryUtil.kt
-15
View File
@@ -145,17 +145,6 @@ object MockLibraryUtil {
return createJarFile(contentDir, classesDir, jarName, sourcesPath.takeIf { addSources })
}
@JvmStatic
fun compileJsLibraryToJar(sourcesPath: String, jarName: String, addSources: Boolean, extraOptions: List<String> = emptyList()): File {
val contentDir = KtTestUtil.tmpDirForReusableFolder("testLibrary-$jarName")
val outDir = File(contentDir, "out")
val outputFile = File(outDir, "$jarName.js")
compileKotlin2JS(sourcesPath, outputFile, extraOptions)
return createJarFile(contentDir, outDir, jarName, sourcesPath.takeIf { addSources })
}
@JvmStatic
fun createJarFile(contentDir: File, dirToAdd: File, jarName: String, sourcesPath: String? = null): File {
val jarFile = File(contentDir, "$jarName.jar")
@@ -214,10 +203,6 @@ object MockLibraryUtil {
runJvmCompiler(args)
}
private fun compileKotlin2JS(sourcesPath: String, outputFile: File, extraOptions: List<String>) {
runJsCompiler(listOf("-meta-info", "-output", outputFile.absolutePath, sourcesPath, *extraOptions.toTypedArray()))
}
fun compileKotlinModule(buildFilePath: String) {
runJvmCompiler(listOf("-no-stdlib", "-Xbuild-file", buildFilePath))
}