r2corba 1.4.1-x86-mingw32 → 1.5.1-x86-mingw32

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (254) hide show
  1. checksums.yaml +7 -7
  2. data/CHANGES +173 -159
  3. data/LICENSE +59 -59
  4. data/README +62 -62
  5. data/THANKS +54 -52
  6. data/bin/r2corba +1 -1
  7. data/bin/ridlc +1 -1
  8. data/bin/rins +1 -1
  9. data/lib/corba.rb +16 -16
  10. data/lib/corba/cbase/IORMap.rb +33 -33
  11. data/lib/corba/cbase/ORB.rb +237 -231
  12. data/lib/corba/cbase/Request.rb +133 -133
  13. data/lib/corba/cbase/Streams.rb +129 -129
  14. data/lib/corba/cbase/Stub.rb +19 -19
  15. data/lib/corba/cbase/Typecode.rb +441 -441
  16. data/lib/corba/cbase/Values.rb +129 -129
  17. data/lib/corba/cbase/exception.rb +66 -66
  18. data/lib/corba/cbase/poa.rb +23 -23
  19. data/lib/corba/cbase/policies.rb +77 -77
  20. data/lib/corba/cbase/post_require.rb +13 -13
  21. data/lib/corba/cbase/require.rb +28 -28
  22. data/lib/corba/cmds/base.rb +85 -85
  23. data/lib/corba/cmds/test.rb +30 -30
  24. data/lib/corba/common/Any.rb +91 -91
  25. data/lib/corba/common/IDL.rb +104 -104
  26. data/lib/corba/common/ORB.rb +368 -368
  27. data/lib/corba/common/Object.rb +208 -208
  28. data/lib/corba/common/Request.rb +19 -19
  29. data/lib/corba/common/Servant.rb +108 -108
  30. data/lib/corba/common/Struct.rb +21 -21
  31. data/lib/corba/common/Stub.rb +79 -79
  32. data/lib/corba/common/Typecode.rb +1121 -1121
  33. data/lib/corba/common/Union.rb +55 -55
  34. data/lib/corba/common/Values.rb +91 -91
  35. data/lib/corba/common/const.rb +22 -22
  36. data/lib/corba/common/exception.rb +68 -68
  37. data/lib/corba/common/require.rb +27 -27
  38. data/lib/corba/common/version.rb +22 -22
  39. data/lib/corba/idl/IDL.rb +21 -21
  40. data/lib/corba/idl/IORTable.pidl +62 -62
  41. data/lib/corba/idl/TAO_Ext.pidl +46 -46
  42. data/lib/corba/idl/require.rb +20 -20
  43. data/lib/corba/jbase/Any.rb +273 -273
  44. data/lib/corba/jbase/IORMap.rb +35 -35
  45. data/lib/corba/jbase/ORB.rb +112 -99
  46. data/lib/corba/jbase/Object.rb +99 -98
  47. data/lib/corba/jbase/Request.rb +225 -225
  48. data/lib/corba/jbase/Servant.rb +247 -246
  49. data/lib/corba/jbase/ServerRequest.rb +127 -127
  50. data/lib/corba/jbase/Streams.rb +670 -670
  51. data/lib/corba/jbase/Stub.rb +38 -38
  52. data/lib/corba/jbase/Typecode.rb +520 -520
  53. data/lib/corba/jbase/Values.rb +173 -173
  54. data/lib/corba/jbase/exception.rb +106 -106
  55. data/lib/corba/jbase/poa.rb +228 -228
  56. data/lib/corba/jbase/policies.rb +299 -299
  57. data/lib/corba/jbase/post_require.rb +14 -14
  58. data/lib/corba/jbase/require.rb +89 -86
  59. data/lib/corba/naming.rb +14 -14
  60. data/lib/corba/naming_service.rb +15 -15
  61. data/lib/corba/poa.rb +15 -15
  62. data/lib/corba/policies.rb +18 -18
  63. data/lib/corba/require.rb +17 -17
  64. data/lib/corba/svcs/ins/cos_naming.rb +426 -426
  65. data/lib/corba/svcs/ins/ins.rb +526 -526
  66. data/lib/corba/svcs/ins/naming_service.rb +119 -119
  67. data/lib/ridlbe/ruby/config.rb +336 -336
  68. data/lib/ridlbe/ruby/orb.pidlc +0 -0
  69. data/lib/ridlbe/ruby/require.rb +16 -16
  70. data/lib/ridlbe/ruby/walker.rb +1582 -1582
  71. data/mkrf_conf_bingem.rb +151 -101
  72. data/rakelib/bin.rake +80 -80
  73. data/rakelib/bin.rb +145 -145
  74. data/rakelib/build.rake +87 -87
  75. data/rakelib/config.rake +51 -51
  76. data/rakelib/config.rb +543 -449
  77. data/rakelib/ext.rake +242 -242
  78. data/rakelib/ext.rb +316 -308
  79. data/rakelib/ext_r2tao.rb +235 -232
  80. data/rakelib/gem.rake +235 -211
  81. data/rakelib/gem.rb +145 -145
  82. data/rakelib/package.rake +26 -26
  83. data/rakelib/test.rake +23 -23
  84. data/test/BiDirectional/Test.idl +34 -34
  85. data/test/BiDirectional/client.rb +131 -131
  86. data/test/BiDirectional/run_test.rb +68 -68
  87. data/test/BiDirectional/server.ior +1 -1
  88. data/test/BiDirectional/server.rb +169 -169
  89. data/test/CORBA_Services/Naming/BindingIterator/Test.idl +27 -27
  90. data/test/CORBA_Services/Naming/BindingIterator/client.rb +121 -121
  91. data/test/CORBA_Services/Naming/BindingIterator/ins.ior +1 -1
  92. data/test/CORBA_Services/Naming/BindingIterator/run_test.rb +82 -82
  93. data/test/CORBA_Services/Naming/BindingIterator/server.rb +109 -109
  94. data/test/CORBA_Services/Naming/Corbaname/Test.idl +27 -27
  95. data/test/CORBA_Services/Naming/Corbaname/client.rb +85 -85
  96. data/test/CORBA_Services/Naming/Corbaname/ins.ior +1 -1
  97. data/test/CORBA_Services/Naming/Corbaname/run_test.rb +88 -88
  98. data/test/CORBA_Services/Naming/Corbaname/server.rb +135 -135
  99. data/test/CORBA_Services/Naming/Simple/Test.idl +27 -27
  100. data/test/CORBA_Services/Naming/Simple/client.rb +84 -84
  101. data/test/CORBA_Services/Naming/Simple/ins.ior +1 -1
  102. data/test/CORBA_Services/Naming/Simple/run_test.rb +82 -82
  103. data/test/CORBA_Services/Naming/Simple/server.rb +109 -109
  104. data/test/Collocation/Diamond.idl +39 -39
  105. data/test/Collocation/run_test.rb +52 -52
  106. data/test/Collocation/test.rb +195 -195
  107. data/test/Connect_Timeout/Test.idl +27 -27
  108. data/test/Connect_Timeout/client.rb +111 -111
  109. data/test/Connect_Timeout/run_test.rb +52 -52
  110. data/test/DII/Test.idl +27 -27
  111. data/test/DII/client.rb +115 -115
  112. data/test/DII/run_test.rb +69 -69
  113. data/test/DII/server.ior +1 -1
  114. data/test/DII/server.rb +95 -95
  115. data/test/DSI/Test.idl +27 -27
  116. data/test/DSI/client.rb +66 -66
  117. data/test/DSI/run_test.rb +69 -69
  118. data/test/DSI/server.ior +1 -1
  119. data/test/DSI/server.rb +106 -106
  120. data/test/Exceptions/Test.idl +48 -48
  121. data/test/Exceptions/client.rb +117 -117
  122. data/test/Exceptions/run_test.rb +69 -69
  123. data/test/Exceptions/server.ior +1 -1
  124. data/test/Exceptions/server.rb +131 -131
  125. data/test/Hello/Test.idl +27 -27
  126. data/test/Hello/client.rb +78 -78
  127. data/test/Hello/run_test.rb +71 -71
  128. data/test/Hello/server.rb +95 -95
  129. data/test/IDL_Test/Test.idl +113 -113
  130. data/test/IDL_Test/Test_inc.idl +17 -17
  131. data/test/IDL_Test/client.rb +102 -102
  132. data/test/IDL_Test/run_test.rb +69 -69
  133. data/test/IDL_Test/server.ior +1 -1
  134. data/test/IDL_Test/server.rb +99 -99
  135. data/test/IORMap/Test.idl +27 -27
  136. data/test/IORMap/client.rb +73 -73
  137. data/test/IORMap/run_test.rb +69 -69
  138. data/test/IORMap/server.ior +1 -1
  139. data/test/IORMap/server.rb +114 -114
  140. data/test/IORTable/Test.idl +27 -27
  141. data/test/IORTable/client.rb +75 -75
  142. data/test/IORTable/run_test.rb +69 -69
  143. data/test/IORTable/server.ior +1 -1
  144. data/test/IORTable/server.rb +130 -130
  145. data/test/Implicit_Conversion/Test.idl +31 -31
  146. data/test/Implicit_Conversion/client.rb +110 -110
  147. data/test/Implicit_Conversion/run_test.rb +69 -69
  148. data/test/Implicit_Conversion/server.ior +1 -1
  149. data/test/Implicit_Conversion/server.rb +99 -99
  150. data/test/Multi_Threading/Multiple_ORB/Test.idl +27 -27
  151. data/test/Multi_Threading/Multiple_ORB/client.rb +82 -82
  152. data/test/Multi_Threading/Multiple_ORB/run_test.rb +71 -71
  153. data/test/Multi_Threading/Multiple_ORB/server.rb +108 -108
  154. data/test/Multi_Threading/Multiple_ORB/server0.ior +1 -1
  155. data/test/Multi_Threading/Multiple_ORB/server1.ior +1 -1
  156. data/test/Multi_Threading/Simple/Test.idl +27 -27
  157. data/test/Multi_Threading/Simple/client.rb +93 -88
  158. data/test/Multi_Threading/Simple/run_test.rb +69 -69
  159. data/test/Multi_Threading/Simple/server.ior +1 -1
  160. data/test/Multi_Threading/Simple/server.rb +117 -117
  161. data/test/Multi_Threading/Threads/Test.idl +31 -31
  162. data/test/Multi_Threading/Threads/client.rb +80 -80
  163. data/test/Multi_Threading/Threads/run_test.rb +76 -76
  164. data/test/Multi_Threading/Threads/server.ior +1 -1
  165. data/test/Multi_Threading/Threads/server.rb +119 -119
  166. data/test/Multi_Threading/Threads/watchdog.ior +1 -1
  167. data/test/Multi_Threading/Threads/watchdog.rb +87 -87
  168. data/test/Multiple_Servant_Interfaces/Test.idl +34 -34
  169. data/test/Multiple_Servant_Interfaces/client.rb +70 -70
  170. data/test/Multiple_Servant_Interfaces/run_test.rb +69 -69
  171. data/test/Multiple_Servant_Interfaces/server.ior +1 -1
  172. data/test/Multiple_Servant_Interfaces/server.rb +102 -102
  173. data/test/Nil/Test.idl +27 -27
  174. data/test/Nil/run_test.rb +52 -52
  175. data/test/Nil/test.rb +78 -78
  176. data/test/OBV/AbstractInterface/client.rb +179 -179
  177. data/test/OBV/AbstractInterface/run_test.rb +69 -69
  178. data/test/OBV/AbstractInterface/server.ior +1 -1
  179. data/test/OBV/AbstractInterface/server.rb +149 -149
  180. data/test/OBV/AbstractInterface/test.idl +53 -53
  181. data/test/OBV/Custom/OBV.idl +18 -18
  182. data/test/OBV/Custom/OBV_impl.rb +40 -40
  183. data/test/OBV/Custom/client.rb +86 -86
  184. data/test/OBV/Custom/run_test.rb +69 -69
  185. data/test/OBV/Custom/server.ior +1 -1
  186. data/test/OBV/Custom/server.rb +100 -100
  187. data/test/OBV/Simple/OBV.idl +15 -15
  188. data/test/OBV/Simple/OBV_impl.rb +26 -26
  189. data/test/OBV/Simple/client.rb +86 -86
  190. data/test/OBV/Simple/run_test.rb +69 -69
  191. data/test/OBV/Simple/server.ior +1 -1
  192. data/test/OBV/Simple/server.rb +100 -100
  193. data/test/OBV/Simple_Event/Event.idl +15 -15
  194. data/test/OBV/Simple_Event/Event_impl.rb +26 -26
  195. data/test/OBV/Simple_Event/client.rb +86 -86
  196. data/test/OBV/Simple_Event/run_test.rb +69 -69
  197. data/test/OBV/Simple_Event/server.ior +1 -1
  198. data/test/OBV/Simple_Event/server.rb +100 -100
  199. data/test/OBV/Supports/client.rb +116 -116
  200. data/test/OBV/Supports/run_test.rb +69 -69
  201. data/test/OBV/Supports/server.ior +1 -1
  202. data/test/OBV/Supports/server.rb +103 -103
  203. data/test/OBV/Supports/supports.idl +33 -33
  204. data/test/OBV/Supports/supports_impl.rb +57 -57
  205. data/test/OBV/Tree/client.rb +116 -116
  206. data/test/OBV/Tree/run_test.rb +69 -69
  207. data/test/OBV/Tree/server.ior +1 -1
  208. data/test/OBV/Tree/server.rb +117 -117
  209. data/test/OBV/Tree/test.idl +32 -32
  210. data/test/OBV/Truncatable/Extra.idl +27 -27
  211. data/test/OBV/Truncatable/Truncatable.idl +105 -105
  212. data/test/OBV/Truncatable/Truncatable_impl.rb +86 -86
  213. data/test/OBV/Truncatable/client.rb +279 -279
  214. data/test/OBV/Truncatable/run_test.rb +69 -69
  215. data/test/OBV/Truncatable/server.ior +1 -1
  216. data/test/OBV/Truncatable/server.rb +89 -89
  217. data/test/OBV/ValueBox/client.rb +497 -497
  218. data/test/OBV/ValueBox/run_test.rb +69 -69
  219. data/test/OBV/ValueBox/server.ior +1 -1
  220. data/test/OBV/ValueBox/server.rb +271 -271
  221. data/test/OBV/ValueBox/valuebox.idl +101 -101
  222. data/test/OBV/ValueBox/vb_basic.idl +75 -75
  223. data/test/OBV/ValueBox/vb_struct.idl +68 -68
  224. data/test/OBV/ValueBox/vb_union.idl +21 -21
  225. data/test/Object/Test.idl +27 -27
  226. data/test/Object/client.rb +112 -103
  227. data/test/Object/run_test.rb +69 -69
  228. data/test/Object/server.ior +1 -1
  229. data/test/Object/server.rb +126 -126
  230. data/test/POA/Test.idl +27 -27
  231. data/test/POA/run_test.rb +52 -52
  232. data/test/POA/test.rb +111 -111
  233. data/test/Param_Test/Test.idl +182 -182
  234. data/test/Param_Test/client.rb +277 -277
  235. data/test/Param_Test/run_test.rb +69 -69
  236. data/test/Param_Test/server.ior +1 -1
  237. data/test/Param_Test/server.rb +296 -296
  238. data/test/Performance/Simple/Test.idl +27 -27
  239. data/test/Performance/Simple/client.rb +90 -90
  240. data/test/Performance/Simple/run_test.rb +69 -69
  241. data/test/Performance/Simple/server.ior +1 -1
  242. data/test/Performance/Simple/server.rb +95 -95
  243. data/test/Policies/Test.idl +27 -27
  244. data/test/Policies/run_test.rb +52 -52
  245. data/test/Policies/test.rb +144 -144
  246. data/test/Timeout/client.rb +207 -207
  247. data/test/Timeout/run_test.rb +69 -69
  248. data/test/Timeout/server.ior +1 -1
  249. data/test/Timeout/server.rb +109 -109
  250. data/test/Timeout/test.idl +19 -19
  251. data/test/lib/assert.rb +43 -43
  252. data/test/lib/test.rb +542 -542
  253. data/test/test_runner.rb +193 -193
  254. metadata +141 -137
