Ant task: support 'failOnError' attribute in kotlinc and withKotlin

ant/src/org/jetbrains/kotlin/ant/KotlinCompilerAdapter.java

@@ -56,6 +56,7 @@ public class KotlinCompilerAdapter extends Javac13 {
         Javac javac = getJavac();
 
         Kotlin2JvmTask kotlinc = new Kotlin2JvmTask();
+        kotlinc.setFailOnError(javac.getFailonerror());
         kotlinc.setOutput(javac.getDestdir());
 
         Path classpath = javac.getClasspath();
@@ -70,6 +71,10 @@ public class KotlinCompilerAdapter extends Javac13 {
         kotlinc.setExternalAnnotations(externalAnnotations);
 
         kotlinc.execute();
+        if (!Integer.valueOf(0).equals(kotlinc.getExitCode())) {
+            // Don't run javac if failOnError = false and there were errors on Kotlin sources
+            return false;
+        }
 
         javac.log("Running javac...");
 

ant/src/org/jetbrains/kotlin/ant/KotlinCompilerBaseTask.kt

@@ -16,16 +16,16 @@
 
 package org.jetbrains.kotlin.ant
 
+import org.apache.tools.ant.AntClassLoader
+import org.apache.tools.ant.BuildException
 import org.apache.tools.ant.Task
+import org.apache.tools.ant.types.Commandline
 import org.apache.tools.ant.types.Path
 import org.apache.tools.ant.types.Reference
-import java.io.File
-import org.apache.tools.ant.BuildException
-import org.apache.tools.ant.types.Commandline
-import java.io.PrintStream
-import org.apache.tools.ant.AntClassLoader
-import java.lang.ref.SoftReference
 import org.jetbrains.kotlin.preloading.ClassPreloadingUtils
+import java.io.File
+import java.io.PrintStream
+import java.lang.ref.SoftReference
 import java.net.JarURLConnection
 
 object CompilerClassLoaderHolder {
@@ -66,11 +66,14 @@ public abstract class KotlinCompilerBaseTask : Task() {
     public var nowarn: Boolean = false
     public var verbose: Boolean = false
     public var printVersion: Boolean = false
+    public var failOnError: Boolean = false
 
     public var noStdlib: Boolean = false
 
     public val additionalArguments: MutableList<Commandline.Argument> = arrayListOf()
 
+    internal var exitCode: Int? = null
+
     public fun createSrc(): Path {
         val srcPath = src
         if (srcPath == null) {
@@ -118,10 +121,10 @@ public abstract class KotlinCompilerBaseTask : Task() {
 
         log("Compiling ${src!!.list().toList()} => [${output!!.canonicalPath}]");
 
-        val exitCode = exec(compiler, System.err, args.copyToArray())
+        val result = exec(compiler, System.err, args.toTypedArray())
+        exitCode = (result as Enum<*>).ordinal()
 
-        // TODO: support failOnError attribute of javac
-        if ((exitCode as Enum<*>).ordinal() != 0) {
+        if (failOnError && exitCode != 0) {
             throw BuildException("Compile failed; see the compiler error output for details.")
         }
     }