rjb 1.3.1 → 1.3.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (8) hide show
  1. data/ChangeLog +5 -0
  2. data/ext/extconf.h +2 -2
  3. data/ext/extconf.rb +7 -4
  4. data/ext/jp_co_infoseek_hp_arton_rjb_RBridge.h +0 -0
  5. data/ext/rjb.c +2 -2
  6. data/test/jp/co/infoseek/hp/arton/rjb/Base.class +0 -0
  7. data/test/jp/co/infoseek/hp/arton/rjb/ExtBase.class +0 -0
  8. metadata +28 -11
data/ChangeLog CHANGED
@@ -1,3 +1,8 @@
1
+ Sat Oct 30 arton
2
+ *ext/rjb.c
3
+ RJB_VERSION -> 1.3.2
4
+ *extconf.rb
5
+ Change OSX's include path detecting
1
6
  Tue Oct 26 arton
2
7
  *ext/rjb.c
3
8
  RJB_VERSION -> 1.3.1
data/ext/extconf.h CHANGED
@@ -1,9 +1,9 @@
1
1
  #ifndef EXTCONF_H
2
2
  #define EXTCONF_H
3
3
  #define HAVE_JNI_H 1
4
- #define HAVE_DL_H 1
4
+ #define HAVE_RUBY_DL_H 1
5
5
  #define HAVE_NL_LANGINFO 1
6
6
  #define HAVE_SETLOCALE 1
7
7
  #define HAVE_GETENV 1
8
- #define RJB_RUBY_VERSION_CODE 187
8
+ #define RJB_RUBY_VERSION_CODE 192
9
9
  #endif
data/ext/extconf.rb CHANGED
@@ -30,7 +30,7 @@ end
30
30
 
31
31
  javahome = ENV['JAVA_HOME']
32
32
  if javahome.nil? && RUBY_PLATFORM =~ /darwin/
33
- javahome = '/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK'
33
+ javahome = `/usr/libexec/java_home`.strip
34
34
  end
35
35
  unless javahome.nil?
36
36
  if javahome[0] == ?" && javahome[-1] == ?"
@@ -39,8 +39,9 @@ unless javahome.nil?
39
39
  raise "JAVA_HOME is not directory." unless File.directory?(javahome)
40
40
  pt = Path.new
41
41
  inc = pt.include(javahome, 'include')
42
- inc = pt.include(javahome, 'Home/include') unless File.exists?(inc)
43
- inc = pt.include(javahome, 'Headers') unless File.exists?(inc)
42
+ if !File.exists?(inc) && RUBY_PLATFORM =~ /darwin/
43
+ inc = pt.include('/System/Library/Frameworks/JavaVM.framework', 'Headers')
44
+ end
44
45
  Dir.open(inc).each do |d|
45
46
  next if d[0] == ?.
46
47
  if File.directory?(pt.joint(inc, d))
@@ -49,7 +50,7 @@ unless javahome.nil?
49
50
  end
50
51
  end
51
52
  else
52
- raise "JAVA_HOME is not set."
53
+ raise "JAVA_HOME is not set."
53
54
  end
54
55
 
55
56
 
@@ -62,6 +63,8 @@ def create_rjb_makefile
62
63
  $defs << "-DRJB_RUBY_VERSION_CODE="+RUBY_VERSION.gsub(/\./, '')
63
64
  create_header
64
65
  create_makefile("rjbcore")
66
+ else
67
+ raise "no jni.h in " + $INCFLAGS
65
68
  end
66
69
  end
67
70
 
data/ext/jp_co_infoseek_hp_arton_rjb_RBridge.h CHANGED
File without changes
data/ext/rjb.c CHANGED
@@ -12,10 +12,10 @@
12
12
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13
13
  * Lesser General Public License for more details.
14
14
  *
15
- * $Id: rjb.c 154 2010-10-25 16:08:44Z arton $
15
+ * $Id: rjb.c 156 2010-10-30 14:58:33Z arton $
16
16
  */
