From 79d67e97c36fa6043871f4d715a60bfac15bbd1e Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Mon, 30 Jan 2017 18:54:24 +0300
Subject: [PATCH] JS: rename "-library-files" argument to "-libraries" and
 change separator

Use the system separator (':' or ';') instead of commas

 #KT-16083 Fixed

Original commit: 464820458ec48a76b4f6081ce1e869f6a27ea9c9
---
 .../compilerRunner/JpsKotlinCompilerRunner.kt    | 16 ++++++++--------
 .../jetbrains/kotlin/jps/build/KotlinBuilder.kt  |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

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 22f2f111759..7ac9197dc32 100644
--- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt
+++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt
@@ -19,7 +19,10 @@ package org.jetbrains.kotlin.compilerRunner
 import org.jetbrains.jps.api.GlobalOptions
 import org.jetbrains.kotlin.cli.common.ExitCode
 import org.jetbrains.kotlin.cli.common.KOTLIN_COMPILER_ENVIRONMENT_KEEPALIVE_PROPERTY
-import org.jetbrains.kotlin.cli.common.arguments.*
+import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments
+import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments
+import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments
+import org.jetbrains.kotlin.cli.common.arguments.mergeBeans
 import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation
 import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity
 import org.jetbrains.kotlin.config.CompilerSettings
@@ -28,9 +31,6 @@ import org.jetbrains.kotlin.jps.build.KotlinBuilder
 import java.io.ByteArrayOutputStream
 import java.io.File
 import java.io.PrintStream
-import java.io.Serializable
-import java.rmi.server.UnicastRemoteObject
-import java.util.*
 
 class JpsKotlinCompilerRunner : KotlinCompilerRunner<JpsCompilerEnvironment>() {
     override val log: KotlinLogger = JpsKotlinLogger(KotlinBuilder.LOG)
@@ -72,11 +72,11 @@ class JpsKotlinCompilerRunner : KotlinCompilerRunner<JpsCompilerEnvironment>() {
             compilerSettings: CompilerSettings,
             environment: JpsCompilerEnvironment,
             sourceFiles: Collection<File>,
-            libraryFiles: List<String>,
+            libraries: List<String>,
             outputFile: File
     ) {
         val arguments = mergeBeans(commonArguments, k2jsArguments)
-        setupK2JsArguments(outputFile, sourceFiles, libraryFiles, arguments)
+        setupK2JsArguments(outputFile, sourceFiles, libraries, arguments)
         withCompilerSettings(compilerSettings) {
             runCompiler(K2JS_COMPILER, arguments, environment)
         }
@@ -182,13 +182,13 @@ class JpsKotlinCompilerRunner : KotlinCompilerRunner<JpsCompilerEnvironment>() {
         }
     }
 
-    private fun setupK2JsArguments( _outputFile: File, sourceFiles: Collection<File>, _libraryFiles: List<String>, settings: K2JSCompilerArguments) {
+    private fun setupK2JsArguments(_outputFile: File, sourceFiles: Collection<File>, _libraries: List<String>, settings: K2JSCompilerArguments) {
         with(settings) {
             noStdlib = true
             freeArgs = sourceFiles.map { it.path }
             outputFile = _outputFile.path
             metaInfo = true
-            libraryFiles = _libraryFiles.toTypedArray()
+            libraries = _libraries.joinToString(File.pathSeparator)
         }
     }
 
diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt
index a519d7a1a96..a995806b60c 100644
--- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt
+++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt
@@ -658,12 +658,12 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) {
         val representativeModule = representativeTarget.module
         val moduleName = representativeModule.name
         val outputFile = JpsJsModuleUtils.getOutputFile(outputDir, moduleName)
-        val libraryFiles = JpsJsModuleUtils.getLibraryFilesAndDependencies(representativeTarget)
+        val libraries = JpsJsModuleUtils.getLibraryFilesAndDependencies(representativeTarget)
         val compilerSettings = JpsKotlinCompilerSettings.getCompilerSettings(representativeModule)
         val k2JsArguments = JpsKotlinCompilerSettings.getK2JsCompilerArguments(representativeModule)
 
         val compilerRunner = JpsKotlinCompilerRunner()
-        compilerRunner.runK2JsCompiler(commonArguments, k2JsArguments, compilerSettings, environment, sourceFiles, libraryFiles, outputFile)
+        compilerRunner.runK2JsCompiler(commonArguments, k2JsArguments, compilerSettings, environment, sourceFiles, libraries, outputFile)
         return environment.outputItemsCollector
     }