rjb 1.6.1 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f75da380b876687e4355f11f4637d408ed0aad22b83ed03ff8d766cd96352ba
-  data.tar.gz: 30fa4dd4c8e197722cc799a3258a629016067dc16022c4100f934ec7074388b7
+  metadata.gz: bb67ad89857525ce2a6443cb151d5f48dc05a5338ad09e28714b1706cecaa5d6
+  data.tar.gz: 42ab7af0fab4e999d025bc4c7957771a9372699dcd0e15664a741eb0b008aea5
 SHA512:
-  metadata.gz: 6637eb828550bf98bc4ed693428d209dc5d24f042e29f8a0f48cde1d32e764c6fb67adb64f1a2e67e5ca5f2e815dfd29bbc9f8bdfe9f18a5ad0e12599c4b0465
-  data.tar.gz: 501f7f908fe7e6a3ceb33aa07fa8f4903554ccbbfea22d39ea5e213a85f4e7b7e5fd567ce0b1a43d8afba96aeebd9f718783d21e158d7a4042661f43e5888111
+  metadata.gz: ce14080ae984eaa12dafd0433fd5a902fa9dcb5d731f34e674a78d20ae9e04634512c7f40086283fcad7db1064f3a750c1b8c35802c8f1fd75add365cbcf3c0a
+  data.tar.gz: ea0a88e9752dfd8407bd9130b1548589b0fdca90d7a962bef175e504183775817e2818abcb833bae7ab65cfb88e4dcda04c666388b3f2c40235f4b93db396a56

data/ChangeLog

@@ -1,3 +1,10 @@
+Sat Aug 1 2020 arton
+ * ext/rjb.c
+	RJB_VERSION -> 1.6.2
+ * ext/load.c
+	support OpenJDK directory structure (without jre)
+ * lib/rjb.rb
+	change copyright notice
 Wed Jul 17 2019 arton
  * ext/rjb.c
 	RJB_VERSION -> 1.6.1

data/ext/extconf.h

@@ -4,5 +4,5 @@
 #define HAVE_NL_LANGINFO 1
 #define HAVE_SETLOCALE 1
 #define HAVE_GETENV 1
-#define RJB_RUBY_VERSION_CODE 270
+#define RJB_RUBY_VERSION_CODE 271
 #endif

data/ext/load.c

@@ -1,6 +1,6 @@
 /*
  * Rjb - Ruby <-> Java Bridge
- * Copyright(c) 2004,2005,2006,2009,2010,2011 arton
+ * Copyright(c) 2004,2005,2006,2009,2010,2011,2020 arton
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -38,9 +38,11 @@
 #if defined(_WIN32) || defined(__CYGWIN__)
  #if defined(__CYGWIN__)
   #define JVMDLL "%s/jre/bin/%s/jvm.dll"
+  #define OPENJDK_JVMDLL "%s/bin/%s/jvm.dll"
   #define DIRSEPARATOR '/'
  #else
   #define JVMDLL "%s\\jre\\bin\\%s\\jvm.dll"
+  #define OPENJDK_JVMDLL "%s\\bin\\%s\\jvm.dll"
   #define DIRSEPARATOR '\\'
   #if defined(_WIN64)
     #undef JVM_TYPE
@@ -61,6 +63,7 @@
   #define JVM_TYPE "j9vm"
 #elif defined(__hpux)
   #define JVMDLL "%s/jre/lib/%s/%s/libjvm.sl"
+  #define OPENJDK_JVMDLL "%s/lib/%s/libjvm.sl"
   #define ARCH "PA_RISC"
   #undef JVM_TYPE
   #define JVM_TYPE "server"
@@ -88,6 +91,7 @@
   #include <sys/systeminfo.h>
  #endif
  #define JVMDLL "%s/jre/lib/%s/%s/libjvm.so"
+ #define OPENJDK_JVMDLL "%s/lib/%s/libjvm.so"
  #define DIRSEPARATOR '/'
  #define CLASSPATH_SEP ':'
 #endif
@@ -123,12 +127,20 @@ static int open_jvm(char* libpath)
     size_t i;
     int state;
 
+    if (rb_funcall(rb_cFile, rb_intern("exist?"), 1, rb_str_new2(libpath)) == RUBY_Qfalse)
+    {
+        if (RTEST(ruby_verbose))
+        {
+            fprintf(stderr, "Rjb::load try to find but not exist %s\n", libpath);
+        }
+        return 0;
+    }
 #if defined(RUBINIUS)
     i = 1;
 #else
     i = 0;
 #endif
-    for (; i < COUNTOF(DLLibs); i++) 
+    for (; i < COUNTOF(DLLibs); i++)
     {
         state = 0;
         rb_protect(safe_require, rb_str_new2(DLLibs[i]), &state);
@@ -137,7 +149,7 @@ static int open_jvm(char* libpath)
         {
             if (i > 0)
             {
-                rb_raise(rb_eRuntimeError, "Constants DL and Fiddle is not defined.");
+                rb_raise(rb_eRuntimeError, "Constants DL or Fiddle is not defined.");
                 return 0;
             }
         }
@@ -163,8 +175,8 @@ static int open_jvm(char* libpath)
     }
     /* get function pointers of JNI */
 #if RJB_RUBY_VERSION_CODE < 190
