rjb 1.1.6-x86-mswin32-60 → 1.2.0-x86-mswin32-60

data/ChangeLog

@@ -1,3 +1,42 @@
+Sun Nov 1 arton
+ *ext/load.c
+	load jvm pointed by JVM_LIB environment variable first (suggested by Ittay Dror).
+ *ext/rjb.c
+	RJB_VERSION -> 1.2.0
+Sun Oct 11 arton
+ *ext/extconf.rb
+	add double quotation around include path for mingw compiler, original patched by Roger Pack (thanks)
+	remove double quotaion around java_home variable for existing checking by File.directoy?
+ *rjb.rake
+	adding mingw support for the older version compatibility checking
+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)
+ *ext/rjb.c
+	RJB_VERSION -> 1.1.8
+Sun Feb 15 arton
+ *test/test/rb
+	add $KCODE and magic comment for iconv
+ *ext/rjb.c
+	RJB_VERSION -> 1.1.7
+Thu Feb 5 kuwa1
+ *test/Test.java
+ *test/test.rb
+	add tests(Umlaut)
+ *ext/rjb.c
+ *ext/load.c
+ 	fix for ruby19
+Sun Nov 16 arton
+ *ext/load.c	
+	apply hpux patch, contributed by Ittay Dror. thanks
 Tue Aug 26 arton
  *ext/load.c, rjb.c, rjb.h
 	export safe_funcall under the prefix 'rjb'.

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 82 2008-08-26 12:51:51Z arton $
+ * $Id: jniwrap.h 4 2006-09-11 15:21:38Z arton $
  */
 #ifndef _Included_jniwrap
 #define _Included_jniwrap

data/ext/load.c

@@ -1,6 +1,6 @@
 /*
  * Rjb - Ruby <-> Java Bridge
- * Copyright(c) 2004,2005,2006 arton
+ * Copyright(c) 2004,2005,2006,2009 arton
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -12,7 +12,7 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
- * $Id: load.c 82 2008-08-26 12:51:51Z arton $
+ * $Id: load.c 102 2009-11-01 14:01:41Z 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"
@@ -53,7 +53,15 @@
   #define DEFAULT_HOME "/System/Library/Frameworks/JavaVM.framework"
 #elif defined(_AIX)
   #define ARCH "ppc"
+  #undef JVM_TYPE
   #define JVM_TYPE "j9vm"
+#elif defined(__hpux)
+  #define JVMDLL "%s/jre/lib/%s/%s/libjvm.sl"
+  #define ARCH "PA_RISC"
+  #undef JVM_TYPE
+  #define JVM_TYPE "server"
+  #define DIRSEPARATOR '/'
+  #define CLASSPATH_SEP ':'
 #else /* defined(_WIN32) || defined(__CYGWIN__) */
  #if defined(__sparc_v9__)
    #define ARCH "sparcv9"
@@ -74,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*);
 
@@ -82,6 +98,37 @@ static VALUE jvmdll = Qnil;
 static VALUE getdefaultjavavminitargsfunc;
 static VALUE createjavavmfunc;
 
+static int open_jvm(char* libpath)
+{
+    int sstat;
+    VALUE* argv;
+
+    rb_require("dl");
+    if (!rb_const_defined_at(rb_cObject, rb_intern("DL")))
+    {
+	rb_raise(rb_eRuntimeError, "Constants DL is not defined.");
+	return 0;
+    }
+    argv = ALLOCA_N(VALUE, 4);
+    *argv = rb_const_get(rb_cObject, rb_intern("DL"));
+    *(argv + 1) = rb_intern("dlopen");
+    *(argv + 2) = 1;
+    *(argv + 3) = rb_str_new2(libpath);
+    jvmdll = rb_protect(rjb_safe_funcall, (VALUE)argv, &sstat);
+    if (sstat)
+    {
+        return 0;
+    }
+    /* 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); 
+#else
+    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;
+}
 /*
  * not completed, only valid under some circumstances.
  */
@@ -90,8 +137,6 @@ static int load_jvm(char* jvmtype)
     char* libpath;
     char* java_home;
     char* jh;
-    int sstat;
-    VALUE* argv;
 
     jh = getenv("JAVA_HOME");
 #if defined(__APPLE__) && defined(__MACH__)
@@ -145,32 +190,7 @@ static int load_jvm(char* jvmtype)
 		       + strlen(ARCH) + strlen(jvmtype) + 1);
     sprintf(libpath, JVMDLL, java_home, ARCH, jvmtype);
 #endif
