Merge pull request #147 from prashantvithani/fix-classpath

Use 'libdir' of rbconfig to get jruby classpath

Patch by Prashant Vithani. Thanks!!!

1 files changed, 6 insertions, 4 deletions

diff --git a/lib/rake/javaextensiontask.rb b/lib/rake/javaextensiontask.rb
index c862432..d467303 100644
--- a/lib/rake/javaextensiontask.rb
+++ b/lib/rake/javaextensiontask.rb
@@ -211,11 +211,13 @@ execute the Rake compilation task using the JRuby interpreter.
         end
       end
       unless jruby_cpath
-        jruby_cpath = ENV['JRUBY_PARENT_CLASSPATH'] || ENV['JRUBY_HOME'] &&
-          Dir.glob("#{File.expand_path(ENV['JRUBY_HOME'])}/lib/*.jar").
-            join(File::PATH_SEPARATOR)
+        require 'rbconfig'
+        libdir = RbConfig::CONFIG['libdir']
+        if libdir.start_with? "classpath:"
+          raise 'Cannot build with jruby-complete'
+        end
+        jruby_cpath = File.join(libdir, "jruby.jar")
       end
-      raise "JRUBY_HOME or JRUBY_PARENT_CLASSPATH are not set" unless jruby_cpath
       jruby_cpath += File::PATH_SEPARATOR + args.join(File::PATH_SEPARATOR) unless args.empty?
       jruby_cpath ? "-cp \"#{jruby_cpath}\"" : ""
     end