svn commit: r797862 - /buildr/trunk/lib/buildr/core/shell.rb

[vborja]

Author: vborja
Date: Sun Jul 26 03:33:15 2009
New Revision: 797862

URL: http://svn.apache.org/viewvc?rev=797862&view=rev
Log:
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)

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=797862&r1=797861&r2=797862&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/core/shell.rb (original)
+++ buildr/trunk/lib/buildr/core/shell.rb Sun Jul 26 03:33:15 2009
@@ -46,7 +46,7 @@
       
       JRUBY_VERSION = '1.3.1'
       
-      class << self
+      class << self        
         def lang
           :none
         end
@@ -97,7 +97,7 @@
           }
         else
           cp = project.compile.dependencies + [
-              "org.jruby:jruby-complete:jar:#{JRUBY_VERSION}",
+              jruby_artifact,
               project.path_to(:target, :classes)
             ]
           
@@ -110,8 +110,14 @@
       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