-
-    rb_require("dl");
-    if (!rb_const_defined_at(rb_cObject, rb_intern("DL")))
-    {
-	rb_raise(rb_eRuntimeError, "Constants DL is not defined.");
-	return 0;
-    }
-    argv = ALLOCA_N(VALUE, 4);
-    *argv = rb_const_get(rb_cObject, rb_intern("DL"));
-    *(argv + 1) = rb_intern("dlopen");
-    *(argv + 2) = 1;
-    *(argv + 3) = rb_str_new2(libpath);
-    jvmdll = rb_protect(rjb_safe_funcall, (VALUE)argv, &sstat);
-    if (sstat)
-    {
-        return 0;
-    }
-    /* 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); 
-#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"));
-#endif
-    return 1;
+    return open_jvm(libpath);
 }
 
 static int load_bridge(JNIEnv* jenv)
@@ -248,10 +268,38 @@ 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)))
-	{
-	    return -1;
-	}
+        char* libjvm = getenv("JVM_LIB");
+#if defined(_WIN32)
+        if (libjvm && *libjvm == '"' && *(libjvm + strlen(libjvm) - 1) == '"')
+        {
+            char* p = ALLOCA_N(char, strlen(libjvm) + 1);
+            strcpy(p, libjvm + 1);
+            *(p + strlen(p) - 1) = '\0';
+            libjvm = p;
+        }
+#endif    
+        if (libjvm == NULL || !open_jvm(libjvm))
+        {
+#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;
+                }
+#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))
@@ -282,7 +330,7 @@ int rjb_create_jvm(JNIEnv** pjenv, JavaVMInitArgs* vm_args, char* userpath, VALU
     optlen = 0;
     if (!NIL_P(argv))
     {
-        optlen += RARRAY(argv)->len;
+        optlen += RARRAY_LEN(argv);
     }
     optlen += COUNTOF(soptions);
     options = ALLOCA_N(JavaVMOption, optlen);

data/ext/rjb.c

@@ -1,6 +1,6 @@
 /*
  * Rjb - Ruby <-> Java Bridge
- * Copyright(c) 2004,2005,2006,2007,2008 arton
+ * Copyright(c) 2004,2005,2006,2007,2008,2009 arton
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -12,10 +12,10 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
- * $Id: rjb.c 82 2008-08-26 12:51:51Z arton $
+ * $Id: rjb.c 102 2009-11-01 14:01:41Z arton $
  */
 
-#define RJB_VERSION "1.1.6"
+#define RJB_VERSION "1.2.0"
 
 #include "ruby.h"
 #include "extconf.h"
@@ -447,11 +447,9 @@ static VALUE call_conv(JNIEnv* jenv, jvalue val, size_t sz, void* p, CONV conv,
     char* cp = (char*)p;
     jsize len = (*jenv)->GetArrayLength(jenv, val.l);
     VALUE v = rb_ary_new2(len);
-    VALUE* pv = RARRAY_PTR(v);
-    RARRAY_LEN(v) = len;
     for (i = 0; i < len; i++)
     {
-        *pv++ =conv(jenv, cp);
+        rb_ary_push(v, conv(jenv, cp));
 	cp += sz;
     }
     (*(RELEASEARRAY*)(((char*)*jenv) + fnc))(jenv, val.l, p, JNI_ABORT);

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 82 2008-08-26 12:51:51Z arton $
+ * $Id: rjb.h 81 2008-08-26 12:44:44Z arton $
  * $Log: rjb.h,v $
  * Revision 1.1  2005/01/16 17:36:10  arton
  * Initial revision

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);
 	    }
         }
     }

data/test/test.rb

