@@ -46,7 +46,7 @@ module Buildr JRUBY_VERSION = '1.3.1' - class << self + class << self def lang :none end @@ -97,7 +97,7 @@ module Buildr } else cp = project.compile.dependencies + [ - "org.jruby:jruby-complete:jar:#{JRUBY_VERSION}", + jruby_artifact, project.path_to(:target, :classes) ] @@ -110,8 +110,14 @@ module Buildr end private def jruby_home - @home ||= ENV['JRUBY_HOME'] + @jruby_home ||= RUBY_PLATFORM =~ /java/ ? Config::CONFIG['prefix'] : ENV['JRUBY_HOME'] + end + + def jruby_artifact + version = Buildr.settings.build['jruby'] || JRUBY_VERSION + "org.jruby:jruby-complete:jar:#{version}" end + end class Clojure < Base lib/buildr/core/shell.rb 35439240de7d5727b63046642192877da98e01c9 Victor Borja vborja@apache.org http://github.com/vic/buildr/commit/16df25739e729dbc5519b9f8412065cdae103390 16df25739e729dbc5519b9f8412065cdae103390 2009-07-25T20:33:15-07:00 2009-07-25T20:33:15-07:00 Don't download the jruby-complete artifact if running Buildr with jruby. Allow jruby version to be customized on build.yml settings (like jruby based test frameworks) git-svn-id: https://svn.apache.org/repos/asf/buildr/trunk@797862 13f79535-47bb-0310-9956-ffa450edef68 ae2c1ba09bcd24a2532df4899c22344e0fae73ca Victor Borja vborja@apache.org