rjb 1.3.8 → 1.3.9

data/ChangeLog

@@ -1,3 +1,8 @@
+Sat Jan 28 arton
+ *ext/rjb.c
+	RJB_VERSION -> 1.3.9
+ *ext/jniwrap.h
+	skip __int64 definition if already defined (for latest mingw/gcc).
 Sat Dec 03 arton
  *ext/rjb.c
 	RJB_VERSION -> 1.3.8

data/ext/extconf.h

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

data/ext/jniwrap.h

@@ -12,7 +12,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
- * $Id: jniwrap.h 4 2006-09-11 15:21:38Z arton $
+ * $Id: jniwrap.h 181 2012-01-28 05:28:41Z arton $
  */
 #ifndef _Included_jniwrap
 #define _Included_jniwrap
@@ -21,7 +21,9 @@ extern "C" {
 #endif
 
 #if defined(__GNUC__) && (defined(__CYGWIN32__) || defined(__MINGW32__))
-typedef long long __int64;
+ #if !defined(__int64)
+  typedef long long __int64;
+ #endif
 #endif
 
 #include <jni.h>

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 167 2011-07-15 17:40:25Z arton $
+ * $Id: load.c 180 2011-12-05 16:34:29Z arton $
  */
 
 #include <stdlib.h>
@@ -271,6 +271,15 @@ static int load_bridge(JNIEnv* jenv)
     return 0;
 }
 
+void rjb_unload_vm()
+{
+    if (RTEST(jvmdll))
+    {
+        rb_funcall(jvmdll, rb_intern("close"), 0);
+        jvmdll = Qnil;
+    }
+}
+
 int rjb_create_jvm(JNIEnv** pjenv, JavaVMInitArgs* vm_args, char* userpath, VALUE argv)
 {
     static JavaVMOption soptions[] = {

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 178 2011-12-02 16:14:56Z arton $
+ * $Id: rjb.c 181 2012-01-28 05:28:41Z arton $
  */
 
-#define RJB_VERSION "1.3.8"
+#define RJB_VERSION "1.3.9"
 
 #include "ruby.h"
 #include "extconf.h"
@@ -1892,6 +1892,7 @@ static VALUE rjb_s_unload(int argc, VALUE* argv, VALUE self)
         (*jenv)->ExceptionClear(jenv);
         result = (*rjb_jvm)->DestroyJavaVM(rjb_jvm);
         rjb_jvm = NULL;
+        rjb_unload_vm();
     }
     return INT2NUM(result);
 }

data/ext/rjb.h

@@ -12,7 +12,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
- * $Id: rjb.h 139 2010-09-21 17:32:57Z arton $
+ * $Id: rjb.h 180 2011-12-05 16:34:29Z arton $
  * $Log: rjb.h,v $
  * Revision 1.1  2005/01/16 17:36:10  arton
  * Initial revision
@@ -72,6 +72,7 @@ extern JNIEnv* rjb_attach_current_thread(void);
 extern jclass rjb_find_class(JNIEnv* jenv, VALUE name);
 extern void rjb_release_string(JNIEnv *jenv, jstring str, const char* chrs);
 extern VALUE rjb_load_vm_default();
+extern void rjb_unload_vm();
 extern VALUE rjb_safe_funcall(VALUE args);
 extern VALUE jv2rv(JNIEnv* jenv, jvalue val);
 extern jobject get_systemloader(JNIEnv* jenv);

data/readme.txt

@@ -1,28 +1,35 @@
-Rjb is Ruby-Java bridge using Java Native Interface.
-
-How to install
-
-you need to install Java2 sdk, and setup JAVA_HOME enviromental varible except for OS X.
-I assume that OS X's JAVA_HOME is fixed as '/System/Library/Frameworks/JavaVM.framework'.
-
-then,
-
-ruby setup.rb config
-ruby setup.rb setup
-
-(in Unix)
-sudo ruby setup.rb install
-or
-(in win32)
-ruby setup.rb install
-
-How to test
-in Win32
-cd test
-ruby test.rb
-
-in Unix
-see test/readme.unix 
-you must set LD_LIBRARY_PATH environmental variable to run rjb.
-
-artonx@yahoo.co.jp
+Rjb is Ruby-Java bridge using Java Native Interface.
+
+How to install
+
+you need to install Java2 sdk, and setup JAVA_HOME enviromental varible except for OS X.
+I assume that OS X's JAVA_HOME is fixed as '/System/Library/Frameworks/JavaVM.framework'.
+
+then,
+
+ruby setup.rb config
+ruby setup.rb setup
+
+(in Unix)
+sudo ruby setup.rb install
+or
+(in win32)
+ruby setup.rb install
+
+How to test
+in Win32
+cd test
+ruby test.rb
+
+in Unix
+see test/readme.unix 
+you must set LD_LIBRARY_PATH environmental variable to run rjb.
+
+-- Notice for opening non-ASCII 7bit filename
+If you'll plan to open the non-ascii character named file by Java class through Rjb, it may require to set LC_ALL environment variable in you sciprt.
+For example in Rails, set above line in production.rb as your environment.
+ENV['LC_ALL'] = 'en_us.utf8' # or ja_JP.utf8 etc.
+ cf: http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4733494  
+   (Thanks Paul for this information).
+
+artonx@yahoo.co.jp

metadata

@@ -2,7 +2,7 @@
 name: rjb
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.3.8
+  version: 1.3.9
 platform: ruby
 authors: 
 - arton
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-02 00:00:00 Z
+date: 2012-01-28 00:00:00 Z
 dependencies: []
 
 description: |
@@ -31,6 +31,7 @@ files:
 - ext/rjb.c
 - ext/jp_co_infoseek_hp_arton_rjb_RBridge.h
 - ext/riconv.h
+- ext/extconf.h
 - ext/jniwrap.h
 - ext/rjb.h
 - ext/depend
@@ -44,11 +45,9 @@ files:
 - test/test_unload.rb
 - test/test_osxjvm.rb
 - test/gctest.rb
-- test/jp/co/infoseek/hp/arton/rjb/Base.class
 - test/jp/co/infoseek/hp/arton/rjb/IBase.class
 - test/jp/co/infoseek/hp/arton/rjb/Test.class
 - test/jp/co/infoseek/hp/arton/rjb/Test$TestTypes.class
-- test/jp/co/infoseek/hp/arton/rjb/ExtBase.class
 - test/TwoCaller.class
 - test/Two.class
 - test/rjbtest.jar