data/mkrf_conf_bingem.rb CHANGED
@@ -1,101 +1,151 @@
1
- #--------------------------------------------------------------------
2
- # mkrf_conf_bingem.rb - Rakefile generator binary gem installation
3
- #
4
- # Author: Martin Corino
5
- #
6
- # This program is free software; you can redistribute it and/or
7
- # modify it under the terms of the R2CORBA LICENSE which is
8
- # included with this program.
9
- #
10
- # Copyright (c) Remedy IT Expertise BV
11
- # Chamber of commerce Rotterdam nr.276339, The Netherlands
12
- #--------------------------------------------------------------------
13
-
14
- # generate Rakefile with appropriate default task (all actual task in rakelib)
15
- File.open('Rakefile', 'w') do |f|
16
- f.puts <<EOF__
17
- #--------------------------------------------------------------------
18
- # Rakefile - build file for srcgem installation
19
- #
20
- # Author: Martin Corino
21
- #
22
- # This program is free software; you can redistribute it and/or
23
- # modify it under the terms of the R2CORBA LICENSE which is
24
- # included with this program.
25
- #
26
- # Copyright (c) Remedy IT Expertise BV
27
- # Chamber of commerce Rotterdam nr.276339, The Netherlands
28
- #--------------------------------------------------------------------
29
-
30
- if defined?(JRUBY_VERSION)
31
- task :default => 'r2corba:build'
32
- else
33
- task :default => 'r2corba:gem:binbuild'
34
- end
35
- EOF__
36
- end
37
-
38
- if defined?(JRUBY_VERSION)
39
-
40
- unless system("ruby -S rake -- configure --jacorb-home=#{File.expand_path('ext')}")
41
- $stderr.puts "Failed to configure R2CORBA"
42
- exit(1)
43
- end
44
-
45
- else
46
- require 'rbconfig'
47
- if defined? ::RbConfig
48
- RB_CONFIG = ::RbConfig::CONFIG
49
- else
50
- RB_CONFIG = ::Config::CONFIG
51
- end unless defined? RB_CONFIG
52
-
53
- # check if we have a full bin gem here, or one without extension binaries
54
- if Dir["ext/*.#{RB_CONFIG['DLEXT']}"].empty?
55
-
56
- RB_VER_MAJOR, RB_VER_MINOR, RB_VER_REL = RUBY_VERSION.split('.').collect {|n| n.to_i}
57
-
58
- require File.join(File.dirname(__FILE__), 'lib', 'corba', 'common', 'version.rb')
59
-
60
- require 'rubygems'
61
- require 'rubygems/command.rb'
62
- require 'rubygems/dependency_installer.rb'
63
- require 'rubygems/uninstaller'
64
- require 'fileutils'
65
- begin
66
- Gem::Command.build_args = ARGV
67
- rescue NoMethodError
68
- end
69
- Gem.sources << ENV['R2CORBA_GEM_SOURCE'] unless ENV['R2CORBA_GEM_SOURCE'].to_s.empty?
70
- puts "Gem sources: #{Gem.sources.to_a}"
71
- inst = Gem::DependencyInstaller.new
72
- begin
73
- # install corresponding gem with extension binaries
74
- puts "Installing extension binaries gem: r2corba_ext#{RB_VER_MAJOR}#{RB_VER_MINOR}-#{R2CORBA::R2CORBA_VERSION}."
75
- spec = inst.install("r2corba_ext#{RB_VER_MAJOR}#{RB_VER_MINOR}", R2CORBA::R2CORBA_VERSION.dup).last
76
- begin
77
- # move extension binaries from extension binaries gem location to our own
78
- srcdir = File.join(spec.gem_dir, 'ext')
79
- puts "Moving extension binaries from #{srcdir}"
80
- Dir[File.join(srcdir, '*')].each do |extpath|
81
- FileUtils.mv(extpath, 'ext', :force => true)
82
- end
83
- ensure
84
- # uninstall extension binaries gem
85
- puts "Uninstalling extension binaries gem: r2corba_ext#{RB_VER_MAJOR}#{RB_VER_MINOR}-#{R2CORBA::R2CORBA_VERSION}."
86
- Gem::Uninstaller.new("r2corba_ext#{RB_VER_MAJOR}#{RB_VER_MINOR}", :version => R2CORBA::R2CORBA_VERSION.dup).uninstall
87
- end
88
- rescue
89
- puts "Failed to install binary r2corba_ext#{RB_VER_MAJOR}#{RB_VER_MINOR} v. #{R2CORBA::R2CORBA_VERSION} gem for #{RUBY_PLATFORM}."
90
- puts "#{$!}\n#{$!.backtrace.join('\n')}"
91
- exit(1)
92
- end
93
-
94
- end
95
-
96
- puts "Running rake -- configure --without-tao"
97
- unless system("rake -- configure --without-tao")
98
- puts "Failed to configure R2CORBA."
99
- exit(1)
100
- end
101
- end
1
+ #--------------------------------------------------------------------
2
+ # mkrf_conf_bingem.rb - Rakefile generator binary gem installation
3
+ #
4
+ # Author: Martin Corino
5
+ #
6
+ # This program is free software; you can redistribute it and/or
7
+ # modify it under the terms of the R2CORBA LICENSE which is
8
+ # included with this program.
9
+ #
10
+ # Copyright (c) Remedy IT Expertise BV
11
+ # Chamber of commerce Rotterdam nr.276339, The Netherlands
12
+ #--------------------------------------------------------------------
13
+
14
+ # generate Rakefile with appropriate default task (all actual task in rakelib)
15
+ File.open('Rakefile', 'w') do |f|
16
+ f.puts <<EOF__
17
+ #--------------------------------------------------------------------
18
+ # Rakefile - build file for srcgem installation
19
+ #
20
+ # Author: Martin Corino
21
+ #
22
+ # This program is free software; you can redistribute it and/or
23
+ # modify it under the terms of the R2CORBA LICENSE which is
24
+ # included with this program.
25
+ #
26
+ # Copyright (c) Remedy IT Expertise BV
27
+ # Chamber of commerce Rotterdam nr.276339, The Netherlands
28
+ #--------------------------------------------------------------------
29
+
30
+ if defined?(JRUBY_VERSION)
31
+ task :default => 'r2corba:build'
32
+ else
33
+ task :default => 'r2corba:gem:binbuild'
34
+ end
35
+ EOF__
36
+ end
37
+
38
+ if defined?(JRUBY_VERSION)
39
+
40
+ unless system("ruby -S rake -- configure --jacorb-home=#{File.expand_path('ext')}")
41
+ $stderr.puts "Failed to configure R2CORBA"
42
+ exit(1)
43
+ end
44
+
45
+ else
46
+ require 'rbconfig'
47
+ if defined? ::RbConfig
48
+ RB_CONFIG = ::RbConfig::CONFIG
49
+ else
50
+ RB_CONFIG = ::Config::CONFIG
51
+ end unless defined? RB_CONFIG
52
+
53
+ # check if we have a full bin gem here, or one without extension binaries
54
+ if Dir["ext/*.#{RB_CONFIG['DLEXT']}"].empty?
55
+
56
+ RB_VER_MAJOR, RB_VER_MINOR, RB_VER_REL = RUBY_VERSION.split('.').collect {|n| n.to_i}
57
+
58
+ require File.join(File.dirname(__FILE__), 'lib', 'corba', 'common', 'version.rb')
59
+
60
+ require 'rubygems'
61
+ require 'rubygems/command.rb'
62
+ require 'rubygems/dependency_installer.rb'
63
+ require 'rubygems/uninstaller'
64
+ require 'fileutils'
65
+
66
+ ## ==========================================================================================##
67
+
68
+ # determin rubygems version
69
+ gem_ver_major, gem_ver_minor, gem_ver_release = Gem::VERSION.split('.').collect {|s| s.to_i }
70
+ # in case of rubygems 2.3.0 - 2.4.5
71
+ if gem_ver_major == 2 && (gem_ver_minor == 3 || (gem_ver_minor == 4 && gem_ver_release <= 5))
72
+ # patch the Gem::Resolver::InstallerSet class
73
+ require 'rubygems/resolver/installer_set'
74
+ class ::Gem::Resolver::InstallerSet
75
+ def add_always_install dependency
76
+ request = Gem::Resolver::DependencyRequest.new dependency, nil
77
+
78
+ found = find_all request
79
+
80
+ found.delete_if { |s|
81
+ s.version.prerelease? and not s.local?
82
+ } unless dependency.prerelease?
83
+
84
+ found = found.select do |s|
85
+ Gem::Source::SpecificFile === s.source or
86
+ Gem::Platform::RUBY == s.platform or
87
+ # *** MCO patch *** use correct platform comparison -> s.platform === String
88
+ Gem::Platform.local =~ s.platform
89
+ end
90
+
91
+ if found.empty? then
92
+ exc = Gem::UnsatisfiableDependencyError.new request
93
+ exc.errors = errors
94
+
95
+ raise exc
96
+ end
97
+
98
+ newest = found.max_by do |s|
99
+ [s.version, s.platform == Gem::Platform::RUBY ? -1 : 1]
100
+ end
101
+
102
+ @always_install << newest.spec
103
+ end
104
+ end
105
+ end
106
+
107
+ ## ==========================================================================================##
108
+
109
+ begin
110
+ Gem::Command.build_args = ARGV
111
+ rescue NoMethodError
112
+ end
113
+ unless ENV['R2CORBA_GEM_SOURCE'].to_s.empty?
114
+ # make sure the RubyGems configuration has been loaded as this potentially overwrites
115
+ # Gem.sources
116
+ Gem.configuration
117
+ # add custom source
118
+ Gem.sources << ENV['R2CORBA_GEM_SOURCE']
119
+ puts "Gem sources: #{Gem.sources.to_a}"
120
+ end
121
+ inst = Gem::DependencyInstaller.new
122
+ begin
123
+ # install corresponding gem with extension binaries
124
+ puts "Installing extension binaries gem: r2corba_ext#{RB_VER_MAJOR}#{RB_VER_MINOR}-#{R2CORBA::R2CORBA_VERSION}."
125
+ spec = inst.install("r2corba_ext#{RB_VER_MAJOR}#{RB_VER_MINOR}", R2CORBA::R2CORBA_VERSION.dup).last
126
+ begin
127
+ # move extension binaries from extension binaries gem location to our own
128
+ srcdir = File.join(spec.gem_dir, 'ext')
129
+ puts "Moving extension binaries from #{srcdir}"
130
+ Dir[File.join(srcdir, '*')].each do |extpath|
131
+ FileUtils.mv(extpath, 'ext', :force => true)
132
+ end
133
+ ensure
134
+ # uninstall extension binaries gem
135
+ puts "Uninstalling extension binaries gem: r2corba_ext#{RB_VER_MAJOR}#{RB_VER_MINOR}-#{R2CORBA::R2CORBA_VERSION}."
136
+ Gem::Uninstaller.new("r2corba_ext#{RB_VER_MAJOR}#{RB_VER_MINOR}", :version => R2CORBA::R2CORBA_VERSION.dup).uninstall
137
+ end
138
+ rescue
139
+ puts "Failed to install binary r2corba_ext#{RB_VER_MAJOR}#{RB_VER_MINOR} v. #{R2CORBA::R2CORBA_VERSION} gem for #{RUBY_PLATFORM}."
140
+ puts "#{$!}\n#{$!.backtrace.join('\n')}"
141
+ exit(1)
142
+ end
143
+
144
+ end
145
+
146
+ puts "Running rake -- configure --without-tao"
147
+ unless system("rake -- configure --without-tao")
148
+ puts "Failed to configure R2CORBA."
149
+ exit(1)
150
+ end
151
+ end
data/rakelib/bin.rake CHANGED
@@ -1,80 +1,80 @@
1
- #--------------------------------------------------------------------
2
- # bin.rake - build file
3
- #
4
- # Author: Martin Corino
5
- #
6
- # This program is free software; you can redistribute it and/or
7
- # modify it under the terms of the R2CORBA LICENSE which is
8
- # included with this program.
9
- #
10
- # Copyright (c) Remedy IT Expertise BV
11
- # Chamber of commerce Rotterdam nr.276339, The Netherlands
12
- #--------------------------------------------------------------------
13
-
14
- require File.join(File.dirname(__FILE__), 'bin.rb')
15
-
16
- directory 'bin'
17
-
18
- file File.join('bin', 'ridlc') => ['bin'] do |t|
19
- File.open(t.name, 'w') { |f| f.puts R2CORBA::Bin.ridlc }
20
- File.chmod(0755, t.name)
21
- end
22
-
23
- CLOBBER.include File.join('bin', 'ridlc')
24
-
25
- file File.join('bin', 'rins') => ['bin'] do |t|
26
- File.open(t.name, 'w') { |f| f.puts R2CORBA::Bin.rins }
27
- File.chmod(0755, t.name)
28
- end
29
-
30
- CLOBBER.include File.join('bin', 'rins')
31
-
32
- file File.join('bin', 'r2corba') => ['bin'] do |t|
33
- File.open(t.name, 'w') { |f| f.puts R2CORBA::Bin.r2corba }
34
- File.chmod(0755, t.name)
35
- end
36
-
37
- CLOBBER.include File.join('bin', 'r2corba')
38
-
39
- namespace :r2corba do
40
- #desc 'Generate R2CORBA executor scripts'
41
- namespace :bin do
42
- task :build => ['r2corba:bin:check', 'r2corba:bin:files']
43
-
44
- task :check do
45
- R2CORBA::Bin.binaries.each do |bin|
46
- if File.exists?(File.join('bin', bin))
47
- content = IO.read(File.join('bin', bin))
48
- rm_f(File.join('bin', bin)) unless content == R2CORBA::Bin.__send__(bin.gsub('.','_').to_sym)
49
- end
50
- end
51
- end
52
-
53
- task :files => [File.join('bin', 'ridlc'), File.join('bin', 'rins'), File.join('bin', 'r2corba')]
54
- end
55
- end
56
-
57
- if R2CORBA::Config.is_win32 || defined?(JRUBY_VERSION)
58
-
59
- file File.join('bin', 'ridlc.bat') => ['bin'] do |t|
60
- File.open(t.name, 'w') { |f| f.puts R2CORBA::Bin.ridlc_bat }
61
- end
62
- Rake::Task['r2corba:bin:files'].enhance [File.join('bin', 'ridlc.bat')]
63
-
64
- CLOBBER.include File.join('bin', 'ridlc.bat')
65
-
66
- file File.join('bin', 'rins.bat') => ['bin'] do |t|
67
- File.open(t.name, 'w') { |f| f.puts R2CORBA::Bin.rins_bat }
68
- end
69
- Rake::Task['r2corba:bin:files'].enhance [File.join('bin', 'rins.bat')]
70
-
71
- CLOBBER.include File.join('bin', 'rins.bat')
72
-
73
- file File.join('bin', 'r2corba.bat') => ['bin'] do |t|
74
- File.open(t.name, 'w') { |f| f.puts R2CORBA::Bin.r2corba_bat }
75
- end
76
- Rake::Task['r2corba:bin:files'].enhance [File.join('bin', 'r2corba.bat')]
77
-
78
- CLOBBER.include File.join('bin', 'r2corba.bat')
79
-
80
- end
1
+ #--------------------------------------------------------------------
2
+ # bin.rake - build file
3
+ #
4
+ # Author: Martin Corino
5
+ #
6
+ # This program is free software; you can redistribute it and/or
7
+ # modify it under the terms of the R2CORBA LICENSE which is
8
+ # included with this program.
9
+ #
10
+ # Copyright (c) Remedy IT Expertise BV
11
+ # Chamber of commerce Rotterdam nr.276339, The Netherlands
12
+ #--------------------------------------------------------------------
13
+
14
+ require File.join(File.dirname(__FILE__), 'bin.rb')
15
+
16
+ directory 'bin'
17
+
18
+ file File.join('bin', 'ridlc') => ['bin'] do |t|
19
+ File.open(t.name, 'w') { |f| f.puts R2CORBA::Bin.ridlc }
20
+ File.chmod(0755, t.name)
21
+ end
22
+
23
+ CLOBBER.include File.join('bin', 'ridlc')
24
+
25
+ file File.join('bin', 'rins') => ['bin'] do |t|
26
+ File.open(t.name, 'w') { |f| f.puts R2CORBA::Bin.rins }
27
+ File.chmod(0755, t.name)
28
+ end
29
+
30
+ CLOBBER.include File.join('bin', 'rins')
31
+
32
+ file File.join('bin', 'r2corba') => ['bin'] do |t|
33
+ File.open(t.name, 'w') { |f| f.puts R2CORBA::Bin.r2corba }
34
+ File.chmod(0755, t.name)
35
+ end
36
+
37
+ CLOBBER.include File.join('bin', 'r2corba')
38
+
39
+ namespace :r2corba do
40
+ #desc 'Generate R2CORBA executor scripts'
41
+ namespace :bin do
42
+ task :build => ['r2corba:bin:check', 'r2corba:bin:files']
43
+
44
+ task :check do
45
+ R2CORBA::Bin.binaries.each do |bin|
46
+ if File.exists?(File.join('bin', bin))
47
+ content = IO.read(File.join('bin', bin))
48
+ rm_f(File.join('bin', bin)) unless content == R2CORBA::Bin.__send__(bin.gsub('.','_').to_sym)
49
+ end
50
+ end
51
+ end
52
+
53
+ task :files => [File.join('bin', 'ridlc'), File.join('bin', 'rins'), File.join('bin', 'r2corba')]
54
+ end
55
+ end
56
+
57
+ if R2CORBA::Config.is_win32 || defined?(JRUBY_VERSION)
58
+
59
+ file File.join('bin', 'ridlc.bat') => ['bin'] do |t|
60
+ File.open(t.name, 'w') { |f| f.puts R2CORBA::Bin.ridlc_bat }
61
+ end
62
+ Rake::Task['r2corba:bin:files'].enhance [File.join('bin', 'ridlc.bat')]
63
+
64
+ CLOBBER.include File.join('bin', 'ridlc.bat')
65
+
66
+ file File.join('bin', 'rins.bat') => ['bin'] do |t|
67
+ File.open(t.name, 'w') { |f| f.puts R2CORBA::Bin.rins_bat }
68
+ end
69
+ Rake::Task['r2corba:bin:files'].enhance [File.join('bin', 'rins.bat')]
70
+
71
+ CLOBBER.include File.join('bin', 'rins.bat')
72
+
73
+ file File.join('bin', 'r2corba.bat') => ['bin'] do |t|
74
+ File.open(t.name, 'w') { |f| f.puts R2CORBA::Bin.r2corba_bat }
75
+ end
76
+ Rake::Task['r2corba:bin:files'].enhance [File.join('bin', 'r2corba.bat')]
77
+
78
+ CLOBBER.include File.join('bin', 'r2corba.bat')
79
+
80
+ end
data/rakelib/bin.rb CHANGED
@@ -1,146 +1,146 @@
1
- #--------------------------------------------------------------------
2
- # bin.rb - build file
3
- #
4
- # Author: Martin Corino
5
- #
6
- # This program is free software; you can redistribute it and/or
7
- # modify it under the terms of the R2CORBA LICENSE which is
8
- # included with this program.
9
- #
10
- # Copyright (c) Remedy IT Expertise BV
11
- # Chamber of commerce Rotterdam nr.276339, The Netherlands
12
- #--------------------------------------------------------------------
13
-
14
- require File.join(File.dirname(__FILE__), 'config.rb')
15
-
16
- module R2CORBA
17
-
18
- module Bin
19
-
20
- def self.ridlc
21
- <<_SH_TXT
22
- #!#{(`which env`).strip} #{R2CORBA::RB_CONFIG['ruby_install_name']}
23
- #---------------------------------
24
- # This file is generated
25
- #---------------------------------
26
- ENV['RIDL_BE_SELECT'] = 'ruby'
27
- unless defined? Gem
28
- require 'rubygems' rescue nil
29
- end
30
- require 'ridl/ridl'
31
-
32
- IDL.run
33
- _SH_TXT
34
- end
35
-
36
- def self.ridlc_bat
37
- <<_BAT_TXT
38
- @echo off
39
- if not "%~f0" == "~f0" goto WinNT
40
- #{R2CORBA::RB_CONFIG['ruby_install_name']} -Sx "%0" %1 %2 %3 %4 %5 %6 %7 %8 %9
41
- goto endofruby
42
- :WinNT
43
- if not exist "%~d0%~p0#{R2CORBA::RB_CONFIG['ruby_install_name']}" goto rubyfrompath
44
- if exist "%~d0%~p0#{R2CORBA::RB_CONFIG['ruby_install_name']}" "%~d0%~p0#{R2CORBA::RB_CONFIG['ruby_install_name']}" -x "%~f0" %*
45
- goto endofruby
46
- :rubyfrompath
47
- #{R2CORBA::RB_CONFIG['ruby_install_name']} -x "%~f0" %*
48
- goto endofruby
49
- #!/bin/#{R2CORBA::RB_CONFIG['ruby_install_name']}
50
- #
51
- ENV['RIDL_BE_SELECT'] = 'ruby'
52
- unless defined? Gem
53
- require 'rubygems' rescue nil
54
- end
55
- require 'ridl/ridl'
56
-
57
- IDL.run
58
-
59
- __END__
60
- :endofruby
61
- _BAT_TXT
62
- end
63
-
64
- def self.rins_bat
65
- <<_BAT_TXT
66
- @echo off
67
- if not "%~f0" == "~f0" goto WinNT
68
- #{R2CORBA::RB_CONFIG['ruby_install_name']} -Sx "%0" %1 %2 %3 %4 %5 %6 %7 %8 %9
69
- goto endofruby
70
- :WinNT
71
- if not exist "%~d0%~p0#{R2CORBA::RB_CONFIG['ruby_install_name']}" goto rubyfrompath
72
- if exist "%~d0%~p0#{R2CORBA::RB_CONFIG['ruby_install_name']}" "%~d0%~p0#{R2CORBA::RB_CONFIG['ruby_install_name']}" -x "%~f0" %*
73
- goto endofruby
74
- :rubyfrompath
75
- #{R2CORBA::RB_CONFIG['ruby_install_name']} -x "%~f0" %*
76
- goto endofruby
77
- #!/bin/#{R2CORBA::RB_CONFIG['ruby_install_name']}
78
- #
79
- require 'corba/svcs/ins/ins'
80
-
81
- INS.run
82
-
83
- __END__
84
- :endofruby
85
- _BAT_TXT
86
- end
87
-
88
- def self.rins
89
- <<_SH_TXT
90
- #!#{(`which env`).strip} #{R2CORBA::RB_CONFIG['ruby_install_name']}
91
- #---------------------------------
92
- # This file is generated
93
- #---------------------------------
94
- require 'corba/svcs/ins/ins'
95
-
96
- INS.run
97
- _SH_TXT
98
- end
99
-
100
- def self.r2corba
101
- <<_SH_TXT
102
- #!#{(`which env`).strip} #{R2CORBA::RB_CONFIG['ruby_install_name']}
103
- #---------------------------------
104
- # This file is generated
105
- #---------------------------------
106
- unless defined? Gem
107
- require 'rubygems' rescue nil
108
- end
109
- require 'corba/cmds/base'
110
- _SH_TXT
111
- end
112
-
113
- def self.r2corba_bat
114
- <<_BAT_TXT
115
- @echo off
116
- if not "%~f0" == "~f0" goto WinNT
117
- #{R2CORBA::RB_CONFIG['ruby_install_name']} -Sx "%0" %1 %2 %3 %4 %5 %6 %7 %8 %9
118
- goto endofruby
119
- :WinNT
120
- if not exist "%~d0%~p0#{R2CORBA::RB_CONFIG['ruby_install_name']}" goto rubyfrompath
121
- if exist "%~d0%~p0#{R2CORBA::RB_CONFIG['ruby_install_name']}" "%~d0%~p0#{R2CORBA::RB_CONFIG['ruby_install_name']}" -x "%~f0" %*
122
- goto endofruby
123
- :rubyfrompath
124
- #{R2CORBA::RB_CONFIG['ruby_install_name']} -x "%~f0" %*
125
- goto endofruby
126
- #!/bin/#{R2CORBA::RB_CONFIG['ruby_install_name']}
127
- #
128
- unless defined? Gem
129
- require 'rubygems' rescue nil
130
- end
131
- require 'corba/cmds/base'
132
-
133
- __END__
134
- :endofruby
135
- _BAT_TXT
136
- end
137
-
138
- def self.binaries
139
- l = %w{ridlc rins r2corba}
140
- l.concat %w{ridlc.bat rins.bat r2corba.bat} if R2CORBA::Config.is_win32 || defined?(JRUBY_VERSION)
141
- l
142
- end
143
-
144
- end # Bin
145
-
1
+ #--------------------------------------------------------------------
2
+ # bin.rb - build file
3
+ #
4
+ # Author: Martin Corino
5
+ #
6
+ # This program is free software; you can redistribute it and/or
7
+ # modify it under the terms of the R2CORBA LICENSE which is
8
+ # included with this program.
9
+ #
10
+ # Copyright (c) Remedy IT Expertise BV
11
+ # Chamber of commerce Rotterdam nr.276339, The Netherlands
12
+ #--------------------------------------------------------------------
13
+
14
+ require File.join(File.dirname(__FILE__), 'config.rb')
15
+
16
+ module R2CORBA
17
+
18
+ module Bin
19
+
20
+ def self.ridlc
21
+ <<_SH_TXT
22
+ #!#{Config.is_win32 ? '/bin/' : (`which env`).strip+' '}#{R2CORBA::RB_CONFIG['ruby_install_name']}
23
+ #---------------------------------
24
+ # This file is generated
25
+ #---------------------------------
26
+ ENV['RIDL_BE_SELECT'] = 'ruby'
27
+ unless defined? Gem
28
+ require 'rubygems' rescue nil
29
+ end
30
+ require 'ridl/ridl'
31
+
32
+ IDL.run
33
+ _SH_TXT
34
+ end
35
+
36
+ def self.ridlc_bat
37
+ <<_BAT_TXT
38
+ @echo off
39
+ if not "%~f0" == "~f0" goto WinNT
40
+ #{R2CORBA::RB_CONFIG['ruby_install_name']} -Sx "%0" %1 %2 %3 %4 %5 %6 %7 %8 %9
41
+ goto endofruby
42
+ :WinNT
43
+ if not exist "%~d0%~p0#{R2CORBA::RB_CONFIG['ruby_install_name']}" goto rubyfrompath
44
+ if exist "%~d0%~p0#{R2CORBA::RB_CONFIG['ruby_install_name']}" "%~d0%~p0#{R2CORBA::RB_CONFIG['ruby_install_name']}" -x "%~f0" %*
45
+ goto endofruby
46
+ :rubyfrompath
47
+ #{R2CORBA::RB_CONFIG['ruby_install_name']} -x "%~f0" %*
48
+ goto endofruby
49
+ #!/bin/#{R2CORBA::RB_CONFIG['ruby_install_name']}
50
+ #
51
+ ENV['RIDL_BE_SELECT'] = 'ruby'
52
+ unless defined? Gem
53
+ require 'rubygems' rescue nil
54
+ end
55
+ require 'ridl/ridl'
56
+
57
+ IDL.run
58
+
59
+ __END__
60
+ :endofruby
61
+ _BAT_TXT
62
+ end
63
+
64
+ def self.rins_bat
65
+ <<_BAT_TXT
66
+ @echo off
67
+ if not "%~f0" == "~f0" goto WinNT
68
+ #{R2CORBA::RB_CONFIG['ruby_install_name']} -Sx "%0" %1 %2 %3 %4 %5 %6 %7 %8 %9
69
+ goto endofruby
70
+ :WinNT
71
+ if not exist "%~d0%~p0#{R2CORBA::RB_CONFIG['ruby_install_name']}" goto rubyfrompath
72
+ if exist "%~d0%~p0#{R2CORBA::RB_CONFIG['ruby_install_name']}" "%~d0%~p0#{R2CORBA::RB_CONFIG['ruby_install_name']}" -x "%~f0" %*
73
+ goto endofruby
74
+ :rubyfrompath
75
+ #{R2CORBA::RB_CONFIG['ruby_install_name']} -x "%~f0" %*
76
+ goto endofruby
77
+ #!/bin/#{R2CORBA::RB_CONFIG['ruby_install_name']}
78
+ #
79
+ require 'corba/svcs/ins/ins'
80
+
81
+ INS.run
82
+
83
+ __END__
84
+ :endofruby
85
+ _BAT_TXT
86
+ end
87
+
88
+ def self.rins
89
+ <<_SH_TXT
90
+ #!#{Config.is_win32 ? '/bin/' : (`which env`).strip+' '}#{R2CORBA::RB_CONFIG['ruby_install_name']}
91
+ #---------------------------------
92
+ # This file is generated
93
+ #---------------------------------
94
+ require 'corba/svcs/ins/ins'
95
+
96
+ INS.run
97
+ _SH_TXT
98
+ end
99
+
100
+ def self.r2corba
101
+ <<_SH_TXT
102
+ #!#{Config.is_win32 ? '/bin/' : (`which env`).strip+' '}#{R2CORBA::RB_CONFIG['ruby_install_name']}
103
+ #---------------------------------
104
+ # This file is generated
105
+ #---------------------------------
106
+ unless defined? Gem
107
+ require 'rubygems' rescue nil
108
+ end
109
+ require 'corba/cmds/base'
110
+ _SH_TXT
111
+ end
112
+
113
+ def self.r2corba_bat
114
+ <<_BAT_TXT
115
+ @echo off
116
+ if not "%~f0" == "~f0" goto WinNT
117
+ #{R2CORBA::RB_CONFIG['ruby_install_name']} -Sx "%0" %1 %2 %3 %4 %5 %6 %7 %8 %9
118
+ goto endofruby
119
+ :WinNT
120
+ if not exist "%~d0%~p0#{R2CORBA::RB_CONFIG['ruby_install_name']}" goto rubyfrompath
121
+ if exist "%~d0%~p0#{R2CORBA::RB_CONFIG['ruby_install_name']}" "%~d0%~p0#{R2CORBA::RB_CONFIG['ruby_install_name']}" -x "%~f0" %*
122
+ goto endofruby
123
+ :rubyfrompath
124
+ #{R2CORBA::RB_CONFIG['ruby_install_name']} -x "%~f0" %*
125
+ goto endofruby
126
+ #!/bin/#{R2CORBA::RB_CONFIG['ruby_install_name']}
127
+ #
128
+ unless defined? Gem
129
+ require 'rubygems' rescue nil
130
+ end
131
+ require 'corba/cmds/base'
132
+
133
+ __END__
134
+ :endofruby
135
+ _BAT_TXT
136
+ end
137
+
138
+ def self.binaries
139
+ l = %w{ridlc rins r2corba}
140
+ l.concat %w{ridlc.bat rins.bat r2corba.bat} if R2CORBA::Config.is_win32 || defined?(JRUBY_VERSION)
141
+ l
142
+ end
143
+
144
+ end # Bin
145
+
146
146
  end # R2CORBA