diff --git a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/CommonCompilerArguments.java b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/CommonCompilerArguments.java index 288d5c37d1a..908f36e59c6 100644 --- a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/CommonCompilerArguments.java +++ b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/CommonCompilerArguments.java @@ -119,11 +119,6 @@ public abstract class CommonCompilerArguments implements Serializable { return new DummyImpl(); } - @NotNull - public String executableScriptFileName() { - return "kotlinc"; - } - public static final String WARN = "warn"; public static final String ERROR = "error"; public static final String ENABLE = "enable"; diff --git a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JSCompilerArguments.java b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JSCompilerArguments.java index 4713053bcb5..70ef2a7eba4 100644 --- a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JSCompilerArguments.java +++ b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JSCompilerArguments.java @@ -88,10 +88,4 @@ public class K2JSCompilerArguments extends CommonCompilerArguments { arguments.moduleKind = K2JsArgumentConstants.MODULE_PLAIN; return arguments; } - - @Override - @NotNull - public String executableScriptFileName() { - return "kotlinc-js"; - } } diff --git a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.java b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.java index 226a1f7a4a5..1d4d42b6022 100644 --- a/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.java +++ b/compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/arguments/K2JVMCompilerArguments.java @@ -146,10 +146,4 @@ public class K2JVMCompilerArguments extends CommonCompilerArguments { arguments.jvmTarget = JvmTarget.DEFAULT.getDescription(); return arguments; } - - @Override - @NotNull - public String executableScriptFileName() { - return "kotlinc-jvm"; - } } diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/common/CLICompiler.java b/compiler/cli/src/org/jetbrains/kotlin/cli/common/CLICompiler.java index c6ca0bc27c0..dad9a56f06a 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/common/CLICompiler.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/common/CLICompiler.java @@ -115,7 +115,7 @@ public abstract class CLICompiler { } if (arguments.help || arguments.extraHelp) { - Usage.print(errStream, arguments); + Usage.print(errStream, this, arguments); return OK; } @@ -350,11 +350,19 @@ public abstract class CLICompiler { ); private void printVersionIfNeeded(@NotNull MessageCollector messageCollector, @NotNull A arguments) { - if (!arguments.version) return; - - messageCollector.report(INFO, "Kotlin Compiler version " + KotlinCompilerVersion.VERSION, null); + if (arguments.version) { + messageCollector.report( + CompilerMessageSeverity.INFO, + executableScriptFileName() + " " + KotlinCompilerVersion.VERSION + + " (JRE " + System.getProperty("java.runtime.version") + ")", + null + ); + } } + @NotNull + public abstract String executableScriptFileName(); + /** * Useful main for derived command line tools */ diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/common/Usage.java b/compiler/cli/src/org/jetbrains/kotlin/cli/common/Usage.java index ee9ebe973ac..e7d4755a014 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/common/Usage.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/common/Usage.java @@ -29,8 +29,10 @@ class Usage { // The magic number 29 corresponds to the similar padding width in javac and scalac command line compilers private static final int OPTION_NAME_PADDING_WIDTH = 29; - public static void print(@NotNull PrintStream target, @NotNull CommonCompilerArguments arguments) { - target.println("Usage: " + arguments.executableScriptFileName() + " "); + public static void print( + @NotNull PrintStream target, @NotNull CLICompiler compiler, @NotNull A arguments + ) { + target.println("Usage: " + compiler.executableScriptFileName() + " "); target.println("where " + (arguments.extraHelp ? "advanced" : "possible") + " options include:"); for (Class clazz = arguments.getClass(); clazz != null; clazz = clazz.getSuperclass()) { for (Field field : clazz.getDeclaredFields()) { diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/js/K2JSCompiler.java b/compiler/cli/src/org/jetbrains/kotlin/cli/js/K2JSCompiler.java index ba208e91a2d..ac7097adf39 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/js/K2JSCompiler.java +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/js/K2JSCompiler.java @@ -298,4 +298,10 @@ public class K2JSCompiler extends CLICompiler { return MainCallParameters.mainWithoutArguments(); } } + + @NotNull + @Override + public String executableScriptFileName() { + return "kotlinc-js"; + } } diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt index 2a49a527d13..4b8fe318a4a 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt @@ -252,17 +252,14 @@ class K2JVMCompiler : CLICompiler() { } } - /** - * Allow derived classes to add additional command line arguments - */ - override fun createArguments(): K2JVMCompilerArguments { - val result = K2JVMCompilerArguments() + override fun createArguments(): K2JVMCompilerArguments = K2JVMCompilerArguments().apply { if (System.getenv("KOTLIN_REPORT_PERF") != null) { - result.reportPerf = true + reportPerf = true } - return result } + override fun executableScriptFileName(): String = "kotlinc-jvm" + companion object { private var initStartNanos = System.nanoTime() // allows to track GC time for each run when repeated compilation is used diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/metadata/K2MetadataCompiler.kt b/compiler/cli/src/org/jetbrains/kotlin/cli/metadata/K2MetadataCompiler.kt index 894b6385b8b..6f738f16bba 100644 --- a/compiler/cli/src/org/jetbrains/kotlin/cli/metadata/K2MetadataCompiler.kt +++ b/compiler/cli/src/org/jetbrains/kotlin/cli/metadata/K2MetadataCompiler.kt @@ -89,6 +89,9 @@ class K2MetadataCompiler : CLICompiler() { return ExitCode.OK } + // TODO: update this once a launcher script for K2MetadataCompiler is available + override fun executableScriptFileName(): String = "kotlinc" + companion object { @JvmStatic fun main(args: Array) { diff --git a/compiler/testData/cli/js/version.args b/compiler/testData/cli/js/version.args deleted file mode 100644 index 409f4ea47a7..00000000000 --- a/compiler/testData/cli/js/version.args +++ /dev/null @@ -1 +0,0 @@ --version diff --git a/compiler/testData/cli/js/version.out b/compiler/testData/cli/js/version.out deleted file mode 100644 index 77295403a32..00000000000 --- a/compiler/testData/cli/js/version.out +++ /dev/null @@ -1,2 +0,0 @@ -info: Kotlin Compiler version $VERSION$ -OK diff --git a/compiler/testData/cli/jvm/version.args b/compiler/testData/cli/jvm/version.args deleted file mode 100644 index 409f4ea47a7..00000000000 --- a/compiler/testData/cli/jvm/version.args +++ /dev/null @@ -1 +0,0 @@ --version diff --git a/compiler/testData/cli/jvm/version.out b/compiler/testData/cli/jvm/version.out deleted file mode 100644 index 77295403a32..00000000000 --- a/compiler/testData/cli/jvm/version.out +++ /dev/null @@ -1,2 +0,0 @@ -info: Kotlin Compiler version $VERSION$ -OK diff --git a/compiler/testData/integration/ant/js/version/build.log.expected b/compiler/testData/integration/ant/js/version/build.log.expected index 2cd6425e2ad..d7e22d9ebdf 100644 --- a/compiler/testData/integration/ant/js/version/build.log.expected +++ b/compiler/testData/integration/ant/js/version/build.log.expected @@ -3,7 +3,7 @@ Buildfile: [TestData]/build.xml build: [kotlin2js] Compiling [[TestData]/root1] => [[Temp]/out.js] -[kotlin2js] info: Kotlin Compiler version [KotlinVersion] +[kotlin2js] info: kotlinc-js [KotlinVersion] (JRE [JREVersion]) BUILD SUCCESSFUL Total time: [time] diff --git a/compiler/testData/integration/ant/jvm/additionalArguments/build.log.expected b/compiler/testData/integration/ant/jvm/additionalArguments/build.log.expected index 2e0c3905dcd..6f649425cf2 100644 --- a/compiler/testData/integration/ant/jvm/additionalArguments/build.log.expected +++ b/compiler/testData/integration/ant/jvm/additionalArguments/build.log.expected @@ -5,7 +5,7 @@ build: [kotlinc] Compiling [[TestData]/hello.kt] => [[Temp]/hello.jar] [javac] Compiling 1 source file to [Temp] [javac] Compiling [[TestData]] => [[Temp]] - [javac] info: Kotlin Compiler version [KotlinVersion] + [javac] info: kotlinc-jvm [KotlinVersion] (JRE [JREVersion]) [javac] Running javac... BUILD SUCCESSFUL diff --git a/compiler/testData/integration/ant/jvm/version/build.log.expected b/compiler/testData/integration/ant/jvm/version/build.log.expected index 92a1f0c68f1..353ad7255c5 100644 --- a/compiler/testData/integration/ant/jvm/version/build.log.expected +++ b/compiler/testData/integration/ant/jvm/version/build.log.expected @@ -3,7 +3,7 @@ Buildfile: [TestData]/build.xml build: [kotlinc] Compiling [[TestData]/hello.kt] => [[Temp]/hello.jar] - [kotlinc] info: Kotlin Compiler version [KotlinVersion] + [kotlinc] info: kotlinc-jvm [KotlinVersion] (JRE [JREVersion]) BUILD SUCCESSFUL Total time: [time] diff --git a/compiler/testData/integration/smoke/printVersion/test.compile.expected b/compiler/testData/integration/smoke/printVersion/test.compile.expected new file mode 100644 index 00000000000..3403ac3f4d4 --- /dev/null +++ b/compiler/testData/integration/smoke/printVersion/test.compile.expected @@ -0,0 +1,5 @@ + +ERR: +info: kotlinc-jvm [KotlinVersion] (JRE [JREVersion]) + +Return code: 0 diff --git a/compiler/tests-common/org/jetbrains/kotlin/integration/KotlinIntegrationTestBase.java b/compiler/tests-common/org/jetbrains/kotlin/integration/KotlinIntegrationTestBase.java index 6a2a7b03f81..bda35e37394 100644 --- a/compiler/tests-common/org/jetbrains/kotlin/integration/KotlinIntegrationTestBase.java +++ b/compiler/tests-common/org/jetbrains/kotlin/integration/KotlinIntegrationTestBase.java @@ -81,6 +81,7 @@ public abstract class KotlinIntegrationTestBase extends TestCaseWithTmpdir { content = normalizePath(content, getCompilerLib(), "[CompilerLib]"); content = normalizePath(content, getKotlinProjectHome(), "[KotlinProjectHome]"); content = content.replaceAll(Pattern.quote(KotlinCompilerVersion.VERSION), "[KotlinVersion]"); + content = content.replaceAll("\\(JRE .+\\)", "(JRE [JREVersion])"); content = StringUtil.convertLineSeparators(content); return content; } diff --git a/compiler/tests/org/jetbrains/kotlin/cli/CliTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/cli/CliTestGenerated.java index e45f0c29816..8aea27a3fcd 100644 --- a/compiler/tests/org/jetbrains/kotlin/cli/CliTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/cli/CliTestGenerated.java @@ -362,12 +362,6 @@ public class CliTestGenerated extends AbstractCliTest { doJvmTest(fileName); } - @TestMetadata("version.args") - public void testVersion() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/jvm/version.args"); - doJvmTest(fileName); - } - @TestMetadata("warningJdkWithNoJdk.args") public void testWarningJdkWithNoJdk() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/jvm/warningJdkWithNoJdk.args"); @@ -515,12 +509,6 @@ public class CliTestGenerated extends AbstractCliTest { doJsTest(fileName); } - @TestMetadata("version.args") - public void testVersion() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/js/version.args"); - doJsTest(fileName); - } - @TestMetadata("withFolderAsLib.args") public void testWithFolderAsLib() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cli/js/withFolderAsLib.args"); diff --git a/compiler/tests/org/jetbrains/kotlin/integration/CompilerSmokeTest.java b/compiler/tests/org/jetbrains/kotlin/integration/CompilerSmokeTest.java index 77609afe98b..b6d197603bb 100644 --- a/compiler/tests/org/jetbrains/kotlin/integration/CompilerSmokeTest.java +++ b/compiler/tests/org/jetbrains/kotlin/integration/CompilerSmokeTest.java @@ -85,5 +85,8 @@ public class CompilerSmokeTest extends CompilerSmokeTestBase { assertEquals("compilation failed", 0, runCompiler("inlineOnly.compile", "-include-runtime", "inlineOnly.kt", "-d", jar)); run("inlineOnly.run", "-cp", jar, "InlineOnly.InlineOnlyKt"); } -} + public void testPrintVersion() throws Exception { + runCompiler("test.compile", "-version"); + } +} diff --git a/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 3cbcb30005c..86556d9a2f6 100644 --- a/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -230,10 +230,6 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { return NOTHING_DONE } - messageCollector.report( - INFO, "Kotlin version " + KotlinCompilerVersion.VERSION + " (JRE " + System.getProperty("java.runtime.version") + ")" - ) - val targetsWithoutOutputDir = targets.filter { it.outputDir == null } if (targetsWithoutOutputDir.isNotEmpty()) { messageCollector.report(ERROR, "Output directory not specified for " + targetsWithoutOutputDir.joinToString()) @@ -251,6 +247,7 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { val commonArguments = compilerArgumentsForChunk(chunk).apply { reportOutputFiles = true + version = true // Always report the version to help diagnosing user issues if they submit the compiler output } val allCompiledFiles = getAllCompiledFilesContainer(context) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerRunner.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerRunner.kt index d183f0857c5..ffc7eda357c 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerRunner.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/compilerRunner/GradleKotlinCompilerRunner.kt @@ -25,6 +25,7 @@ import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments import org.jetbrains.kotlin.cli.common.arguments.K2MetadataCompilerArguments import org.jetbrains.kotlin.com.intellij.openapi.util.io.FileUtil +import org.jetbrains.kotlin.config.KotlinCompilerVersion import org.jetbrains.kotlin.config.Services import org.jetbrains.kotlin.daemon.client.CompileServiceSession import org.jetbrains.kotlin.daemon.common.* @@ -100,6 +101,12 @@ internal class GradleCompilerRunner(private val project: Project) : KotlinCompil compilerArgs: CommonCompilerArguments, environment: GradleCompilerEnvironment ): ExitCode { + if (compilerArgs.version) { + project.logger.lifecycle("Kotlin version " + KotlinCompilerVersion.VERSION + + " (JRE " + System.getProperty("java.runtime.version") + ")") + compilerArgs.version = false + } + val argsArray = ArgumentUtils.convertArgumentsToStringList(compilerArgs).toTypedArray() with (project.logger) { kotlinDebug { "Kotlin compiler class: $compilerClassName" } diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-plugins/expected.log b/libraries/tools/kotlin-maven-plugin-test/src/it/test-plugins/expected.log index 2d756030e90..83cdfeb956f 100644 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-plugins/expected.log +++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-plugins/expected.log @@ -1,11 +1,11 @@ -[INFO] Kotlin Compiler version @snapshot@ +[INFO] Kotlin version @snapshot@ (JRE ) [INFO] Compiling Kotlin sources from [/test-extension/src/main/kotlin] [INFO] Module name is test-extension [WARNING] Some JAR files in the classpath have the Kotlin Runtime library bundled into them. This may cause difficult to debug problems if there's a different version of the Kotlin Runtime library in the classpath. Consider removing these libraries from the classpath or use '-Xskip-runtime-version-check' to suppress this warning [WARNING] /local-repo/org/jetbrains/kotlin/kotlin-compiler/@snapshot@/kotlin-compiler-@snapshot@.jar: (-1, -1) Library has Kotlin runtime bundled into it -[INFO] Kotlin Compiler version @snapshot@ +[INFO] Kotlin version @snapshot@ (JRE ) [WARNING] No sources found skipping Kotlin compile -[INFO] Kotlin Compiler version @snapshot@ +[INFO] Kotlin version @snapshot@ (JRE ) [INFO] Compiling Kotlin sources from [/use-test-extension/src/main/kotlin] [INFO] Module name is use-test-extension [INFO] Applicability test for project use-test-extension @@ -13,5 +13,5 @@ [INFO] Configuring test plugin with arguments [INFO] Plugin applied [INFO] Option value: my-special-value -[INFO] Kotlin Compiler version @snapshot@ -[WARNING] No sources found skipping Kotlin compile \ No newline at end of file +[INFO] Kotlin version @snapshot@ (JRE ) +[WARNING] No sources found skipping Kotlin compile diff --git a/libraries/tools/kotlin-maven-plugin-test/src/it/test-plugins/verify.groovy b/libraries/tools/kotlin-maven-plugin-test/src/it/test-plugins/verify.groovy index 867777c607f..edb1cc4c369 100644 --- a/libraries/tools/kotlin-maven-plugin-test/src/it/test-plugins/verify.groovy +++ b/libraries/tools/kotlin-maven-plugin-test/src/it/test-plugins/verify.groovy @@ -1,5 +1,5 @@ /** - * NOTE: if this script returns false, the build log with more information can be found at tools/kotlin-maven-plugin/target/it/plugins/build.log + * NOTE: if this script returns false, the build log with more information can be found at tools/kotlin-maven-plugin-test/target/it/plugins/build.log */ import java.util.regex.Pattern @@ -38,7 +38,8 @@ State state = buildLogFile.readLines().collect { it.replaceAll("\\u001b[^m]*m", replaceAll(/[0-9]+\s*ms/, "LLL ms"). trim(). replaceAll(/^\[[A-Z]+\]$/, ""). - replace(kotlinVersion, "@snapshot@") + replace(kotlinVersion, "@snapshot@"). + replaceAll(/\(JRE .+\)/, "(JRE )") if (filtered != "") { acc.lines << filtered diff --git a/libraries/tools/kotlin-maven-plugin/src/it/simple/expected.log b/libraries/tools/kotlin-maven-plugin/src/it/simple/expected.log index 96f3f91b128..6d4adc457b4 100644 --- a/libraries/tools/kotlin-maven-plugin/src/it/simple/expected.log +++ b/libraries/tools/kotlin-maven-plugin/src/it/simple/expected.log @@ -1,3 +1,3 @@ -[INFO] Kotlin Compiler version @snapshot@ +[INFO] Kotlin version @snapshot@ (JRE ) [INFO] Compiling Kotlin sources from [/src/main/kotlin] [INFO] Module name is test-project diff --git a/libraries/tools/kotlin-maven-plugin/src/it/simple/verify.groovy b/libraries/tools/kotlin-maven-plugin/src/it/simple/verify.groovy index 9de730c891a..ecdc3b8dd3c 100644 --- a/libraries/tools/kotlin-maven-plugin/src/it/simple/verify.groovy +++ b/libraries/tools/kotlin-maven-plugin/src/it/simple/verify.groovy @@ -35,7 +35,8 @@ State state = new File(basedir, "build.log").readLines().collect { it.replaceAll replaceAll(/[0-9]+\s*ms/, "LLL ms"). trim(). replaceAll(/^\[[A-Z]+\]$/, ""). - replaceAll(/version [0-9a-z-+\.]+/, "version @snapshot@") + replaceAll(/version [0-9a-z-+\.]+/, "version @snapshot@"). + replaceAll(/\(JRE .+\)/, "(JRE )") if (filtered != "") { acc.lines << filtered diff --git a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinCompileMojoBase.java b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinCompileMojoBase.java index 13a56d87b5c..55e72daa685 100644 --- a/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinCompileMojoBase.java +++ b/libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinCompileMojoBase.java @@ -198,8 +198,8 @@ public abstract class KotlinCompileMojoBase e @Override public void execute() throws MojoExecutionException, MojoFailureException { - - getLog().info("Kotlin Compiler version " + KotlinCompilerVersion.VERSION); + getLog().info("Kotlin version " + KotlinCompilerVersion.VERSION + + " (JRE " + System.getProperty("java.runtime.version") + ")"); if (!hasKotlinFilesInSources()) { getLog().warn("No sources found skipping Kotlin compile");