rjb 1.1.9 → 1.2.0

data/ChangeLog

@@ -1,3 +1,14 @@
+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)

data/ext/extconf.rb

@@ -17,8 +17,8 @@ class Path
 
   def include(parent, child)
     inc = joint(parent, child)
-    $INCFLAGS += " -I#{inc}"
-    $CFLAGS += " -I#{inc}"
+    $INCFLAGS += " -I\"#{inc}\""
+    $CFLAGS += " -I\"#{inc}\""
     inc
   end
 
@@ -30,6 +30,9 @@ end
 
 javahome = ENV['JAVA_HOME']
 unless javahome.nil?
+  if javahome[0] == ?" && javahome[-1] == ?"
+    javahome = javahome[1..-2]
+  end
   raise "JAVA_HOME is not directory." unless File.directory?(javahome)
   p = Path.new
   inc = p.include(javahome, 'include')

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 96 2009-09-10 13:57:04Z arton $
+ * $Id: load.c 102 2009-11-01 14:01:41Z arton $
  */
 
 #include <stdlib.h>
@@ -98,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.
  */
@@ -106,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__)
@@ -161,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(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;
+    return open_jvm(libpath);
 }
 
 static int load_bridge(JNIEnv* jenv)
@@ -264,20 +268,33 @@ int rjb_create_jvm(JNIEnv** pjenv, JavaVMInitArgs* vm_args, char* userpath, VALU
 
     if (!RTEST(jvmdll))
     {
-#if defined(__APPLE__) && defined(__MACH__)
-        if (!(load_jvm(JVM_TYPE) || load_jvm(ALT_JVM_TYPE)))
+        char* libjvm = getenv("JVM_LIB");
+#if defined(_WIN32)
+        if (libjvm && *libjvm == '"' && *(libjvm + strlen(libjvm) - 1) == '"')
         {
-            JVMDLL = "%s/Libraries/libjvm.dylib";
-            CREATEJVM = "JNI_CreateJavaVM_Impl";
-            GETDEFAULTJVMINITARGS = "JNI_GetDefaultJavaVMInitArgs_Impl";
+            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 (!(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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rjb
 version: !ruby/object:Gem::Version 
-  version: 1.1.9
+  version: 1.2.0
 platform: ruby
 authors: 
 - arton
@@ -9,11 +9,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-10 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,31 +26,32 @@ extra_rdoc_files: []
 files: 
 - ext/RBridge.java
 - ext/load.c
+- ext/rjbexception.c
 - 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
+- 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/gctest.rb
 - test/test.rb
+- test/gctest.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/IBase.class
-- test/jp/co/infoseek/hp/arton/rjb/Test$TestTypes.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
 - COPYING
 - ChangeLog
 - readme.sj
 - readme.txt
-has_rdoc: false
+has_rdoc: true
 homepage: http://rjb.rubyforge.org/
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
@@ -70,9 +73,9 @@ requirements:
 - none
 - JDK 5.0
 rubyforge_project: 
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 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