You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@buildr.apache.org by dj...@apache.org on 2010/11/24 21:05:21 UTC

svn commit: r1038793 - /buildr/trunk/lib/buildr/scala/shell.rb

Author: djspiewak
Date: Wed Nov 24 20:05:21 2010
New Revision: 1038793

URL: http://svn.apache.org/viewvc?rev=1038793&view=rev
Log:
Fixed Scala shell when version of Scala in use is different from the version referenced by SCALA_HOME

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

Modified: buildr/trunk/lib/buildr/scala/shell.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/scala/shell.rb?rev=1038793&r1=1038792&r2=1038793&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/scala/shell.rb (original)
+++ buildr/trunk/lib/buildr/scala/shell.rb Wed Nov 24 20:05:21 2010
@@ -35,7 +35,7 @@ module Buildr
 
         java_args = jrebel_args + task.java_args
 
-        props = jrebel_props(project).merge(task.properties).merge 'scala.home' => Scalac.scala_home
+        props = jrebel_props(project).merge(task.properties)
 
         Java::Commands.java 'scala.tools.nsc.MainGenericRunner',
                             '-cp', cp.join(File::PATH_SEPARATOR),