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

[JS IR] Use module name instead of output file wo extension

Browse Source
This commit is contained in:
Ilya Goncharov
2021-04-13 18:26:05 +03:00
committed by TeamCityServer
parent 0e00186ca1
commit eaf25b517d
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/cli-js/src/org/jetbrains/kotlin/cli/js/K2JsIrCompiler.kt
+5 -2
View File
@@ -161,9 +161,10 @@ class K2JsIrCompiler : CLICompiler<K2JSCompilerArguments>() {
val outputFile = File(outputFilePath) val outputFile = File(outputFilePath)
val moduleName = arguments.irModuleName ?: FileUtil.getNameWithoutExtension(outputFile)
configurationJs.put( configurationJs.put(
CommonConfigurationKeys.MODULE_NAME, CommonConfigurationKeys.MODULE_NAME,
arguments.irModuleName ?: FileUtil.getNameWithoutExtension(outputFile) moduleName
) )
// TODO: in this method at least 3 different compiler configurations are used (original, env.configuration, jsConfig.configuration) // TODO: in this method at least 3 different compiler configurations are used (original, env.configuration, jsConfig.configuration)
@@ -206,7 +207,9 @@ class K2JsIrCompiler : CLICompiler<K2JSCompilerArguments>() {
irFactory = PersistentIrFactory(), // TODO IrFactoryImpl? irFactory = PersistentIrFactory(), // TODO IrFactoryImpl?
outputKlibPath = outputFile.path, outputKlibPath = outputFile.path,
nopack = arguments.irProduceKlibDir, nopack = arguments.irProduceKlibDir,
jsOutputName = FileUtil.getNameWithoutExtension(outputFile), jsOutputName = moduleName
.replace(":", "-")
.replace(".", "-"),
) )
} }