From 387bf2601b3b3a77becd8919f7850fac35acff13 Mon Sep 17 00:00:00 2001
From: Andrey Breslav <andrey.breslav@jetbrains.com>
Date: Thu, 25 Jul 2013 15:51:23 +0400
Subject: [PATCH] Log version in JPS plugin

CompilerVersion.java is moved to cli-common (shared between compiler and JPS plugin) and renamed to KotlinVersion

This is needed because on TeamCity a JPS plugin is configured separately from the compiler, so it may happen that
JPS plugin version X tries to run compiler version X+100, and causes trouble.
---
 TeamCityBuild.xml                                            | 2 +-
 .../src/org/jetbrains/jet/cli/common/KotlinVersion.java}     | 2 +-
 .../cli/src/org/jetbrains/jet/cli/common/CLICompiler.java    | 2 +-
 .../src/org/jetbrains/jet/jps/build/KotlinBuilder.java       | 5 ++++-
 4 files changed, 7 insertions(+), 4 deletions(-)
 rename compiler/cli/{src/org/jetbrains/jet/cli/common/CompilerVersion.java => cli-common/src/org/jetbrains/jet/cli/common/KotlinVersion.java} (96%)

diff --git a/TeamCityBuild.xml b/TeamCityBuild.xml
index a4d3e11a2d5..f288fae68f3 100644
--- a/TeamCityBuild.xml
+++ b/TeamCityBuild.xml
@@ -10,7 +10,7 @@
     <property name="plugin.xml.bk" value="${plugin.xml}.bk"/>
     <property name="plugin.xml.versioned" value="${plugin.xml}.versioned" />
 
-    <property name="compiler.version.java" value="compiler/cli/src/org/jetbrains/jet/cli/common/CompilerVersion.java"/>
+    <property name="compiler.version.java" value="compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/KotlinVersion.java"/>
     <property name="compiler.version.java.bk" value="${compiler.version.java}.bk"/>
     <property name="compiler.version.java.versioned" value="${compiler.version.java}.versioned" />
 
diff --git a/compiler/cli/src/org/jetbrains/jet/cli/common/CompilerVersion.java b/compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/KotlinVersion.java
similarity index 96%
rename from compiler/cli/src/org/jetbrains/jet/cli/common/CompilerVersion.java
rename to compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/KotlinVersion.java
index 3f1687930b0..98bf5b13c22 100644
--- a/compiler/cli/src/org/jetbrains/jet/cli/common/CompilerVersion.java
+++ b/compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/KotlinVersion.java
@@ -16,7 +16,7 @@
 
 package org.jetbrains.jet.cli.common;
 
-public class CompilerVersion {
+public class KotlinVersion {
     // The value of this constant is generated by the build script
     // DON'T MODIFY IT
     public static final String VERSION = "@snapshot@";
diff --git a/compiler/cli/src/org/jetbrains/jet/cli/common/CLICompiler.java b/compiler/cli/src/org/jetbrains/jet/cli/common/CLICompiler.java
index eb0ae9e6be2..04911146c27 100644
--- a/compiler/cli/src/org/jetbrains/jet/cli/common/CLICompiler.java
+++ b/compiler/cli/src/org/jetbrains/jet/cli/common/CLICompiler.java
@@ -157,7 +157,7 @@ public abstract class CLICompiler<A extends CompilerArguments> {
             @NotNull MessageRenderer messageRenderer) {
         if (arguments.isVersion()) {
             String versionMessage = messageRenderer.render(CompilerMessageSeverity.INFO,
-                                                           "Kotlin Compiler version " + CompilerVersion.VERSION,
+                                                           "Kotlin Compiler version " + KotlinVersion.VERSION,
                                                            CompilerMessageLocation.NO_LOCATION);
             errStream.println(versionMessage);
         }
diff --git a/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java b/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java
index 0d88d6e635b..a5477e2ae50 100644
--- a/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java
+++ b/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java
@@ -20,6 +20,7 @@ import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.util.Function;
 import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.jet.cli.common.KotlinVersion;
 import org.jetbrains.jet.cli.common.messages.CompilerMessageLocation;
 import org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity;
 import org.jetbrains.jet.cli.common.messages.MessageCollector;
@@ -39,6 +40,7 @@ import java.util.Collection;
 import java.util.List;
 
 import static org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity.EXCEPTION;
+import static org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity.INFO;
 import static org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity.WARNING;
 
 public class KotlinBuilder extends ModuleLevelBuilder {
@@ -69,9 +71,10 @@ public class KotlinBuilder extends ModuleLevelBuilder {
             DirtyFilesHolder<JavaSourceRootDescriptor, ModuleBuildTarget> dirtyFilesHolder,
             OutputConsumer outputConsumer
     ) throws ProjectBuildException, IOException {
-
         MessageCollector messageCollector = new MessageCollectorAdapter(context);
 
+        messageCollector.report(INFO, "Kotlin JPS plugin version " + KotlinVersion.VERSION, CompilerMessageLocation.NO_LOCATION);
+
         if (chunk.getModules().size() > 1) {
             // We do not support circular dependencies, but if they are present, we should not break the build,
             // so we simply yield a warning and report NOTHING_DONE