rake-compiler 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66a05703cce796eea6b36e8666adaa6d983b090954babf81a9ad9207e2c30491
-  data.tar.gz: e2a76f29210adc2fd8d2edeaeef3219856c868e1841793e800e80b8e7c77de5e
+  metadata.gz: 696eb29e8948609214395ddd4f48dc06dbb543699028810d1c971b421685beaa
+  data.tar.gz: 9c0947de89692e13350adee50106bdf5234d22a1c477a674e1a832a259b8c5f8
 SHA512:
-  metadata.gz: 18c48fa7c58ec123a34e570df747cd94397e2941d595f0e081c2b66a0868fd05abc409ad4287b7fea8a34e0767397ec5af12c61a0b9aec4bc9861900988bf32b
-  data.tar.gz: 2e0cbef56d9f8e22ebfd29b0bc56f7f398ba60f1985f1d98bff5ecd026d9bc1c71293ea333c4c195915fff988d0ed123f287754e037fad4ae55de7a01d063229
+  metadata.gz: e610e8f25275813ac474c116dd2d0767b53fd5bd4f1e3cd45004a4b0749708850cca8f3da4c1658f0b71c71b3298ad15ec620b55a17434dd520c4071c948395d
+  data.tar.gz: de264d6dcf8c7f95e7a47a8f8c74d7422cb6b9f95727e42f1590d1e361ccee1b6b505214880211306efb6a161dde0be4666e7d1fd0cffbdb040af9726211a677

data/History.txt

@@ -1,3 +1,10 @@
+=== 1.0.7 / 2019-01-04
+
+* Bugfixes:
+  * Fix a bug that JRuby class path detection is failed on
+    cross-compilation.
+    #149 #151 [Reported by Chalupa Petr][Patch by Prashant Vithani]
+
 === 1.0.6 / 2018-12-23
 
 * Enhancements:

data/lib/rake/javaextensiontask.rb

@@ -212,13 +212,34 @@ execute the Rake compilation task using the JRuby interpreter.
         rescue => e
         end
       end
+
+      # jruby_cpath might not be present from Java-9 onwards as it removes
+      # sun.boot.class.path. Check if JRUBY_HOME is set as env variable and try
+      # to find jruby.jar under JRUBY_HOME
+      unless jruby_cpath
+        jruby_home = ENV['JRUBY_HOME']
+        if jruby_home
+          candidate = File.join(jruby_home, 'lib', 'jruby.jar')
+          jruby_cpath = candidate if File.exist?(candidate)
+        end
+      end
+
+      # JRUBY_HOME is not necessarily set in JRuby-9.x
+      # Find the libdir from RbConfig::CONFIG and find jruby.jar under the
+      # found lib path
       unless jruby_cpath
         libdir = RbConfig::CONFIG['libdir']
-        if libdir.start_with? "classpath:"
-          raise 'Cannot build with jruby-complete'
+        if libdir.start_with?("uri:classloader:")
+          raise 'Cannot build with jruby-complete from Java 9 onwards'
         end
-        jruby_cpath = File.join(libdir, "jruby.jar")
+        candidate = File.join(libdir, "jruby.jar")
+        jruby_cpath = candidate if File.exist?(candidate)
       end
+
+      unless jruby_cpath
+        raise "Could not find jruby.jar. Please set JRUBY_HOME or use jruby in rvm"
+      end
+
       jruby_cpath += File::PATH_SEPARATOR + args.join(File::PATH_SEPARATOR) unless args.empty?
       jruby_cpath ? "-cp \"#{jruby_cpath}\"" : ""
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rake-compiler
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-23 00:00:00.000000000 Z
+date: 2019-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -145,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.23
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Rake-based Ruby Extension (C, Java) task generator.