17
17
 
18
- #define RJB_VERSION "1.3.1"
18
+ #define RJB_VERSION "1.3.2"
19
19
 
20
20
  #include "ruby.h"
21
21
  #include "extconf.h"
metadata CHANGED
@@ -1,7 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rjb
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.3.1
4
+ hash: 31
5
+ prerelease: false
6
+ segments:
7
+ - 1
8
+ - 3
9
+ - 2
10
+ version: 1.3.2
5
11
  platform: ruby
6
12
  authors:
7
13
  - arton
@@ -9,7 +15,7 @@ autorequire:
9
15
  bindir: bin
10
16
  cert_chain: []
11
17
 
12
- date: 2010-10-26 00:00:00 +09:00
18
+ date: 2010-10-31 00:00:00 +09:00
13
19
  default_executable:
14
20
  dependencies: []
15
21
 
@@ -26,31 +32,34 @@ extra_rdoc_files: []
26
32
  files:
27
33
  - ext/RBridge.java
28
34
  - ext/load.c
35
+ - ext/rjbexception.c
29
36
  - ext/riconv.c
30
37
  - ext/rjb.c
31
- - ext/rjbexception.c
32
- - ext/extconf.h
33
- - ext/jniwrap.h
34
38
  - ext/jp_co_infoseek_hp_arton_rjb_RBridge.h
35
39
  - ext/riconv.h
40
+ - ext/extconf.h
41
+ - ext/jniwrap.h
36
42
  - ext/rjb.h
37
43
  - ext/depend
38
44
  - data/rjb/jp/co/infoseek/hp/arton/rjb/RBridge.class
39
45
  - lib/rjb.rb
40
46
  - lib/rjbextension.rb
41
47
  - samples/filechooser.rb
48
+ - test/test.rb
42
49
  - test/exttest.rb
43
50
  - test/gctest.rb
44
- - test/test.rb
51
+ - test/jp/co/infoseek/hp/arton/rjb/Base.class
45
52
  - test/jp/co/infoseek/hp/arton/rjb/IBase.class
46
- - test/jp/co/infoseek/hp/arton/rjb/Test$TestTypes.class
47
53
  - test/jp/co/infoseek/hp/arton/rjb/Test.class
48
- - test/jartest.jar
54
+ - test/jp/co/infoseek/hp/arton/rjb/Test$TestTypes.class
55
+ - test/jp/co/infoseek/hp/arton/rjb/ExtBase.class
49
56
  - test/rjbtest.jar
57
+ - test/jartest.jar
50
58
  - COPYING
51
59
  - ChangeLog
52
60
  - readme.sj
53
61
  - readme.txt
62
+ - ext/extconf.rb
54
63
  has_rdoc: true
55
64
  homepage: http://rjb.rubyforge.org/
56
65
  licenses: []
@@ -61,22 +70,30 @@ rdoc_options: []
61
70
  require_paths:
62
71
  - lib
63
72
  required_ruby_version: !ruby/object:Gem::Requirement
73
+ none: false
64
74
  requirements:
65
75
  - - ">="
66
76
  - !ruby/object:Gem::Version
77
+ hash: 51
78
+ segments:
79
+ - 1
80
+ - 8
81
+ - 2
67
82
  version: 1.8.2
68
- version:
69
83
  required_rubygems_version: !ruby/object:Gem::Requirement
84
+ none: false
70
85
  requirements:
71
86
  - - ">="
72
87
  - !ruby/object:Gem::Version
88
+ hash: 3
89
+ segments:
90
+ - 0
73
91
  version: "0"
74
- version:
75
92
  requirements:
76
93
  - none
77
94
  - JDK 5.0
78
95
  rubyforge_project: rjb
79
- rubygems_version: 1.3.5
96
+ rubygems_version: 1.3.7
80
97
  signing_key:
81
98
  specification_version: 3
82
99
  summary: Ruby Java bridge