Author: boisvert
Date: Thu Oct 21 16:24:58 2010
New Revision: 1026056
URL: http://svn.apache.org/viewvc?rev=1026056&view=rev
Log:
shell:clojure no longer requires CLOJURE_HOME
Modified:
buildr/trunk/lib/buildr/core/shell.rb
Modified: buildr/trunk/lib/buildr/core/shell.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/core/shell.rb?rev=1026056&r1=1026055&r2=1026056&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/core/shell.rb (original)
+++ buildr/trunk/lib/buildr/core/shell.rb Thu Oct 21 16:24:58 2010
@@ -150,11 +150,11 @@ module Buildr
end
def launch(task)
- fail 'Are we forgetting something? CLOJURE_HOME not set.' unless
clojure_home
+ clojure_jar = clojure_home ? File.expand_path('clojure.jar',
clojure_home) : "org.clojure:clojure:jar:1.2.0"
cp = project.compile.dependencies +
[ build? ? project.path_to(:target, :classes) :
project.path_to(:src, :main, :clojure),
- File.expand_path('clojure.jar', clojure_home),
+ clojure_jar,
'jline:jline:jar:0.9.94'
] + task.classpath
