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

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

Browse Source
This commit is contained in:
Dmitry Jemerov
2017-02-16 19:09:20 +01:00
parent 797813a8d4
commit 3225c93ce0
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt
+7
View File
@@ -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)
}
jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsJsModuleUtils.kt
+3 -1
View File
@@ -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)
}
}
})
}