@@ -1,5 +1,6 @@
-#!/usr/local/env ruby
-# $Id: test.rb 70 2008-05-26 12:31:35Z arton $
+#!/usr/local/env ruby -Ku
+# encoding: utf-8
+# $Id: test.rb 87 2009-02-15 12:25:36Z arton $
 
 begin
   require 'rjb'
@@ -167,40 +168,63 @@ class TestRjb < Test::Unit::TestCase
       assert_equal(@jString.new("abcdef".force_encoding(Encoding::ASCII_8BIT)).toString(), "abcdef")
       assert_equal(@jString.new("abcdef".force_encoding(Encoding::find("us-ascii"))).toString(), "abcdef")
     else
-      $KCODE = 'euc'
-      euc_kj = "\xb4\xc1\xbb\xfa\xa5\xc6\xa5\xad\xa5\xb9\xa5\xc8"
-      s = @jString.new(euc_kj)
-      assert_equal(s.toString(), euc_kj)
-      $KCODE = 'sjis'
-      sjis_kj = "\x8a\xbf\x8e\x9a\x83\x65\x83\x4c\x83\x58\x83\x67"
-      s = @jString.new(sjis_kj)
-      assert_equal(s.toString(), sjis_kj)
-      $KCODE = 'utf8'
-      utf8_kj = "\xE6\xBC\xA2\xE5\xAD\x97\xE3\x83\x86\xE3\x82\xAD\xE3\x82\xB9\xE3\x83\x88"
-      s = @jString.new(utf8_kj)
-      assert_equal(s.toString(), utf8_kj)
-      $KCODE = 'none'
-      if /mswin(?!ce)|mingw|cygwin|bccwin/ =~ RUBY_PLATFORM
-	#expecting shift_jis on windows
-	none_kj = "\x8a\xbf\x8e\x9a\x83\x65\x83\x4c\x83\x58\x83\x67"
-      else
-	#expecting utf-8 unless windows
-	none_kj = "\xE6\xBC\xA2\xE5\xAD\x97\xE3\x83\x86\xE3\x82\xAD\xE3\x82\xB9\xE3\x83\x88"
+      default_kcode = $KCODE
+      begin
+	$KCODE = 'euc'
+	euc_kj = "\xb4\xc1\xbb\xfa\xa5\xc6\xa5\xad\xa5\xb9\xa5\xc8"
+	s = @jString.new(euc_kj)
+	assert_equal(s.toString(), euc_kj)
+	$KCODE = 'sjis'
+	sjis_kj = "\x8a\xbf\x8e\x9a\x83\x65\x83\x4c\x83\x58\x83\x67"
+	s = @jString.new(sjis_kj)
+	assert_equal(s.toString(), sjis_kj)
+	$KCODE = 'utf8'
+	utf8_kj = "\xE6\xBC\xA2\xE5\xAD\x97\xE3\x83\x86\xE3\x82\xAD\xE3\x82\xB9\xE3\x83\x88"
+	s = @jString.new(utf8_kj)
+	assert_equal(s.toString(), utf8_kj)
+	$KCODE = 'none'
+	if /mswin(?!ce)|mingw|cygwin|bccwin/ =~ RUBY_PLATFORM
+	  #expecting shift_jis on windows
+	  none_kj = "\x8a\xbf\x8e\x9a\x83\x65\x83\x4c\x83\x58\x83\x67"
+	else
+	  #expecting utf-8 unless windows
+	  none_kj = "\xE6\xBC\xA2\xE5\xAD\x97\xE3\x83\x86\xE3\x82\xAD\xE3\x82\xB9\xE3\x83\x88"
+	end
+	s = @jString.new(none_kj)
+	assert_equal(s.toString(), none_kj)
+	$KCODE = 'utf8'
+	utf8_kj = "\xE6\xBC\xA2\xE5\xAD\x97\xE3\x83\x86\xE3\x82\xAD\xE3\x82\xB9\xE3\x83\x88"
+	s = @jString.new(utf8_kj)
+	assert_equal(s.toString(), utf8_kj)
+	$KCODE = 'sjis'
+	sjis_kj = "\x8a\xbf\x8e\x9a\x83\x65\x83\x4c\x83\x58\x83\x67"
+	s = @jString.new(sjis_kj)
+	assert_equal(s.toString(), sjis_kj)
+	$KCODE = 'euc'
+	euc_kj = "\xb4\xc1\xbb\xfa\xa5\xc6\xa5\xad\xa5\xb9\xa5\xc8"
+	s = @jString.new(euc_kj)
+	assert_equal(s.toString(), euc_kj)
+      ensure
+	$KCODE = default_kcode
+      end
+    end
+  end
+
+  def test_combination_charcters
+    teststr = "\xc7\x96\xc3\xbc\xcc\x84\x75\xcc\x88\xcc\x84\xed\xa1\xa9\xed\xba\xb2\xe3\x81\x8b\xe3\x82\x9a"
+    test = import('jp.co.infoseek.hp.arton.rjb.Test').new
+    s = test.getUmlaut()
+    if Object::const_defined?(:Encoding) #>=1.9
+      teststr = teststr.force_encoding(Encoding::UTF_8)
+      assert_equal(s, teststr)
+    else
+      default_kcode = $KCODE
+      begin
+	$KCODE = "utf8"
+	assert_equal(s, teststr)
+      ensure
+	$KCODE = default_kcode
       end
