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:38:49 UTC
svn commit: r1038804 - /buildr/trunk/lib/buildr/scala/shell.rb
Author: djspiewak
Date: Wed Nov 24 20:38:49 2010
New Revision: 1038804
URL: http://svn.apache.org/viewvc?rev=1038804&view=rev
Log:
Fixed JLine support with artifact fallback when we can't read it from 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=1038804&r1=1038803&r2=1038804&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/scala/shell.rb (original)
+++ buildr/trunk/lib/buildr/scala/shell.rb Wed Nov 24 20:38:49 2010
@@ -26,12 +26,12 @@ module Buildr
def launch(task)
jline = [File.expand_path("lib/jline.jar", Scalac.scala_home)].find_all { |f| File.exist? f }
+ jline = ['jline:jline:jar:0.9.94'] if jline.empty?
cp = project.compile.dependencies +
Scalac.dependencies +
[ project.path_to(:target, :classes) ] +
- task.classpath +
- jline
+ task.classpath
java_args = jrebel_args + task.java_args
@@ -41,7 +41,7 @@ module Buildr
'-cp', cp.join(File::PATH_SEPARATOR),
{
:properties => props,
- :classpath => cp,
+ :classpath => cp + jline,
:java_args => java_args
}
end