in scala4ant, errors will cause ant script to s...

in scala4ant, errors will cause ant script to stop. Before, it just ran
through

2 files changed, 10 insertions, 1 deletions

diff --git a/sources/scala/tools/scala4ant/AntAdaptor.scala b/sources/scala/tools/scala4ant/AntAdaptor.scala
index b61816da0a..0d1c0653a3 100644
--- a/sources/scala/tools/scala4ant/AntAdaptor.scala
+++ b/sources/scala/tools/scala4ant/AntAdaptor.scala
@@ -38,6 +38,7 @@ package scala.tools.scala4ant {
       var result = true;
       try {
         scala.tools.scalac.Main.main1( false, args );
+
       } catch {
         case e:Throwable => {
           result = false;
@@ -46,6 +47,10 @@ package scala.tools.scala4ant {
         ex.printStackTrace();
         if( !result ) throw new BuildException("exception occurred:"+ex.getClass());
       }
+
+      if( scala.tools.scalac.Main.reporter.errors() > 0 )
+        throw new BuildException("there were compile errors");
+
       result;
     }
 
diff --git a/sources/scala/tools/scalac/Main.scala b/sources/scala/tools/scalac/Main.scala
index 5e54b968bb..838019e53f 100644
--- a/sources/scala/tools/scalac/Main.scala
+++ b/sources/scala/tools/scalac/Main.scala
@@ -6,7 +6,7 @@
 ** $Id$
 \*                                                                      */
 
-import scala.tools.util.ConsoleReporter;
+import scala.tools.util.{AbstractReporter, ConsoleReporter};
 import scalac.{CompilerCommand, Global => scalac_Global};
 import scalac.symtab.classfile.CLRTypes;
 
@@ -27,8 +27,12 @@ object Main {
 
   def main(args: Array[String]): unit = main1( true, args );
 
+  // ant task needs to be aware of reporter.errors
+  var reporter: AbstractReporter = _;
+
   def main1( exitOnError:boolean, args: Array[String] ):unit = {
     val reporter = new ConsoleReporter();
+    this.reporter = reporter;
     val command = new CompilerCommand(
       PRODUCT, VERSION, reporter, new CompilerPhases());
     var ok = true;