-      s = @jString.new(none_kj)
-      assert_equal(s.toString(), none_kj)
-      $KCODE = 'utf8'
-      utf8_kj = "\xE6\xBC\xA2\xE5\xAD\x97\xE3\x83\x86\xE3\x82\xAD\xE3\x82\xB9\xE3\x83\x88"
-      s = @jString.new(utf8_kj)
-      assert_equal(s.toString(), utf8_kj)
-      $KCODE = 'sjis'
-      sjis_kj = "\x8a\xbf\x8e\x9a\x83\x65\x83\x4c\x83\x58\x83\x67"
-      s = @jString.new(sjis_kj)
-      assert_equal(s.toString(), sjis_kj)
-      $KCODE = 'euc'
-      euc_kj = "\xb4\xc1\xbb\xfa\xa5\xc6\xa5\xad\xa5\xb9\xa5\xc8"
-      s = @jString.new(euc_kj)
-      assert_equal(s.toString(), euc_kj)
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rjb
 version: !ruby/object:Gem::Version 
-  version: 1.1.6
+  version: 1.2.0
 platform: x86-mswin32-60
 authors: 
 - arton
@@ -9,11 +9,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-26 00:00:00 +09:00
+date: 2009-11-01 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
-description: RJB is a bridge program that connect between Ruby and Java with Java Native Interface.
+description: |
+  RJB is a bridge program that connect between Ruby and Java with Java Native Interface.
+
 email: artonx@gmail.com
 executables: []
 
@@ -24,32 +26,34 @@ extra_rdoc_files: []
 files: 
 - ext/RBridge.java
 - ext/load.c
-- ext/riconv.c
 - ext/rjbexception.c
+- ext/riconv.c
 - ext/rjb.c
-- ext/jniwrap.h
-- ext/rjb.h
-- ext/riconv.h
 - ext/jp_co_infoseek_hp_arton_rjb_RBridge.h
+- ext/riconv.h
 - ext/extconf.h
+- ext/jniwrap.h
+- ext/rjb.h
 - ext/depend
 - data/rjb/jp/co/infoseek/hp/arton/rjb/RBridge.class
 - lib/rjb.rb
 - samples/filechooser.rb
 - test/test.rb
 - test/gctest.rb
-- 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/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/Base.class
+- test/jp/co/infoseek/hp/arton/rjb/ExtBase.class
 - COPYING
 - ChangeLog
 - readme.sj
 - readme.txt
 - lib/rjbcore.so
-has_rdoc: false
+has_rdoc: true
 homepage: http://rjb.rubyforge.org/
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
@@ -72,9 +76,9 @@ requirements:
 - JDK 5.0
 - " VC6 version of Ruby"
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.4
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Ruby Java bridge
 test_files: 
 - test/test.rb