From 3e949b4047fbfcf0932813387ba120a75bebeefe Mon Sep 17 00:00:00 2001 From: Vasily Levchenko Date: Tue, 19 Dec 2017 12:19:30 +0300 Subject: [PATCH] [cli] make -version more usable --- .../cli.bc/src/org/jetbrains/kotlin/cli/bc/K2Native.kt | 5 +++++ .../src/org/jetbrains/kotlin/backend/konan/KonanVersion.kt | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/backend.native/cli.bc/src/org/jetbrains/kotlin/cli/bc/K2Native.kt b/backend.native/cli.bc/src/org/jetbrains/kotlin/cli/bc/K2Native.kt index a5cc58eb4aa..f64479e5882 100644 --- a/backend.native/cli.bc/src/org/jetbrains/kotlin/cli/bc/K2Native.kt +++ b/backend.native/cli.bc/src/org/jetbrains/kotlin/cli/bc/K2Native.kt @@ -42,6 +42,11 @@ class K2Native : CLICompiler() { override fun doExecute(@NotNull arguments: K2NativeCompilerArguments, @NotNull configuration: CompilerConfiguration, @NotNull rootDisposable: Disposable, @Nullable paths: KotlinPaths?): ExitCode { + if (arguments.version) { + println("Kotlin/Native: ${KonanVersion.CURRENT}") + return ExitCode.OK + } + if (arguments.freeArgs.isEmpty() && !arguments.isUsefulWithoutFreeArgs) { configuration.report(ERROR, "You have not specified any compilation arguments. No output has been produced.") } diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanVersion.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanVersion.kt index 194cefd7515..79e0dbde4f8 100644 --- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanVersion.kt +++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/KonanVersion.kt @@ -30,7 +30,7 @@ enum class MetaVersion { class KonanVersion(val meta: MetaVersion?, val major: Int, val minor: Int, val maintenance: Int, val build:Int) { companion object { - val CURRENT = KonanVersion(MetaVersion.EAP, 0, 1, 0, 0) + val CURRENT = KonanVersion(MetaVersion.EAP, 0, 6, 0, 0) } override fun toString() = if (meta != null) "$meta $major.$minor.$maintenance.$build" else "$major.$minor.$maintenance.$build" }