rjb 1.3.1-universal-darwin-10 → 1.3.3-universal-darwin-10

data/ChangeLog

@@ -1,3 +1,21 @@
+Wed Nov 17 arton
+ *ext/rjb.c
+	RJV_VERSION -> 1.3.3
+ *ext/load.c
+	Check JAVA_HOME before load JVM  (OS X specific)
+	change int -> size_t for 64bit OS
+ *test/test_osxjvm.rb
+	add new test for OS X specific JVM detection.
+Sat Oct 30 arton
+ *ext/rjb.c
+	RJB_VERSION -> 1.3.2
+ *extconf.rb
+	Change OSX's include path detecting
+Tue Oct 26 arton
+ *ext/rjb.c
+	RJB_VERSION -> 1.3.1
+ *rjb.rake
+	make universal-darwin gem for Mac bundled ruby.
 Sun Oct 24 arton
  *sample/filechooser.rb
 	omit Thread use (cause JVM crush with 1.9 and StackOverflow with 1.8)

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 148 2010-10-23 08:38:44Z arton $
+ * $Id: load.c 159 2010-11-16 16:35:49Z arton $
  */
 
 #include <stdlib.h>
@@ -131,10 +131,21 @@ static int open_jvm(char* libpath)
 #endif
     return 1;
 }
+
+#if defined(__APPLE__) && defined(__MACH__)
+static int file_exist(const char* dir, const char* file)
+{
+    VALUE path = rb_funcall(rb_cFile, rb_intern("join"), 2,
+                            rb_str_new2(dir), rb_str_new2(file));
+    VALUE ret = rb_funcall(rb_cFile, rb_intern("exist?"), 1, path);
+    return RTEST(ret);
+}
+#endif
+
 /*
  * not completed, only valid under some circumstances.
  */
-static int load_jvm(char* jvmtype)
+static int load_jvm(const char* jvmtype)
 {
     char* libpath;
     char* java_home;
@@ -150,7 +161,7 @@ static int load_jvm(char* jvmtype)
     {
         if (strlen(jh) > HOME_NAME_LEN)
         {
-            int len = strlen(jh);
+            size_t len = strlen(jh);
             char* p = ALLOCA_N(char, len + 8);
             jh = strcpy(p, jh);
             if (*(jh + len - 1) == '/')
@@ -163,6 +174,10 @@ static int load_jvm(char* jvmtype)
                 strcpy(p + len, "/..");
             }
         }
+        if (!jvmtype && !file_exist(jh, "JavaVM"))
+        {
+            jh = DEFAULT_HOME;
+        }
     }
 #endif
     if (!jh)
@@ -208,7 +223,7 @@ static int load_bridge(JNIEnv* jenv)
     JNINativeMethod nmethod[1];
     jbyte buff[8192];
     char* bridge;
-    int len;
+    size_t len;
     FILE* f;
 #if defined(RUBINIUS)
     VALUE v = rb_const_get(rb_cObject, rb_intern("RjbConf"));
@@ -268,12 +283,12 @@ int rjb_create_jvm(JNIEnv** pjenv, JavaVMInitArgs* vm_args, char* userpath, VALU
       { "DUMMY", NULL },   /* for classpath count */
     };
     char* newpath;
-    int len;
+    size_t len;
     int result;
     GETDEFAULTJAVAVMINITARGS initargs;
     CREATEJAVAVM createjavavm;
     JavaVMOption* options;
-    int optlen;
+    size_t optlen;
     int i;
     VALUE optval;
 
@@ -292,7 +307,7 @@ int rjb_create_jvm(JNIEnv** pjenv, JavaVMInitArgs* vm_args, char* userpath, VALU
         if (libjvm == NULL || !open_jvm(libjvm))
         {
 #if defined(__APPLE__) && defined(__MACH__)
-            if (!(load_jvm(JVM_TYPE) || load_jvm(ALT_JVM_TYPE)))
+            if (!(load_jvm(NULL)))
             {
                 JVMDLL = "%s/Libraries/libjvm.dylib";
                 CREATEJVM = "JNI_CreateJavaVM_Impl";
@@ -359,7 +374,7 @@ int rjb_create_jvm(JNIEnv** pjenv, JavaVMInitArgs* vm_args, char* userpath, VALU
 	(options + i)->optionString = StringValueCStr(optval);
 	(options + i)->extraInfo = NULL;
     }
-    vm_args->nOptions = optlen;
+    vm_args->nOptions = (int)optlen;
     vm_args->options = options;
     vm_args->ignoreUnrecognized = JNI_TRUE;
     if (NIL_P(createjavavmfunc))

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 147 2010-10-23 05:10:33Z arton $
+ * $Id: rjb.c 159 2010-11-16 16:35:49Z arton $
  */
 
-#define RJB_VERSION "1.3.1"
+#define RJB_VERSION "1.3.3"
 
 #include "ruby.h"
 #include "extconf.h"

data/test/test_osxjvm.rb

@@ -0,0 +1,23 @@
+#!/usr/local/env ruby -Ku
+# encoding: utf-8
+# $Id:$
+
+begin
+  require 'rjb'
+rescue LoadError 
+  require 'rubygems' 
+  require 'rjb'
+end
+require 'test/unit'
+
+if RUBY_PLATFORM =~ /darwin/
+  class TestOsxJvm < Test::Unit::TestCase
+    def test_with_javahome
+      ENV['JAVA_HOME'] = `/usr/libexec/java_home`
+      assert_nothing_raised do
+        Rjb::load
+      end
+    end
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rjb
 version: !ruby/object:Gem::Version 
-  version: 1.3.1
+  version: 1.3.3
 platform: universal-darwin-10
 authors: 
 - arton
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-26 00:00:00 +09:00
+date: 2010-11-17 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -42,6 +42,7 @@ files:
 - test/exttest.rb
 - test/gctest.rb
 - test/test.rb
+- test/test_osxjvm.rb
 - 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