From 0a052c623469f9a98c9139d3c3e800c7c30a0a71 Mon Sep 17 00:00:00 2001 From: Michael Nedzelsky Date: Thu, 20 Nov 2014 16:15:28 +0300 Subject: [PATCH] JS backend: add option 'output library runtime fiies' for Kotlin Compiler Original commit: 73db22ae20d9d4563a057b0154bbb1905658a8cb --- .../src/org/jetbrains/jet/jps/build/KotlinBuilder.kt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt index f396d4524e1..b4ddb05d95b 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt @@ -60,6 +60,7 @@ import org.jetbrains.jet.compiler.CompilerSettings import org.jetbrains.jps.model.JpsProject import org.jetbrains.jet.compiler.runner.OutputItemsCollector import org.jetbrains.jet.compiler.runner.SimpleOutputItem +import org.jetbrains.jet.utils.LibraryUtils public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { class object { @@ -308,6 +309,12 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR val k2JsArguments = JpsKotlinCompilerSettings.getK2JsCompilerArguments(project) runK2JsCompiler(commonArguments, k2JsArguments, compilerSettings, messageCollector, environment, outputItemCollector, sourceFiles, libraryFiles, outputFile) + if (compilerSettings.copyJsLibraryFiles) { + val outputLibraryRuntimeDirectory = File(outputDir, compilerSettings.outputDirectoryForJsLibraryFiles).getAbsolutePath() + val libraryFilesToCopy = arrayListOf() + JpsJsModuleUtils.getLibraryFiles(representativeTarget, libraryFilesToCopy) + LibraryUtils.copyJsFilesFromLibraries(libraryFilesToCopy, outputLibraryRuntimeDirectory) + } return outputItemCollector }