-    getdefaultjavavminitargsfunc = rb_funcall(rb_funcall(rb_funcall(jvmdll, rb_intern("[]"), 2, rb_str_new2(GETDEFAULTJVMINITARGS), rb_str_new2("IP")), rb_intern("to_ptr"), 0), rb_intern("to_i"), 0); 
-    createjavavmfunc = rb_funcall(rb_funcall(rb_funcall(jvmdll, rb_intern("[]"), 2, rb_str_new2(CREATEJVM), rb_str_new2("IPPP")), rb_intern("to_ptr"), 0), rb_intern("to_i"), 0); 
+    getdefaultjavavminitargsfunc = rb_funcall(rb_funcall(rb_funcall(jvmdll, rb_intern("[]"), 2, rb_str_new2(GETDEFAULTJVMINITARGS), rb_str_new2("IP")), rb_intern("to_ptr"), 0), rb_intern("to_i"), 0);
+    createjavavmfunc = rb_funcall(rb_funcall(rb_funcall(jvmdll, rb_intern("[]"), 2, rb_str_new2(CREATEJVM), rb_str_new2("IPPP")), rb_intern("to_ptr"), 0), rb_intern("to_i"), 0);
 #else
     getdefaultjavavminitargsfunc = rb_funcall(jvmdll, rb_intern("[]"), 1, rb_str_new2(GETDEFAULTJVMINITARGS));
     createjavavmfunc = rb_funcall(jvmdll, rb_intern("[]"), 1, rb_str_new2(CREATEJVM));
@@ -184,6 +196,7 @@ static int file_exist(const char* dir, const char* file)
 
 /*
  * not completed, only valid under some circumstances.
+ * load priority: OpenJDK -> SunJDK
  */
 static int load_jvm(const char* jvmtype)
 {
@@ -236,26 +249,37 @@ static int load_jvm(const char* jvmtype)
         *(p + strlen(p) - 1) = '\0';
         jh = p;
     }
-#endif    
+#endif
     java_home = ALLOCA_N(char, strlen(jh) + 1);
     strcpy(java_home, jh);
     if (*(java_home + strlen(jh) - 1) == DIRSEPARATOR)
     {
 	*(java_home + strlen(jh) - 1) = '\0';
     }
+#if defined(__APPLE__) && defined(__MACH__)
+    libpath = ALLOCA_N(char, sizeof(JVMDLL) + strlen(java_home) + 1);
+    sprintf(libpath, JVMDLL, java_home);
+    return open_jvm(libpath);
+#else
 #if defined(_WIN32) || defined(__CYGWIN__)
     libpath = ALLOCA_N(char, sizeof(JVMDLL) + strlen(java_home)
 		       + strlen(jvmtype) + 1);
