rjb 1.5.4 → 1.5.5

data/README.md

@@ -0,0 +1,65 @@
+# Rjb is Ruby-Java bridge using Java Native Interface.
+
+The [Ruby Kaigi 2010](http://www.slideshare.net/artonx/j-ruby-kaigi-2010)
+Presentation on `Rjb`.
+
+A short [introduction](https://www.artonx.org/collabo/backyard/?RubyJavaBridge)
+in English.
+
+Some [examples](https://www.artonx.org/collabo/backyard/?RjbQandA) in
+Japanese, but the source code is clear for everybody.
+
+# 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 reported
+by calling `/usr/libexec/java_home`.
+
+This done please proceed with:
+
+``` bash
+ruby setup.rb config
+ruby setup.rb setup
+```
+
+``` bash
+# (in Unix)
+sudo ruby setup.rb install
+```
+
+or
+
+``` bash
+# (in win32)
+ruby setup.rb install
+```
+
+# How to test
+
+On Windows based machines:
+
+``` bash
+cd test
+ruby test.rb
+```
+
+On Unix based machines plese see `test/readme.unix`. You need to 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:
+
+``` bash
+ENV['LC_ALL'] = 'en_us.utf8' # or ja_JP.utf8 etc.
+```
+
+cf: http://bugs.sun.com/view_bug.do?bug_id=4733494
+   (Thanks Paul for this information).
+
+# Contact
+artonx@yahoo.co.jp

data/ext/extconf.h

@@ -4,5 +4,5 @@
 #define HAVE_NL_LANGINFO 1
 #define HAVE_SETLOCALE 1
 #define HAVE_GETENV 1
-#define RJB_RUBY_VERSION_CODE 230
+#define RJB_RUBY_VERSION_CODE 240
 #endif

data/ext/extconf.rb

@@ -53,6 +53,7 @@ else
   raise "JAVA_HOME is not set."
 end
 
+
 def create_rjb_makefile
   if have_header("jni.h")
     have_func("locale_charset", "iconv.h")

data/ext/jniwrap.h

@@ -1,34 +1,34 @@
-/*
- * Rjb - Ruby <-> Java Bridge
- * Copyright(c) 2006 Kuwashima
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * $Id: jniwrap.h 181 2012-01-28 05:28:41Z arton $
- */
-#ifndef _Included_jniwrap
-#define _Included_jniwrap
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if defined(__GNUC__) && (defined(__CYGWIN32__) || defined(__MINGW32__))
- #if !defined(__int64)
-  typedef long long __int64;
- #endif
-#endif
-
-#include <jni.h>
-
-#ifdef __cplusplus
-}
-#endif
-#endif                    
+/*
+ * Rjb - Ruby <-> Java Bridge
+ * Copyright(c) 2006 Kuwashima
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * $Id: jniwrap.h 181 2012-01-28 05:28:41Z arton $
+ */
+#ifndef _Included_jniwrap
+#define _Included_jniwrap
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#if defined(__GNUC__) && (defined(__CYGWIN32__) || defined(__MINGW32__))
+ #if !defined(__int64)
+  typedef long long __int64;
+ #endif
+#endif
+
+#include <jni.h>
+
+#ifdef __cplusplus
+}
+#endif
+#endif                    

data/ext/jp_co_infoseek_hp_arton_rjb_RBridge.h

@@ -1,21 +1,21 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class jp_co_infoseek_hp_arton_rjb_RBridge */
-
-#ifndef _Included_jp_co_infoseek_hp_arton_rjb_RBridge
-#define _Included_jp_co_infoseek_hp_arton_rjb_RBridge
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class:     jp_co_infoseek_hp_arton_rjb_RBridge
- * Method:    call
- * Signature: (Ljava/lang/String;Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
- */
-JNIEXPORT jobject JNICALL Java_jp_co_infoseek_hp_arton_rjb_RBridge_call
-  (JNIEnv *, jobject, jstring, jobject, jobjectArray);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class jp_co_infoseek_hp_arton_rjb_RBridge */
+
+#ifndef _Included_jp_co_infoseek_hp_arton_rjb_RBridge
+#define _Included_jp_co_infoseek_hp_arton_rjb_RBridge
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class:     jp_co_infoseek_hp_arton_rjb_RBridge
+ * Method:    call
+ * Signature: (Ljava/lang/String;Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/Object;
+ */
+JNIEXPORT jobject JNICALL Java_jp_co_infoseek_hp_arton_rjb_RBridge_call
+  (JNIEnv *, jobject, jstring, jobject, jobjectArray);
+
+#ifdef __cplusplus
+}
+#endif
+#endif

data/ext/load.c

@@ -77,6 +77,8 @@
    #define JVM_TYPE "server"
  #elif defined(i586) || defined(__i386__)
   #define ARCH "i386"
+ #elif defined(__arm__)
+  #define ARCH "arm"
  #endif
  #ifndef ARCH
   #include <sys/systeminfo.h>

data/ext/rjb.c

@@ -1,6 +1,6 @@
 /*
  * Rjb - Ruby <-> Java Bridge
- * Copyright(c) 2004,2005,2006,2007,2008,2009,2010,2011,2012,2014 arton
+ * Copyright(c) 2004,2005,2006,2007,2008,2009,2010,2011,2012,2014-2016 arton
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -14,7 +14,7 @@
  *
  */
 
-#define RJB_VERSION "1.5.4"
+#define RJB_VERSION "1.5.5"
 
 #include "ruby.h"
 #include "extconf.h"

data/lib/rjb.rb

@@ -45,6 +45,9 @@ module RjbConf
         ENV['JVM_LIB'] = jvms[0]
       end
     end
+  elsif /win32|win64/ =~ RUBY_PLATFORM
+    # add JRE bin directory for further DLLs
+    ENV['PATH'] = "#{ENV['JAVA_HOME']}\\jre\\bin;#{ENV['PATH']}"
   end
 
   dir = File.join(File.dirname(File.dirname(__FILE__)), 'data')

data/lib/rjb/version.rb

@@ -0,0 +1,27 @@
+module Rjb
+  class << self
+
+    private
+
+    # @return [String, nil] the valid version number. Can be nil.
+    def read_version
+      path = File.expand_path('../../../ext/rjb.c', __FILE__)
+      File.open(path) do |f|
+        f.each_line do |l|
+          m = /RJB_VERSION\s+"(.+?)"/.match(l)
+
+          # The file is closed even in this case.
+          return m[1] if m
+        end
+      end
+    end
+  end
+
+  # The `Rjb` module defines `VERSION` in the C code.
+  # If Rjb is already required we have the constant.
+  unless defined?(::Rjb::VERSION)
+    unless (VERSION = read_version)
+      raise 'Cannot find a valid version number in `rjb.c`!'
+    end
+  end
+end

data/lib/rjbextension.rb

@@ -1 +1 @@
-require 'rjb/extension'
+require 'rjb/extension'

data/readme.sj

@@ -1,27 +1,27 @@
-����
-�E���炩���ߊ‹��ϐ���JAVA_HOME��ݒ肵�Ă����Ă��������B
-�E���̏ꍇ�AJAVA_HOME�́AJ2SDK�̃C���X�g�[���f�B���N�g���̕K�v������܂��B
-�E���炩���ߊ‹��ϐ�PATH��$JAVA_HOME/bin��ݒ肵�Ă����Ă��������B
-�EWindows�̏ꍇ�APATH�ɂ�%PATH%;%JAVA_HOME%bin��ݒ肷�邱�ƂɂȂ�܂��B
-�Eruby1.8�ȍ~�����s�ł���悤��PATH��ݒ肵�Ă����Ă��������B
-
-�C���X�g�[�����@
-1. unzip rjb-*
-2. cd rjb-*
-3. ruby setup.rb config
-4. ruby setup.rb setup
-5. sudo ruby setup.rb install
-   Windows�ł́A�قƂ�ǂ̏ꍇ�ŏ���sudo�͕s�v�ł��B�u�قƂ�ǂ̏ꍇ�v�ɊY�����Ȃ��ꍇ�͉����K�v���͂킩���Ă���͂��ł��̂Ő����͏ȗ����܂��B
-
-���s��
-�E���炩���ߊ‹��ϐ���JAVA_HOME��ݒ肵�Ă����Ă��������B
-�E���̏ꍇ�AJAVA_HOME�́AJ2SDK�̃C���X�g�[���f�B���N�g���̕K�v������܂��B
-�ELinux�Ɋւ��Ă�LD_LIBRARY_PATH�ɁAjava2�̋��L�I�u�W�F�N�g�f�B���N�g����ݒ肵�Ă����K�v������܂��B
-
-�e�X�g�����‹�
-Windows2000 SP4-ruby1.8.2-j2se1.5.0, Solaris9-ruby1.8.0-j2se1.4.2, Linux 2.4.26-ruby-1.8.1-j2se1.4.2
-
-�A����
-artonx@yahoo.co.jp
-http://arton.no-ip.info/collabo/backyard/?RjbQandA (�L�����ɂ�diary�փc�b�R�~�����Ă��������j
-
+準備
+・あらかじめ環境変数にJAVA_HOMEを設定しておいてください。
+・この場合、JAVA_HOMEは、J2SDKのインストールディレクトリの必要があります。
+・あらかじめ環境変数PATHに$JAVA_HOME/binを設定しておいてください。
+・Windowsの場合、PATHには%PATH%;%JAVA_HOME%binを設定することになります。
+・ruby1.8以降が実行できるようにPATHを設定しておいてください。
+
+インストール方法
+1. unzip rjb-*
+2. cd rjb-*
+3. ruby setup.rb config
+4. ruby setup.rb setup
+5. sudo ruby setup.rb install
+   Windowsでは、ほとんどの場合最初のsudoは不要です。「ほとんどの場合」に該当しない場合は何が必要かはわかっているはずですので説明は省略します。
+
+実行時
+・あらかじめ環境変数にJAVA_HOMEを設定しておいてください。
+・この場合、JAVA_HOMEは、J2SDKのインストールディレクトリの必要があります。
+・Linuxに関してはLD_LIBRARY_PATHに、java2の共有オブジェクトディレクトリを設定しておく必要があります。
+
+テストした環境
+Windows2000 SP4-ruby1.8.2-j2se1.5.0, Solaris9-ruby1.8.0-j2se1.4.2, Linux 2.4.26-ruby-1.8.1-j2se1.4.2
+
+連絡先
+artonx@yahoo.co.jp
+https://www.artonx.org/collabo/backyard/?RjbQandA (記入時にはdiaryへツッコミを入れてください）
+

data/test/exttest.rb

@@ -1,39 +1,39 @@
-#!/usr/local/env ruby -Ku
-# encoding: utf-8
-# $Id:$
-
-begin
-  require 'rjb'
-rescue LoadError 
-  require 'rubygems' 
-  require 'rjb'
-end
-
-if Rjb::VERSION < '1.2.2'
-  puts "Rjb #{Rjb::VERSION} does not support rjbextension. exit"
-  exit 0
-end
-
-require 'rjbextension'
-require 'test/unit'
-require 'fileutils'
-
-FileUtils.rm_f 'jp/co/infoseek/hp/arton/rjb/Base.class'
-
-puts "start RJB(#{Rjb::VERSION}) test"
-class ExtTestRjb < Test::Unit::TestCase
-
-  def jp
-    JavaPackage.new('jp')
-  end
-  
-  def test_require_extension
-    assert !Rjb::loaded?
-    $LOAD_PATH << '.'
-    require 'rjbtest.jar'
-    Rjb::load
-    assert Rjb::loaded?
-    base = jp.co.infoseek.hp.arton.rjb.Base.new
-    assert_equal('hello', base.instance_var)
-  end
-end
+#!/usr/local/env ruby -Ku
+# encoding: utf-8
+# $Id:$
+
+begin
+  require 'rjb'
+rescue LoadError 
+  require 'rubygems' 
+  require 'rjb'
+end
+
+if Rjb::VERSION < '1.2.2'
+  puts "Rjb #{Rjb::VERSION} does not support rjbextension. exit"
+  exit 0
+end
+
+require 'rjbextension'
+require 'test/unit'
+require 'fileutils'
+
+FileUtils.rm_f 'jp/co/infoseek/hp/arton/rjb/Base.class'
+
+puts "start RJB(#{Rjb::VERSION}) test"
+class ExtTestRjb < Test::Unit::TestCase
+
+  def jp
+    JavaPackage.new('jp')
+  end
+  
+  def test_require_extension
+    assert !Rjb::loaded?
+    $LOAD_PATH << '.'
+    require 'rjbtest.jar'
+    Rjb::load
+    assert Rjb::loaded?
+    base = jp.co.infoseek.hp.arton.rjb.Base.new
+    assert_equal('hello', base.instance_var)
+  end
+end

data/test/jartest.rb

@@ -1,24 +1,24 @@
-#!/usr/local/env ruby -Ku
-# encoding: utf-8
-
-begin
-  require 'rjb'
-rescue LoadError 
-  require 'rubygems' 
-  require 'rjb'
-end
-require 'test/unit'
-
-class JarTest < Test::Unit::TestCase
-  include Rjb
-  
-  def setup
-    Rjb::load()
-  end
-  
-  def test_depends
-    add_jar(File.expand_path('./jartest2.jar'))    
-    add_jar(File.expand_path('./jartest.jar'))
-    assert Rjb::import('jp.co.infoseek.hp.arton.rjb.JarTest2')
-  end
-end
+#!/usr/local/env ruby -Ku
+# encoding: utf-8
+
+begin
+  require 'rjb'
+rescue LoadError 
+  require 'rubygems' 
+  require 'rjb'
+end
+require 'test/unit'
+
+class JarTest < Test::Unit::TestCase
+  include Rjb
+  
+  def setup
+    Rjb::load()
+  end
+  
+  def test_depends
+    add_jar(File.expand_path('./jartest2.jar'))    
+    add_jar(File.expand_path('./jartest.jar'))
+    assert Rjb::import('jp.co.infoseek.hp.arton.rjb.JarTest2')
+  end
+end