From f198ac4b31e27b9750e0d9d529f3f01b0dd22e8c Mon Sep 17 00:00:00 2001 From: Michael Nedzelsky Date: Sat, 16 May 2015 02:39:56 +0300 Subject: [PATCH] JS: make -meta-info cli option boolean Original commit: d6292715104738509a6253b91f9bf6768faa81e9 --- .../kotlin/compilerRunner/KotlinCompilerRunner.java | 12 +++--------- .../org/jetbrains/kotlin/jps/build/KotlinBuilder.kt | 3 +-- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java index ea95389879c..887f515087a 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java @@ -72,11 +72,10 @@ public class KotlinCompilerRunner { @NotNull OutputItemsCollector collector, @NotNull Collection sourceFiles, @NotNull List libraryFiles, - @NotNull File outputFile, - @Nullable File metaInfoFile + @NotNull File outputFile ) { K2JSCompilerArguments arguments = mergeBeans(commonArguments, k2jsArguments); - setupK2JsArguments(outputFile, metaInfoFile, sourceFiles, libraryFiles, arguments); + setupK2JsArguments(outputFile, sourceFiles, libraryFiles, arguments); runCompiler(K2JS_COMPILER, arguments, compilerSettings.getAdditionalArguments(), messageCollector, collector, environment); } @@ -191,7 +190,6 @@ public class KotlinCompilerRunner { private static void setupK2JsArguments( @NotNull File outputFile, - @Nullable File metaInfoFile, @NotNull Collection sourceFiles, @NotNull List libraryFiles, @NotNull K2JSCompilerArguments settings @@ -204,11 +202,7 @@ public class KotlinCompilerRunner { } }); settings.outputFile = outputFile.getPath(); - - if (metaInfoFile != null) { - settings.metaInfo = metaInfoFile.getPath(); - } - + settings.metaInfo = true; settings.libraryFiles = ArrayUtil.toStringArray(libraryFiles); } } 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 8b294e5f8ca..cb702e2f7c1 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 @@ -400,12 +400,11 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR val moduleName = representativeTarget.getModule().getName() val outputFile = JpsJsModuleUtils.getOutputFile(outputDir, moduleName) - val metaInfoFile = JpsJsModuleUtils.getOutputMetaFile(outputDir, moduleName) val libraryFiles = JpsJsModuleUtils.getLibraryFilesAndDependencies(representativeTarget) val compilerSettings = JpsKotlinCompilerSettings.getCompilerSettings(project) val k2JsArguments = JpsKotlinCompilerSettings.getK2JsCompilerArguments(project) - runK2JsCompiler(commonArguments, k2JsArguments, compilerSettings, messageCollector, environment, outputItemCollector, sourceFiles, libraryFiles, outputFile, metaInfoFile) + runK2JsCompiler(commonArguments, k2JsArguments, compilerSettings, messageCollector, environment, outputItemCollector, sourceFiles, libraryFiles, outputFile) return outputItemCollector }