From abf2a9e073ce1dffed6216584e4ff33e45e4f197 Mon Sep 17 00:00:00 2001 From: Ilya Goncharov Date: Thu, 26 Dec 2019 15:56:45 +0300 Subject: [PATCH] [Gradle, JS] Extract ir compiler flags --- .../gradle/targets/js/ir/CompilerFlags.kt | 19 +++++++++++++++++++ .../targets/js/ir/KotlinJsIrSubTarget.kt | 10 +++------- .../js/ir/KotlinJsIrTargetConfigurator.kt | 2 +- 3 files changed, 23 insertions(+), 8 deletions(-) create mode 100644 libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/CompilerFlags.kt diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/CompilerFlags.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/CompilerFlags.kt new file mode 100644 index 00000000000..45226542746 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/CompilerFlags.kt @@ -0,0 +1,19 @@ +/* + * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.gradle.targets.js.ir + +/** + * @see [compiler/testData/cli/js/jsExtraHelp.out] + */ + +const val DISABLE_PRE_IR = "-Xir-only" +const val ENABLE_DCE = "-Xir-dce" + +const val GENERATE_D_TS = "-Xgenerate-dts" + +const val PRODUCE_JS = "-Xir-produce-js" +const val PRODUCE_UNZIPPED_KLIB = "-Xir-produce-klib-dir" +const val PRODUCE_ZIPPED_KLIB = "-Xir-produce-klib-file" \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrSubTarget.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrSubTarget.kt index 2e677db867b..fbdc6a27d37 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrSubTarget.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrSubTarget.kt @@ -54,11 +54,11 @@ abstract class KotlinJsIrSubTarget( } override fun produceKotlinLibrary() { - produceByFlags(PRODUCE_KLIB_DIR) + produceByFlags(PRODUCE_UNZIPPED_KLIB) } override fun produceJs() { - produceByFlags(PRODUCE_KLIB_DIR, PRODUCE_JS) + produceByFlags(PRODUCE_UNZIPPED_KLIB, PRODUCE_JS) configureMain() } @@ -71,7 +71,7 @@ abstract class KotlinJsIrSubTarget( .matching { it.name == KotlinCompilation.TEST_COMPILATION_NAME } .all { it.kotlinOptions { - freeCompilerArgs += listOf(PRODUCE_KLIB_DIR, PRODUCE_JS) + freeCompilerArgs += listOf(PRODUCE_UNZIPPED_KLIB, PRODUCE_JS) } } @@ -167,10 +167,6 @@ abstract class KotlinJsIrSubTarget( protected abstract fun configureMain(compilation: KotlinJsCompilation) companion object { - const val PRODUCE_JS = "-Xir-produce-js" - const val PRODUCE_KLIB_FILE = "-Xir-produce-klib-file" - const val PRODUCE_KLIB_DIR = "-Xir-produce-klib-dir" - const val RUN_TASK_NAME = "run" } } \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrTargetConfigurator.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrTargetConfigurator.kt index e63a3031947..1d318db8e48 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrTargetConfigurator.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/ir/KotlinJsIrTargetConfigurator.kt @@ -58,7 +58,7 @@ open class KotlinJsIrTargetConfigurator(kotlinPluginVersion: String) : sourceMap = true sourceMapEmbedSources = null - freeCompilerArgs += listOf("-Xir-only") + freeCompilerArgs += listOf(DISABLE_PRE_IR) } } }