Skip to content

Commit 00ed024

Browse files
committed
Don't pass paths to non-existing metadata files from dependent modules
1 parent 6aa3c26 commit 00ed024

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,15 @@ class JpsKotlinCompilerRunner : KotlinCompilerRunner<JpsCompilerEnvironment>() {
7575
libraries: List<String>,
7676
outputFile: File
7777
) {
78+
log.debug("K2JS: common arguments: " + ArgumentUtils.convertArgumentsToStringList(commonArguments))
79+
log.debug("K2JS: JS arguments: " + ArgumentUtils.convertArgumentsToStringList(k2jsArguments))
80+
7881
val arguments = mergeBeans(commonArguments, k2jsArguments)
82+
log.debug("K2JS: merged arguments: " + ArgumentUtils.convertArgumentsToStringList(arguments))
83+
7984
setupK2JsArguments(outputFile, sourceFiles, libraries, arguments)
85+
log.debug("K2JS: arguments after setup" + ArgumentUtils.convertArgumentsToStringList(arguments))
86+
8087
withCompilerSettings(compilerSettings) {
8188
runCompiler(K2JS_COMPILER, arguments, environment)
8289
}

jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsJsModuleUtils.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,9 @@ object JpsJsModuleUtils {
7373
val moduleBuildTarget = ModuleBuildTarget(module, targetType)
7474
val outputDir = KotlinBuilderModuleScriptGenerator.getOutputDirSafe(moduleBuildTarget)
7575
val metaInfoFile = getOutputMetaFile(outputDir, module.name)
76-
result.add(metaInfoFile.absolutePath)
76+
if (metaInfoFile.exists()) {
77+
result.add(metaInfoFile.absolutePath)
78+
}
7779
}
7880
})
7981
}

0 commit comments

Comments
 (0)