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

JS: make -meta-info cli option boolean

Browse Source 
Original commit: d629271510
This commit is contained in:
Michael Nedzelsky
2015-05-16 02:39:56 +03:00
parent 4c436ce7a2
commit f198ac4b31
2 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java
+3 -9
View File
@@ -72,11 +72,10 @@ public class KotlinCompilerRunner {
@NotNull OutputItemsCollector collector, @NotNull OutputItemsCollector collector,
@NotNull Collection<File> sourceFiles, @NotNull Collection<File> sourceFiles,
@NotNull List<String> libraryFiles, @NotNull List<String> libraryFiles,
@NotNull File outputFile, @NotNull File outputFile
@Nullable File metaInfoFile
) { ) {
K2JSCompilerArguments arguments = mergeBeans(commonArguments, k2jsArguments); 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); runCompiler(K2JS_COMPILER, arguments, compilerSettings.getAdditionalArguments(), messageCollector, collector, environment);
} }
@@ -191,7 +190,6 @@ public class KotlinCompilerRunner {
private static void setupK2JsArguments( private static void setupK2JsArguments(
@NotNull File outputFile, @NotNull File outputFile,
@Nullable File metaInfoFile,
@NotNull Collection<File> sourceFiles, @NotNull Collection<File> sourceFiles,
@NotNull List<String> libraryFiles, @NotNull List<String> libraryFiles,
@NotNull K2JSCompilerArguments settings @NotNull K2JSCompilerArguments settings
@@ -204,11 +202,7 @@ public class KotlinCompilerRunner {
} }
}); });
settings.outputFile = outputFile.getPath(); settings.outputFile = outputFile.getPath();
settings.metaInfo = true;
if (metaInfoFile != null) {
settings.metaInfo = metaInfoFile.getPath();
}
settings.libraryFiles = ArrayUtil.toStringArray(libraryFiles); settings.libraryFiles = ArrayUtil.toStringArray(libraryFiles);
} }
} }
jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt
+1 -2
View File
@@ -400,12 +400,11 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR
val moduleName = representativeTarget.getModule().getName() val moduleName = representativeTarget.getModule().getName()
val outputFile = JpsJsModuleUtils.getOutputFile(outputDir, moduleName) val outputFile = JpsJsModuleUtils.getOutputFile(outputDir, moduleName)
val metaInfoFile = JpsJsModuleUtils.getOutputMetaFile(outputDir, moduleName)
val libraryFiles = JpsJsModuleUtils.getLibraryFilesAndDependencies(representativeTarget) val libraryFiles = JpsJsModuleUtils.getLibraryFilesAndDependencies(representativeTarget)
val compilerSettings = JpsKotlinCompilerSettings.getCompilerSettings(project) val compilerSettings = JpsKotlinCompilerSettings.getCompilerSettings(project)
val k2JsArguments = JpsKotlinCompilerSettings.getK2JsCompilerArguments(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 return outputItemCollector
} }