Don't pass paths to non-existing metadata files from dependent modules

(cherry picked from commit 3225c93)
JetBrains · Feb 16, 2017 · 50be60d · 50be60d
1 parent e30cd05
commit 50be60d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt b/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt
@@ -75,8 +75,15 @@ class JpsKotlinCompilerRunner : KotlinCompilerRunner<JpsCompilerEnvironment>() {
             libraries: List<String>,
             outputFile: File
     ) {
+        log.debug("K2JS: common arguments: " + ArgumentUtils.convertArgumentsToStringList(commonArguments))
+        log.debug("K2JS: JS arguments: " + ArgumentUtils.convertArgumentsToStringList(k2jsArguments))
+
         val arguments = mergeBeans(commonArguments, k2jsArguments)
+        log.debug("K2JS: merged arguments: " + ArgumentUtils.convertArgumentsToStringList(arguments))
+
         setupK2JsArguments(outputFile, sourceFiles, libraries, arguments)
+        log.debug("K2JS: arguments after setup" + ArgumentUtils.convertArgumentsToStringList(arguments))
+
         withCompilerSettings(compilerSettings) {
             runCompiler(K2JS_COMPILER, arguments, environment)
         }

diff --git a/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsJsModuleUtils.kt b/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsJsModuleUtils.kt
@@ -63,7 +63,9 @@ object JpsJsModuleUtils {
                 val moduleBuildTarget = ModuleBuildTarget(module, targetType)
                 val outputDir = KotlinBuilderModuleScriptGenerator.getOutputDirSafe(moduleBuildTarget)
                 val metaInfoFile = getOutputMetaFile(outputDir, module.name)
-                result.add(metaInfoFile.absolutePath)
+                if (metaInfoFile.exists()) {
+                    result.add(metaInfoFile.absolutePath)
+                }
             }
         })
     }