svn commit: r925718 - /buildr/trunk/lib/buildr/scala/compiler.rb

[dj...@apache.org]

Author: djspiewak
Date: Sun Mar 21 02:44:11 2010
New Revision: 925718

URL: http://svn.apache.org/viewvc?rev=925718&view=rev
Log:
Added scalac make strategy option under 2.8 (so that it can be disabled)

Modified:
    buildr/trunk/lib/buildr/scala/compiler.rb

Modified: buildr/trunk/lib/buildr/scala/compiler.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/scala/compiler.rb?rev=925718&r1=925717&r2=925718&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/scala/compiler.rb (original)
+++ buildr/trunk/lib/buildr/scala/compiler.rb Sun Mar 21 02:44:11 2010
@@ -141,13 +141,14 @@ module Buildr::Scala
       options[:warnings] = verbose if options[:warnings].nil?
       options[:deprecation] ||= false
       options[:optimise] ||= false
+      options[:make] ||= :transitivenocp if Scala.compatible_28?
       options[:javac] ||= {}
 
       @java = Javac.new(project, options[:javac])
     end
 
     def compile(sources, target, dependencies) #:nodoc:
-      check_options options, OPTIONS
+      check_options(options, OPTIONS + (Scala.compatible_28? ? [:make] : []))
 
       java_sources = java_sources(sources)
       enable_dep_tracing = Scala.compatible_28? && java_sources.empty?
@@ -165,7 +166,7 @@ module Buildr::Scala
         dep_dir = File.expand_path(target)
         Dir.mkdir dep_dir unless File.exists? dep_dir
 
-        cmd_args << '-make:transitivenocp'
+        cmd_args << '-make:' + options[:make].to_s
         cmd_args << '-dependencyfile'
         cmd_args << File.expand_path('.scala-deps', dep_dir)
       end