From cfa8694eb749c0db2773d5ebee5c98b61b2aa421 Mon Sep 17 00:00:00 2001 From: "Natalia.Ukhorskaya" Date: Thu, 8 Aug 2013 14:02:29 +0400 Subject: [PATCH] Disable kotlin-jps-plugin when java-jps-plugin is disabled Original commit: 2cc4638b099fb4fd43a68ba5639ed614fd4d6264 --- .../src/org/jetbrains/jet/jps/build/KotlinBuilder.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java index a5477e2ae50..e215ecb5955 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java @@ -30,6 +30,7 @@ import org.jetbrains.jps.ModuleChunk; import org.jetbrains.jps.builders.DirtyFilesHolder; import org.jetbrains.jps.builders.java.JavaSourceRootDescriptor; import org.jetbrains.jps.incremental.*; +import org.jetbrains.jps.incremental.java.JavaBuilder; import org.jetbrains.jps.incremental.messages.BuildMessage; import org.jetbrains.jps.incremental.messages.CompilerMessage; import org.jetbrains.jps.model.module.JpsModule; @@ -72,6 +73,10 @@ public class KotlinBuilder extends ModuleLevelBuilder { OutputConsumer outputConsumer ) throws ProjectBuildException, IOException { MessageCollector messageCollector = new MessageCollectorAdapter(context); + if (!JavaBuilder.IS_ENABLED.get(context, Boolean.TRUE)) { + messageCollector.report(INFO, "Kotlin JPS plugin is disabled", CompilerMessageLocation.NO_LOCATION); + return ExitCode.NOTHING_DONE; + } messageCollector.report(INFO, "Kotlin JPS plugin version " + KotlinVersion.VERSION, CompilerMessageLocation.NO_LOCATION);