svn commit: r619131 - /incubator/buildr/trunk/lib/java/compilers.rb

[bo...@apache.org]

Author: boisvert
Date: Wed Feb  6 12:03:53 2008
New Revision: 619131

URL: http://svn.apache.org/viewvc?rev=619131&view=rev
Log:
1) Don't use FSC by default (classpath retention may cause trouble)
2) Use compiler's process() entrypoint since main() calls System.exit after compilation

Modified:
    incubator/buildr/trunk/lib/java/compilers.rb

Modified: incubator/buildr/trunk/lib/java/compilers.rb
URL: http://svn.apache.org/viewvc/incubator/buildr/trunk/lib/java/compilers.rb?rev=619131&r1=619130&r2=619131&view=diff
==============================================================================
--- incubator/buildr/trunk/lib/java/compilers.rb (original)
+++ incubator/buildr/trunk/lib/java/compilers.rb Wed Feb  6 12:03:53 2008
@@ -99,7 +99,7 @@
         end
 
         def use_fsc
-          !(ENV["USE_FSC"] =~ /^(no|off|false)$/i)
+          ENV["USE_FSC"] =~ /^(yes|on|true)$/i
         end
       end
 
@@ -135,8 +135,8 @@
               fail 'Failed to compile, see errors above'
           else
             Java.load
-            Java.scala.tools.nsc.Main.main(cmd_args.to_java(Java.java.lang.String)) == 0 or
-              fail 'Failed to compile, see errors above'
+            Java.scala.tools.nsc.Main.process(cmd_args.to_java(Java.java.lang.String))
+            fail 'Failed to compile, see errors above' if Java.scala.tools.nsc.Main.reporter.hasErrors
           end
         end
       end