rjb 1.1.7 → 1.1.8

data/ChangeLog

@@ -1,3 +1,8 @@
+Mon Sep 07 arton
+ *ext/load.c
+	Check no compat type dylib after loading was failed (for Snow Leopard)
+ *ext/rjb.c
+	RJB_VERSION -> 1.1.8
 Sun Feb 15 arton
  *test/test/rb
 	add $KCODE and magic comment for iconv

data/ext/load.c

@@ -12,7 +12,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
- * $Id: load.c 85 2009-02-04 16:14:22Z kuwa1 $
+ * $Id: load.c 91 2009-09-07 14:13:17Z arton $
  */
 
 #include <stdlib.h>
@@ -45,7 +45,7 @@
  #endif
  #define CLASSPATH_SEP  ';'
 #elif defined(__APPLE__) && defined(__MACH__)
-  #define JVMDLL "%s/Libraries/libjvm_compat.dylib"
+  static char* JVMDLL = "%s/Libraries/libjvm_compat.dylib";
   #define DIRSEPARATOR '/'
   #define CLASSPATH_SEP ':'
   #define HOME_NAME "/Home"
@@ -82,6 +82,14 @@
  #define CLASSPATH_SEP ':'
 #endif
 
+#if defined(__APPLE__) && defined(__MACH__)
+ static char* CREATEJVM = "JNI_CreateJavaVM";
+ static char* GETDEFAULTJVMINITARGS = "JNI_GetDefaultJavaVMInitArgs";
+#else
+ #define CREATEJVM "JNI_CreateJavaVM"
+ #define GETDEFAULTJVMINITARGS "JNI_GetDefaultJavaVMInitArgs"
+#endif
+
 typedef int (*GETDEFAULTJAVAVMINITARGS)(void*);
 typedef int (*CREATEJAVAVM)(JavaVM**, JNIEnv**, void*);
 
@@ -172,11 +180,11 @@ static int load_jvm(char* jvmtype)
     }
     /* 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("JNI_GetDefaultJavaVMInitArgs"), 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("JNI_CreateJavaVM"), 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("JNI_GetDefaultJavaVMInitArgs"));
-    createjavavmfunc = rb_funcall(jvmdll, rb_intern("[]"), 1, rb_str_new2("JNI_CreateJavaVM"));
+    getdefaultjavavminitargsfunc = rb_funcall(jvmdll, rb_intern("[]"), 1, rb_str_new2(GETDEFAULTJVMINITARGS));
+    createjavavmfunc = rb_funcall(jvmdll, rb_intern("[]"), 1, rb_str_new2(CREATEJVM));
 #endif
     return 1;
 }
@@ -256,7 +264,15 @@ int rjb_create_jvm(JNIEnv** pjenv, JavaVMInitArgs* vm_args, char* userpath, VALU
 
     if (!RTEST(jvmdll))
     {
-	if (!(load_jvm(JVM_TYPE) || load_jvm(ALT_JVM_TYPE)))
+#if defined(__APPLE__) && defined(__MACH__)
+        if (!(load_jvm(JVM_TYPE) || load_jvm(ALT_JVM_TYPE)))
+        {
+            JVMDLL = "%s/Libraries/libjvm.dylib";
+            CREATEJVM = "JNI_CreateJavaVM_Impl";
+            GETDEFAULTJVMINITARGS = "JNI_GetDefaultJavaVMInitArgs_Impl";
+        }
+#endif
+        if (!(load_jvm(JVM_TYPE) || load_jvm(ALT_JVM_TYPE)))
 	{
 	    return -1;
 	}

data/ext/rjb.c

@@ -12,10 +12,10 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
- * $Id: rjb.c 89 2009-02-15 12:31:40Z arton $
+ * $Id: rjb.c 91 2009-09-07 14:13:17Z arton $
  */
 
-#define RJB_VERSION "1.1.7"
+#define RJB_VERSION "1.1.8"
 
 #include "ruby.h"
 #include "extconf.h"

metadata

@@ -1,43 +1,35 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
-specification_version: 1
 name: rjb
 version: !ruby/object:Gem::Version 
-  version: 1.1.7
-date: 2009-02-15 00:00:00 +09:00
-summary: Ruby Java bridge
-require_paths: 
-- lib
-email: artonx@gmail.com
-homepage: http://rjb.rubyforge.org/
-rubyforge_project: 
-description: RJB is a bridge program that connect between Ruby and Java with Java Native Interface.
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: false
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: 1.8.2
-  version: 
+  version: 1.1.8
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - arton
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2009-09-07 00:00:00 +09:00
+default_executable: 
+dependencies: []
+
+description: RJB is a bridge program that connect between Ruby and Java with Java Native Interface.
+email: artonx@gmail.com
+executables: []
+
+extensions: 
+- ext/extconf.rb
+extra_rdoc_files: []
+
 files: 
 - ext/RBridge.java
-- ext/rjbexception.c
-- ext/riconv.c
 - ext/load.c
+- ext/riconv.c
 - ext/rjb.c
+- ext/rjbexception.c
 - ext/jniwrap.h
-- ext/riconv.h
 - ext/jp_co_infoseek_hp_arton_rjb_RBridge.h
-- ext/extconf.h
+- ext/riconv.h
 - ext/rjb.h
 - ext/depend
 - data/rjb/jp/co/infoseek/hp/arton/rjb/RBridge.class
@@ -45,27 +37,41 @@ files:
 - samples/filechooser.rb
 - test/gctest.rb
 - test/test.rb
+- test/jp/co/infoseek/hp/arton/rjb/Base.class
 - test/jp/co/infoseek/hp/arton/rjb/ExtBase.class
-- test/jp/co/infoseek/hp/arton/rjb/Test.class
 - test/jp/co/infoseek/hp/arton/rjb/IBase.class
-- test/jp/co/infoseek/hp/arton/rjb/Base.class
 - test/jp/co/infoseek/hp/arton/rjb/Test$TestTypes.class
+- test/jp/co/infoseek/hp/arton/rjb/Test.class
 - COPYING
 - ChangeLog
 - readme.sj
 - readme.txt
-test_files: 
-- test/test.rb
+has_rdoc: false
+homepage: http://rjb.rubyforge.org/
+post_install_message: 
 rdoc_options: []
 
-extra_rdoc_files: []
-
-executables: []
-
-extensions: 
-- ext/extconf.rb
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: 1.8.2
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: 
 - none
 - JDK 5.0
-dependencies: []
-
+rubyforge_project: 
+rubygems_version: 1.3.1
+signing_key: 
+specification_version: 2
+summary: Ruby Java bridge
+test_files: 
+- test/test.rb

data/ext/extconf.h

@@ -1,9 +0,0 @@
-#ifndef EXTCONF_H
-#define EXTCONF_H
-#define HAVE_JNI_H 1
-#define HAVE_DL_H 1
-#define HAVE_NL_LANGINFO 1
-#define HAVE_SETLOCALE 1
-#define HAVE_GETENV 1
-#define RJB_RUBY_VERSION_CODE 187
-#endif