svn commit: r1160920 - in /buildr/trunk: CHANGELOG lib/buildr/scala/doc.rb

[bo...@apache.org]

Author: boisvert
Date: Tue Aug 23 22:49:06 2011
New Revision: 1160920

URL: http://svn.apache.org/viewvc?rev=1160920&view=rev
Log:
Fixed:  scaladoc generation with scala 2.9.x

Modified:
    buildr/trunk/CHANGELOG
    buildr/trunk/lib/buildr/scala/doc.rb

Modified: buildr/trunk/CHANGELOG
URL: http://svn.apache.org/viewvc/buildr/trunk/CHANGELOG?rev=1160920&r1=1160919&r2=1160920&view=diff
==============================================================================
--- buildr/trunk/CHANGELOG (original)
+++ buildr/trunk/CHANGELOG Tue Aug 23 22:49:06 2011
@@ -1,4 +1,5 @@
 1.4.7 (Pending)
+* Fixed:  scaladoc generation with scala 2.9.x
 * Change: Stop pretty printing the Intellij IDEA project files to avoid IDEA breaking
           in the presence of non-normalized whitespace content.
 * Change: Change the Intellij IDEA extension to always rebuild the project files.

Modified: buildr/trunk/lib/buildr/scala/doc.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/scala/doc.rb?rev=1160920&r1=1160919&r2=1160920&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/scala/doc.rb (original)
+++ buildr/trunk/lib/buildr/scala/doc.rb Tue Aug 23 22:49:06 2011
@@ -59,7 +59,12 @@ module Buildr
           trace (['scaladoc'] + cmd_args).join(' ')
           Java.load
           begin
-            Java.scala.tools.nsc.ScalaDoc.process(cmd_args.to_java(Java.java.lang.String))
+            if Scala.version?(2.7, 2.8)
+              Java.scala.tools.nsc.ScalaDoc.process(cmd_args.to_java(Java.java.lang.String))
+            else
+              scaladoc = Java.scala.tools.nsc.ScalaDoc.new
+              scaladoc.process(cmd_args.to_java(Java.java.lang.String))
+            end
           rescue => e
             fail 'Failed to generate Scaladocs, see errors above: ' + e
           end