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

Log version in JPS plugin

Browse Source 
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.
This commit is contained in:
Andrey Breslav
2013-07-25 15:51:23 +04:00
parent e11f130278
commit 387bf2601b
4 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TeamCityBuild.xml
+1 -1
View File
@@ -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" />
compiler/cli/src/org/jetbrains/jet/cli/common/CompilerVersion.java → compiler/cli/cli-common/src/org/jetbrains/jet/cli/common/KotlinVersion.java
+1 -1
View File
@@ -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@";
compiler/cli/src/org/jetbrains/jet/cli/common/CLICompiler.java
+1 -1
View File
@@ -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);
}
jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java
+4 -1
View File
@@ -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