From 0ca604d74352bb9f3943c327061ee1a5cada2f43 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Thu, 16 Feb 2017 19:09:20 +0100 Subject: [PATCH] Don't pass paths to non-existing metadata files from dependent modules Original commit: 3225c93ce0155b683c05e209e7ceaaf8cc657d48 --- .../kotlin/compilerRunner/JpsKotlinCompilerRunner.kt | 7 +++++++ .../src/org/jetbrains/kotlin/jps/build/JpsJsModuleUtils.kt | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt index 7ac9197dc32..485f72aee0b 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt @@ -75,8 +75,15 @@ class JpsKotlinCompilerRunner : KotlinCompilerRunner() { libraries: List, 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/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsJsModuleUtils.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsJsModuleUtils.kt index bdddc9118ee..441f5a41602 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsJsModuleUtils.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsJsModuleUtils.kt @@ -73,7 +73,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) + } } }) }