-    sprintf(libpath, JVMDLL, java_home, jvmtype);
-#elif defined(__APPLE__) && defined(__MACH__)
-    libpath = ALLOCA_N(char, sizeof(JVMDLL) + strlen(java_home) + 1);
-    sprintf(libpath, JVMDLL, java_home);
 #else /* not Windows / MAC OS-X */
     libpath = ALLOCA_N(char, sizeof(JVMDLL) + strlen(java_home)
-		       + strlen(ARCH) + strlen(jvmtype) + 1);
+                       + strlen(ARCH) + strlen(jvmtype) + 1);
+#endif
+    sprintf(libpath, OPENJDK_JVMDLL, java_home, jvmtype);
+    if (open_jvm(libpath))
+    {
+        return 1;
+    }
+#if defined(_WIN32) || defined(__CYGWIN__)
+    return 0;
+#else /* not Windows / MAC OS-X */
     sprintf(libpath, JVMDLL, java_home, ARCH, jvmtype);
 #endif
     return open_jvm(libpath);
+#endif /* __APPLE__ and __MACH */
 }
 
 static int load_bridge(JNIEnv* jenv)
@@ -269,7 +293,7 @@ static int load_bridge(JNIEnv* jenv)
     VALUE v = rb_const_get(rb_cObject, rb_intern("RjbConf"));
     v = rb_const_get(v, rb_intern("BRIDGE_FILE"));
 #else
-    VALUE v = rb_const_get_at(rb_const_get(rb_cObject, rb_intern("RjbConf")), 
+    VALUE v = rb_const_get_at(rb_const_get(rb_cObject, rb_intern("RjbConf")),
 			      rb_intern("BRIDGE_FILE"));
 #endif
     bridge = StringValuePtr(v);
@@ -352,7 +376,7 @@ int rjb_create_jvm(JNIEnv** pjenv, JavaVMInitArgs* vm_args, char* userpath, VALU
             *(p + strlen(p) - 1) = '\0';
             libjvm = p;
         }
-#endif    
+#endif
         if (libjvm == NULL || !open_jvm(libjvm))
         {
 #if defined(__APPLE__) && defined(__MACH__)
@@ -370,7 +394,7 @@ int rjb_create_jvm(JNIEnv** pjenv, JavaVMInitArgs* vm_args, char* userpath, VALU
             }
 #endif
         }
- 
+
 #if RJB_RUBY_VERSION_CODE < 190 && !defined(RUBINIUS)
         ruby_errinfo = Qnil;
 #else

data/ext/rjb.c

@@ -14,7 +14,7 @@
  *
  */
 
-#define RJB_VERSION "1.6.1"
+#define RJB_VERSION "1.6.2"
 
 #include "ruby.h"
 #include "extconf.h"

data/lib/rjb.rb

@@ -1,5 +1,5 @@
 =begin
-  Copyright(c) 2006-2010,2012 arton
+  Copyright(c) 2006-2010,2012,2020 arton
 =end
 
 require 'rbconfig'

data/test/test.rb

@@ -973,7 +973,7 @@ class TestRjb < Test::Unit::TestCase
     rescue => e
       assert e.respond_to? :print_stack_trace
       assert e.respond_to? :printStackTrace
-#      assert_false e.respond_to? :unknown_method
+      assert_false e.respond_to? :unknown_method
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rjb
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.2
 platform: ruby
 authors:
 - arton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-16 00:00:00.000000000 Z
+date: 2020-08-01 00:00:00.000000000 Z
 dependencies: []
 description: 'RJB is a bridge program that connect between Ruby and Java with Java
   Native Interface.
@@ -74,7 +74,7 @@ files:
 - test/x.rb
 homepage: https://www.artonx.org/collabo/backyard/?RubyJavaBridge
 licenses:
-- LGPL
+- LGPL-2.1-or-later
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -93,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - none
 - JDK 5.0
-rubygems_version: 3.0.1
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Ruby Java bridge