rjb 1.1.8 → 1.1.9

data/ChangeLog

@@ -1,3 +1,11 @@
+Thu Sep 10 arton
+ *ext/load.c
+	Correct previous code (always reload jvm if OSX < Snow Leopard)
+	Clear DL's exception if success
+ *ext/rjb.c
+	RJB_VERSION -> 1.1.9
+ *ext/rjbexception.c
+	fit arguments for rb_raise to shut warning down
 Mon Sep 07 arton
  *ext/load.c
 	Check no compat type dylib after loading was failed (for Snow Leopard)

data/ext/extconf.h

@@ -0,0 +1,9 @@
+#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

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 91 2009-09-07 14:13:17Z arton $
+ * $Id: load.c 96 2009-09-10 13:57:04Z arton $
  */
 
 #include <stdlib.h>
@@ -270,12 +270,19 @@ int rjb_create_jvm(JNIEnv** pjenv, JavaVMInitArgs* vm_args, char* userpath, VALU
             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;
 	}
+#if defined(__APPLE__) && defined(__MACH__)
+        }
+#endif
+#if RJB_RUBY_VERSION_CODE < 190
+        ruby_errinfo = Qnil;
+#else
+        rb_set_errinfo(Qnil);
+#endif
     }
 
     if (NIL_P(getdefaultjavavminitargsfunc))

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 91 2009-09-07 14:13:17Z arton $
+ * $Id: rjb.c 93 2009-09-10 13:43:04Z arton $
  */
 
-#define RJB_VERSION "1.1.8"
+#define RJB_VERSION "1.1.9"
 
 #include "ruby.h"
 #include "extconf.h"

data/ext/rjbexception.c

@@ -12,7 +12,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
- * $Id: rjbexception.c 75 2008-08-14 10:03:52Z arton $
+ * $Id: rjbexception.c 94 2009-09-10 13:54:42Z arton $
  */
 
 #include "ruby.h"
@@ -132,7 +132,7 @@ void rjb_check_exception(JNIEnv* jenv, int t)
 	    }
 	    else
 	    {
-		rb_raise(rexp, msg);
+                rb_raise(rexp, "%s", msg);
 	    }
         }
     }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rjb
 version: !ruby/object:Gem::Version 
-  version: 1.1.8
+  version: 1.1.9
 platform: ruby
 authors: 
 - arton
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-07 00:00:00 +09:00
+date: 2009-09-10 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -27,6 +27,7 @@ files:
 - ext/riconv.c
 - ext/rjb.c
 - ext/rjbexception.c
+- ext/extconf.h
 - ext/jniwrap.h
 - ext/jp_co_infoseek_hp_arton_rjb_RBridge.h
 - ext/riconv.h