r2corba 1.5.1-x64-mingw32 → 1.5.5-x64-mingw32

Sign up to get free protection for your applications and to get access to all the features.
Files changed (248) hide show
  1. checksums.yaml +4 -4
  2. data/LICENSE +5 -5
  3. data/README.rdoc +62 -0
  4. data/THANKS +4 -4
  5. data/lib/corba.rb +0 -1
  6. data/lib/corba/cbase/IORMap.rb +0 -1
  7. data/lib/corba/cbase/ORB.rb +7 -8
  8. data/lib/corba/cbase/Request.rb +1 -2
  9. data/lib/corba/cbase/Streams.rb +2 -3
  10. data/lib/corba/cbase/Stub.rb +0 -1
  11. data/lib/corba/cbase/Typecode.rb +6 -7
  12. data/lib/corba/cbase/Values.rb +0 -1
  13. data/lib/corba/cbase/exception.rb +2 -3
  14. data/lib/corba/cbase/poa.rb +0 -1
  15. data/lib/corba/cbase/policies.rb +2 -3
  16. data/lib/corba/cbase/post_require.rb +1 -2
  17. data/lib/corba/cbase/require.rb +2 -1
  18. data/lib/corba/cmds/base.rb +1 -2
  19. data/lib/corba/cmds/test.rb +0 -1
  20. data/lib/corba/common/Any.rb +1 -2
  21. data/lib/corba/common/IDL.rb +5 -9
  22. data/lib/corba/common/ORB.rb +1 -2
  23. data/lib/corba/common/Object.rb +4 -2
  24. data/lib/corba/common/Request.rb +1 -2
  25. data/lib/corba/common/Servant.rb +0 -1
  26. data/lib/corba/common/Struct.rb +1 -2
  27. data/lib/corba/common/Stub.rb +1 -2
  28. data/lib/corba/common/Typecode.rb +56 -57
  29. data/lib/corba/common/Union.rb +1 -2
  30. data/lib/corba/common/Values.rb +1 -2
  31. data/lib/corba/common/const.rb +2 -3
  32. data/lib/corba/common/exception.rb +0 -1
  33. data/lib/corba/common/require.rb +8 -1
  34. data/lib/corba/common/version.rb +3 -4
  35. data/lib/corba/idl/BiDirPolicyC.rb +2 -3
  36. data/lib/corba/idl/CosNamingC.rb +4 -5
  37. data/lib/corba/idl/CosNamingS.rb +2 -3
  38. data/lib/corba/idl/IDL.rb +0 -1
  39. data/lib/corba/idl/IORTable.pidl +0 -1
  40. data/lib/corba/idl/IORTableC.rb +2 -3
  41. data/lib/corba/idl/MessagingC.rb +2 -3
  42. data/lib/corba/idl/POAC.rb +10 -11
  43. data/lib/corba/idl/TAO_Ext.pidl +0 -1
  44. data/lib/corba/idl/TAO_ExtC.rb +2 -3
  45. data/lib/corba/idl/r2c_orb.rb +5 -6
  46. data/lib/corba/idl/require.rb +0 -1
  47. data/lib/corba/jbase/Any.rb +24 -25
  48. data/lib/corba/jbase/IORMap.rb +1 -2
  49. data/lib/corba/jbase/ORB.rb +3 -4
  50. data/lib/corba/jbase/Object.rb +0 -1
  51. data/lib/corba/jbase/Request.rb +6 -7
  52. data/lib/corba/jbase/Servant.rb +11 -12
  53. data/lib/corba/jbase/ServerRequest.rb +8 -9
  54. data/lib/corba/jbase/Streams.rb +4 -5
  55. data/lib/corba/jbase/Stub.rb +0 -1
  56. data/lib/corba/jbase/Typecode.rb +14 -15
  57. data/lib/corba/jbase/Values.rb +0 -1
  58. data/lib/corba/jbase/exception.rb +1 -2
  59. data/lib/corba/jbase/poa.rb +3 -4
  60. data/lib/corba/jbase/policies.rb +4 -5
  61. data/lib/corba/jbase/post_require.rb +0 -1
  62. data/lib/corba/jbase/require.rb +1 -2
  63. data/lib/corba/naming.rb +0 -1
  64. data/lib/corba/naming_service.rb +0 -1
  65. data/lib/corba/poa.rb +1 -2
  66. data/lib/corba/policies.rb +1 -2
  67. data/lib/corba/require.rb +2 -3
  68. data/lib/corba/svcs/ins/cos_naming.rb +64 -67
  69. data/lib/corba/svcs/ins/ins.rb +24 -25
  70. data/lib/corba/svcs/ins/naming_service.rb +3 -4
  71. data/lib/ridlbe/ruby/config.rb +49 -52
  72. data/lib/ridlbe/ruby/require.rb +0 -1
  73. data/lib/ridlbe/ruby/walker.rb +38 -38
  74. data/mkrf_conf_bingem.rb +0 -2
  75. data/rakelib/bin.rake +2 -3
  76. data/rakelib/bin.rb +4 -5
  77. data/rakelib/build.rake +21 -21
  78. data/rakelib/config.rake +1 -2
  79. data/rakelib/config.rb +23 -25
  80. data/rakelib/ext.rake +16 -16
  81. data/rakelib/ext.rb +17 -56
  82. data/rakelib/ext_r2tao.rb +34 -24
  83. data/rakelib/gem.rake +53 -38
  84. data/rakelib/gem.rb +8 -9
  85. data/rakelib/package.rake +1 -2
  86. data/rakelib/test.rake +0 -1
  87. data/test/BiDirectional/Test.idl +0 -1
  88. data/test/BiDirectional/client.rb +4 -5
  89. data/test/BiDirectional/run_test.rb +1 -2
  90. data/test/BiDirectional/server.rb +4 -6
  91. data/test/CORBA_Services/Naming/BindingIterator/Test.idl +0 -1
  92. data/test/CORBA_Services/Naming/BindingIterator/client.rb +5 -6
  93. data/test/CORBA_Services/Naming/BindingIterator/run_test.rb +1 -2
  94. data/test/CORBA_Services/Naming/BindingIterator/server.rb +4 -5
  95. data/test/CORBA_Services/Naming/Corbaname/Test.idl +0 -1
  96. data/test/CORBA_Services/Naming/Corbaname/client.rb +3 -4
  97. data/test/CORBA_Services/Naming/Corbaname/run_test.rb +1 -2
  98. data/test/CORBA_Services/Naming/Corbaname/server.rb +10 -11
  99. data/test/CORBA_Services/Naming/Simple/Test.idl +0 -1
  100. data/test/CORBA_Services/Naming/Simple/client.rb +4 -5
  101. data/test/CORBA_Services/Naming/Simple/run_test.rb +1 -2
  102. data/test/CORBA_Services/Naming/Simple/server.rb +4 -5
  103. data/test/Collocation/Diamond.idl +0 -1
  104. data/test/Collocation/run_test.rb +0 -1
  105. data/test/Collocation/test.rb +2 -3
  106. data/test/Connect_Timeout/Test.idl +0 -1
  107. data/test/Connect_Timeout/client.rb +3 -5
  108. data/test/Connect_Timeout/run_test.rb +0 -1
  109. data/test/DII/Test.idl +0 -1
  110. data/test/DII/client.rb +5 -6
  111. data/test/DII/run_test.rb +1 -2
  112. data/test/DII/server.rb +3 -4
  113. data/test/DSI/Test.idl +0 -1
  114. data/test/DSI/client.rb +3 -4
  115. data/test/DSI/run_test.rb +1 -2
  116. data/test/DSI/server.rb +3 -4
  117. data/test/Exceptions/Test.idl +0 -1
  118. data/test/Exceptions/client.rb +5 -6
  119. data/test/Exceptions/run_test.rb +1 -2
  120. data/test/Exceptions/server.rb +3 -4
  121. data/test/Hello/Test.idl +0 -1
  122. data/test/Hello/client.rb +3 -4
  123. data/test/Hello/run_test.rb +1 -2
  124. data/test/Hello/server.rb +3 -4
  125. data/test/IDL_Test/Test.idl +4 -1
  126. data/test/IDL_Test/client.rb +6 -5
  127. data/test/IDL_Test/run_test.rb +1 -2
  128. data/test/IDL_Test/server.rb +8 -4
  129. data/test/IORMap/Test.idl +0 -1
  130. data/test/IORMap/client.rb +3 -4
  131. data/test/IORMap/run_test.rb +1 -2
  132. data/test/IORMap/server.rb +4 -5
  133. data/test/IORTable/Test.idl +0 -1
  134. data/test/IORTable/client.rb +3 -4
  135. data/test/IORTable/run_test.rb +1 -2
  136. data/test/IORTable/server.rb +4 -5
  137. data/test/Implicit_Conversion/Test.idl +0 -1
  138. data/test/Implicit_Conversion/client.rb +4 -5
  139. data/test/Implicit_Conversion/run_test.rb +1 -2
  140. data/test/Implicit_Conversion/server.rb +3 -4
  141. data/test/Multi_Threading/Multiple_ORB/Test.idl +0 -1
  142. data/test/Multi_Threading/Multiple_ORB/client.rb +3 -4
  143. data/test/Multi_Threading/Multiple_ORB/run_test.rb +2 -3
  144. data/test/Multi_Threading/Multiple_ORB/server.rb +3 -4
  145. data/test/Multi_Threading/Simple/Test.idl +0 -1
  146. data/test/Multi_Threading/Simple/client.rb +4 -5
  147. data/test/Multi_Threading/Simple/run_test.rb +1 -2
  148. data/test/Multi_Threading/Simple/server.rb +4 -5
  149. data/test/Multi_Threading/Threads/Test.idl +0 -4
  150. data/test/Multi_Threading/Threads/client.rb +10 -13
  151. data/test/Multi_Threading/Threads/run_test.rb +1 -2
  152. data/test/Multi_Threading/Threads/server.rb +4 -7
  153. data/test/Multi_Threading/Threads/watchdog.rb +3 -3
  154. data/test/Multiple_Servant_Interfaces/Test.idl +0 -1
  155. data/test/Multiple_Servant_Interfaces/client.rb +3 -4
  156. data/test/Multiple_Servant_Interfaces/run_test.rb +1 -2
  157. data/test/Multiple_Servant_Interfaces/server.rb +3 -4
  158. data/test/Nil/Test.idl +0 -1
  159. data/test/Nil/run_test.rb +0 -1
  160. data/test/Nil/test.rb +11 -9
  161. data/test/OBV/AbstractInterface/client.rb +3 -4
  162. data/test/OBV/AbstractInterface/run_test.rb +1 -2
  163. data/test/OBV/AbstractInterface/server.rb +3 -4
  164. data/test/OBV/AbstractInterface/test.idl +0 -1
  165. data/test/OBV/Custom/OBV_impl.rb +0 -1
  166. data/test/OBV/Custom/client.rb +3 -4
  167. data/test/OBV/Custom/run_test.rb +1 -2
  168. data/test/OBV/Custom/server.rb +3 -4
  169. data/test/OBV/Simple/OBV_impl.rb +0 -1
  170. data/test/OBV/Simple/client.rb +3 -4
  171. data/test/OBV/Simple/run_test.rb +1 -2
  172. data/test/OBV/Simple/server.rb +3 -4
  173. data/test/OBV/Simple_Event/Event_impl.rb +0 -1
  174. data/test/OBV/Simple_Event/client.rb +3 -4
  175. data/test/OBV/Simple_Event/run_test.rb +1 -2
  176. data/test/OBV/Simple_Event/server.rb +3 -4
  177. data/test/OBV/Supports/client.rb +3 -4
  178. data/test/OBV/Supports/run_test.rb +1 -2
  179. data/test/OBV/Supports/server.rb +3 -4
  180. data/test/OBV/Supports/supports.idl +0 -1
  181. data/test/OBV/Supports/supports_impl.rb +0 -1
  182. data/test/OBV/Tree/client.rb +3 -4
  183. data/test/OBV/Tree/run_test.rb +1 -2
  184. data/test/OBV/Tree/server.rb +3 -4
  185. data/test/OBV/Tree/test.idl +0 -1
  186. data/test/OBV/Truncatable/Extra.idl +0 -1
  187. data/test/OBV/Truncatable/Truncatable_impl.rb +1 -2
  188. data/test/OBV/Truncatable/client.rb +4 -5
  189. data/test/OBV/Truncatable/run_test.rb +1 -2
  190. data/test/OBV/Truncatable/server.rb +3 -4
  191. data/test/OBV/ValueBox/client.rb +44 -45
  192. data/test/OBV/ValueBox/run_test.rb +1 -2
  193. data/test/OBV/ValueBox/server.rb +29 -29
  194. data/test/Object/Test.idl +0 -1
  195. data/test/Object/client.rb +4 -5
  196. data/test/Object/run_test.rb +1 -2
  197. data/test/Object/server.rb +3 -4
  198. data/test/POA/run_test.rb +0 -1
  199. data/test/POA/test.rb +4 -5
  200. data/test/Param_Test/client.rb +8 -9
  201. data/test/Param_Test/run_test.rb +1 -2
  202. data/test/Param_Test/server.rb +7 -8
  203. data/test/Performance/Simple/Test.idl +0 -1
  204. data/test/Performance/Simple/client.rb +3 -4
  205. data/test/Performance/Simple/run_test.rb +1 -2
  206. data/test/Performance/Simple/server.rb +3 -4
  207. data/test/Policies/Test.idl +0 -1
  208. data/test/Policies/run_test.rb +0 -1
  209. data/test/Policies/test.rb +2 -4
  210. data/test/Timeout/client.rb +6 -7
  211. data/test/Timeout/run_test.rb +1 -2
  212. data/test/Timeout/server.rb +4 -5
  213. data/test/Timeout/test.idl +0 -1
  214. data/test/lib/assert.rb +0 -2
  215. data/test/lib/test.rb +15 -17
  216. data/test/test_runner.rb +6 -8
  217. metadata +21 -48
  218. data/README +0 -62
  219. data/test/BiDirectional/server.ior +0 -1
  220. data/test/CORBA_Services/Naming/BindingIterator/ins.ior +0 -1
  221. data/test/CORBA_Services/Naming/Corbaname/corbaname.ior +0 -1
  222. data/test/CORBA_Services/Naming/Corbaname/ins.ior +0 -1
  223. data/test/CORBA_Services/Naming/Simple/ins.ior +0 -1
  224. data/test/DII/server.ior +0 -1
  225. data/test/DSI/server.ior +0 -1
  226. data/test/Exceptions/server.ior +0 -1
  227. data/test/IDL_Test/server.ior +0 -1
  228. data/test/IORMap/server.ior +0 -1
  229. data/test/IORTable/server.ior +0 -1
  230. data/test/Implicit_Conversion/server.ior +0 -1
  231. data/test/Multi_Threading/Multiple_ORB/server0.ior +0 -1
  232. data/test/Multi_Threading/Multiple_ORB/server1.ior +0 -1
  233. data/test/Multi_Threading/Simple/server.ior +0 -1
  234. data/test/Multi_Threading/Threads/server.ior +0 -1
  235. data/test/Multi_Threading/Threads/watchdog.ior +0 -1
  236. data/test/Multiple_Servant_Interfaces/server.ior +0 -1
  237. data/test/OBV/AbstractInterface/server.ior +0 -1
  238. data/test/OBV/Custom/server.ior +0 -1
  239. data/test/OBV/Simple/server.ior +0 -1
  240. data/test/OBV/Simple_Event/server.ior +0 -1
  241. data/test/OBV/Supports/server.ior +0 -1
  242. data/test/OBV/Tree/server.ior +0 -1
  243. data/test/OBV/Truncatable/server.ior +0 -1
  244. data/test/OBV/ValueBox/server.ior +0 -1
  245. data/test/Object/server.ior +0 -1
  246. data/test/Param_Test/server.ior +0 -1
  247. data/test/Performance/Simple/server.ior +0 -1
  248. data/test/Timeout/server.ior +0 -1
data/rakelib/ext_r2tao.rb CHANGED
@@ -8,7 +8,6 @@
8
8
  # included with this program.
9
9
  #
10
10
  # Copyright (c) Remedy IT Expertise BV
11
- # Chamber of commerce Rotterdam nr.276339, The Netherlands
12
11
  #--------------------------------------------------------------------
13
12
 
14
13
  require 'open-uri'
@@ -20,7 +19,7 @@ module R2CORBA
20
19
  if RUBY_PLATFORM =~ /mingw32/
21
20
 
22
21
  mpc_os_block = <<OS_DEP__
23
- libs += #{File.basename(RB_CONFIG['LIBRUBY'],'.a').sub(/^lib/,'')}
22
+ libs += #{File.basename(RB_CONFIG['LIBRUBY'], '.a').sub(/^lib/, '')}
24
23
  libout = .
25
24
  dllout = .
26
25
  verbatim(gnuace, macros, 1) {
@@ -74,7 +73,7 @@ project : taolib, portableserver, anytypecode, dynamicany, dynamicinterface, typ
74
73
  }
75
74
  dynamicflags = R2TAO_BUILD_DLL
76
75
  includes += "#{RB_CONFIG['rubyhdrdir'] || RB_CONFIG['archdir']}" \\
77
- #{RB_CONFIG['rubyhdrdir'] ? '"'+File.join(RB_CONFIG['rubyhdrdir'], RB_CONFIG['arch'])+'"' : ''} \\
76
+ #{RB_CONFIG['rubyhdrdir'] ? '"' + File.join(RB_CONFIG['rubyhdrdir'], RB_CONFIG['arch']) + '"' : ''} \\
78
77
  .
79
78
  macros += RUBY_VER_MAJOR=#{Config.rb_ver_major} RUBY_VER_MINOR=#{Config.rb_ver_minor} RUBY_VER_RELEASE=#{Config.rb_ver_release}
80
79
  sharedname = r2tao
@@ -92,16 +91,16 @@ project : taolib, portableserver, anytypecode, dynamicany, dynamicinterface, typ
92
91
  iortable.cpp
93
92
  }
94
93
  dynamicflags = R2TAO_POA_BUILD_DLL
95
- libpaths += #{File.join('..','libr2tao')}
94
+ libpaths += #{File.join('..', 'libr2tao')}
96
95
  includes += "#{RB_CONFIG['rubyhdrdir'] || RB_CONFIG['archdir']}" \\
97
- #{RB_CONFIG['rubyhdrdir'] ? '"'+File.join(RB_CONFIG['rubyhdrdir'], RB_CONFIG['arch'])+'"' : ''} \\
96
+ #{RB_CONFIG['rubyhdrdir'] ? '"' + File.join(RB_CONFIG['rubyhdrdir'], RB_CONFIG['arch']) + '"' : ''} \\
98
97
  #{File.join('..', 'libr2tao')} \\
99
98
  .
100
99
  macros += RUBY_VER_MAJOR=#{Config.rb_ver_major} RUBY_VER_MINOR=#{Config.rb_ver_minor} RUBY_VER_RELEASE=#{Config.rb_ver_release}
101
100
  sharedname = rpoa
102
101
  libpaths += "#{RB_CONFIG['libdir']}"
103
102
  #{mpc_os_block}
104
- libs += r2tao#{Config.is_win32 ? '.'+RB_CONFIG['DLEXT'] : ''}
103
+ libs += r2tao#{Config.is_win32 ? '.' + RB_CONFIG['DLEXT'] : ''}
105
104
  }
106
105
  THE_END
107
106
 
@@ -114,7 +113,7 @@ project : taolib, portableserver, anytypecode, dynamicany, dynamicinterface, typ
114
113
  dynamicflags = R2TAO_POL_BUILD_DLL
115
114
  libpaths += #{File.join('..', 'libr2tao')} #{File.join('..', 'librpoa')}
116
115
  includes += "#{RB_CONFIG['rubyhdrdir'] || RB_CONFIG['archdir']}" \\
117
- #{RB_CONFIG['rubyhdrdir'] ? '"'+File.join(RB_CONFIG['rubyhdrdir'], RB_CONFIG['arch'])+'"' : ''} \\
116
+ #{RB_CONFIG['rubyhdrdir'] ? '"' + File.join(RB_CONFIG['rubyhdrdir'], RB_CONFIG['arch']) + '"' : ''} \\
118
117
  #{File.join('..', 'libr2tao')} \\
119
118
  #{File.join('..', 'librpoa')} \\
120
119
  .
@@ -122,8 +121,8 @@ project : taolib, portableserver, anytypecode, dynamicany, dynamicinterface, typ
122
121
  sharedname = rpol
123
122
  libpaths += "#{RB_CONFIG['libdir']}"
124
123
  #{mpc_os_block}
125
- libs += r2tao#{Config.is_win32 ? '.'+RB_CONFIG['DLEXT'] : ''}
126
- libs += rpoa#{Config.is_win32 ? '.'+RB_CONFIG['DLEXT'] : ''}
124
+ libs += r2tao#{Config.is_win32 ? '.' + RB_CONFIG['DLEXT'] : ''}
125
+ libs += rpoa#{Config.is_win32 ? '.' + RB_CONFIG['DLEXT'] : ''}
127
126
  }
128
127
  THE_END
129
128
 
@@ -148,13 +147,7 @@ project {
148
147
  extload.c
149
148
  }
150
149
  dynamicflags = EXTLOAD_BUILD_DLL
151
- includes += "#{RB_CONFIG['rubyhdrdir'] || RB_CONFIG['archdir']}" \\
152
- #{RB_CONFIG['rubyhdrdir'] ? '"'+File.join(RB_CONFIG['rubyhdrdir'], RB_CONFIG['arch'])+'"' : ''} \\
153
- .
154
- macros += RUBY_VER_MAJOR=#{Config.rb_ver_major} RUBY_VER_MINOR=#{Config.rb_ver_minor} RUBY_VER_RELEASE=#{Config.rb_ver_release}
155
150
  sharedname = extload
156
- libpaths += "#{RB_CONFIG['libdir']}"
157
- libs += #{File.basename(RB_CONFIG['LIBRUBY'],'.a').sub(/^lib/,'')}
158
151
  libout = .
159
152
  dllout = .
160
153
  verbatim(gnuace, macros, 1) {
@@ -182,7 +175,7 @@ THE_END__
182
175
  def self.get_latest_ace_version
183
176
  print 'Latest ACE release is '
184
177
  _version = nil
185
- open('https://raw.githubusercontent.com/DOCGroup/ATCD/master/ACE/ace/Version.h') do |f|
178
+ open('https://raw.githubusercontent.com/DOCGroup/ACE_TAO/master/ACE/ace/Version.h') do |f|
186
179
  f.each_line do |ln|
187
180
  if /define\s+ACE_VERSION\s+\"(.*)\"/ =~ ln
188
181
  _version = $1
@@ -193,14 +186,31 @@ THE_END__
193
186
  _version
194
187
  end
195
188
 
189
+ # Downloading from github results in some http redirects which we first have to follow
190
+ def self.follow_url(uri_str, limit = 10)
191
+ raise ArgumentError, 'HTTP redirect too deep' if limit == 0
192
+ url = URI(uri_str)
193
+ req = Net::HTTP::Get.new(url)
194
+ response = Net::HTTP.start(url.host, url.port, use_ssl: true) { |http| http.request(req) }
195
+ case response
196
+ when Net::HTTPSuccess then uri_str
197
+ when Net::HTTPRedirection then follow_url(response['location'], limit - 1)
198
+ else
199
+ response.error!
200
+ end
201
+ end
202
+
196
203
  def self.download_tao_source(version, targetdir)
197
- print(_msg = "Downloading ACE+TAO-src-#{version}.tar.gz ")
198
- _url = "http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-#{version}.tar.gz"
204
+ version_dir = version.gsub('.', '_')
205
+ _url = "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-#{version_dir}/ACE+TAO-src-#{version}.tar.gz"
206
+ print(_msg = "Downloading ACE+TAO-src-#{version}.tar.gz from #{_url}")
199
207
  _fnm = File.join(targetdir, "ACE+TAO-src-#{version}.tar.gz")
200
- Net::HTTP.start("download.dre.vanderbilt.edu") do |http|
201
- _fout = File.open(_fnm, "wb")
208
+ # First follow all http redirects
209
+ url = URI(follow_url(_url))
210
+ Net::HTTP.start(url.host, url.port, use_ssl: true) do |http|
211
+ _fout = File.open(_fnm, "wb")
202
212
  begin
203
- http.request_get("/previous_versions/ACE+TAO-src-#{version}.tar.gz") do |resp|
213
+ http.request_get(url) do |resp|
204
214
  _sndlen = resp.content_length
205
215
  _reclen = 0
206
216
  resp.read_body do |segment|
@@ -224,10 +234,10 @@ THE_END__
224
234
 
225
235
  def self.ext_shlibs
226
236
  (if Config.is_win32
227
- %w{libr2taow libepoaw librpolw}
237
+ %w{libr2taow librpoaw librpolw}
228
238
  else
229
- %w{libr2tao libepoa librpol}
230
- end).collect {|lib| File.join('ext', lib+'.so') }
239
+ %w{libr2tao librpoa librpol}
240
+ end).collect {|lib| File.join('ext', lib + '.so') }
231
241
  end
232
242
 
233
243
  end
data/rakelib/gem.rake CHANGED
@@ -8,7 +8,6 @@
8
8
  # included with this program.
9
9
  #
10
10
  # Copyright (c) Remedy IT Expertise BV
11
- # Chamber of commerce Rotterdam nr.276339, The Netherlands
12
11
  #--------------------------------------------------------------------
13
12
 
14
13
  require File.join(File.dirname(__FILE__), 'gem.rb')
@@ -26,7 +25,7 @@ namespace :r2corba do
26
25
  unless defined?(JRUBY_VERSION) || get_config('without-tao')
27
26
  # install ACE+TAO dlls
28
27
  R2CORBA::Ext.ace_shlibs.each do |acelib|
29
- libmask = R2CORBA::Config.is_linux ? acelib+'.*' : acelib
28
+ libmask = R2CORBA::Config.is_linux ? acelib + '.*' : acelib
30
29
  path = Dir.glob(libmask).first
31
30
  raise "Cannot find ACE+TAO library #{File.basename(acelib)}." unless path
32
31
  FileUtils.install(path, ext_dir, :mode => 0555, :verbose => Rake.verbose)
@@ -44,7 +43,7 @@ namespace :r2corba do
44
43
  if R2CORBA::Config.is_linux
45
44
  # create unversioned ACE/TAO lib symlinks
46
45
  R2CORBA::Ext.ace_shlibs('.so', 'ext').each do |acelib|
47
- acelib_ver = File.expand_path(Dir[acelib+'.*'].first)
46
+ acelib_ver = File.expand_path(Dir[acelib + '.*'].first)
48
47
  ln_s(acelib_ver, acelib)
49
48
  end
50
49
  end
@@ -68,16 +67,20 @@ namespace :r2corba do
68
67
  gem.summary = %Q{TAO sourcecode for building R2CORBA}
69
68
  gem.description = %Q{TAO sourcecode for building R2CORBA.}
70
69
  gem.email = 'mcorino@remedy.nl'
71
- gem.homepage = "https://osportal.remedy.nl/projects/r2corba"
72
- gem.authors = ['Martin Corino']
70
+ gem.homepage = "https://www.remedy.nl/opensource/r2corba.html"
71
+ gem.authors = ['Martin Corino', 'Johnny Willemsen']
73
72
  gem.files = Dir['lib/taosource/**/*']
74
73
  gem.files.concat(Dir["src/ACE+TAO-src-#{_ace_ver}.tar.gz"])
75
74
  gem.files << 'mkrf_conf_taogem.rb'
76
75
  gem.extensions = ['mkrf_conf_taogem.rb']
77
76
  gem.require_paths = %w{lib}
78
77
  gem.executables = []
79
- gem.required_ruby_version = '>= 1.9.3'
80
- gem.licenses = ['ACE']
78
+ gem.required_ruby_version = '>= 2.0'
79
+ gem.licenses = ['DOC']
80
+ gem.metadata = {
81
+ "bug_tracker_uri" => "https://github.com/DOCGroup/ACE_TAO/issues",
82
+ "source_code_uri" => "https://github.com/DOCGroup/ACE_TAO"
83
+ }
81
84
  end
82
85
  R2CORBA::Gem.build_gem(gemspec)
83
86
  end
@@ -89,20 +92,24 @@ end
89
92
  t_ = file File.join('pkg', "#{R2CORBA::Gem.gem_name('r2corba', R2CORBA::R2CORBA_VERSION)}.gem") => R2CORBA::Gem.manifest do
90
93
  gemspec = R2CORBA::Gem.define_spec('r2corba', R2CORBA::R2CORBA_VERSION) do |gem|
91
94
  gem.summary = %Q{CORBA language mapping implementation for Ruby}
92
- gem.description = %Q{OMG CORBA v. 3.3 compliant CORBA language mapping implementation for Ruby. Depends on ridl gem for providing native Ruby IDL compiler. }
95
+ gem.description = %Q{OMG CORBA v3.3 compliant CORBA language mapping implementation for Ruby. Depends on ridl gem for providing native Ruby IDL compiler. }
93
96
  gem.email = 'mcorino@remedy.nl'
94
- gem.homepage = "https://osportal.remedy.nl/projects/r2corba"
95
- gem.authors = ['Martin Corino']
97
+ gem.homepage = "https://www.remedy.nl/opensource/r2corba.html"
98
+ gem.authors = ['Martin Corino', 'Johnny Willemsen']
96
99
  gem.files = R2CORBA::Gem.manifest
97
100
  gem.extensions = ['mkrf_conf_srcgem.rb']
98
101
  gem.require_paths = %w{lib}
99
102
  gem.executables = %w{ridlc rins r2corba}
100
- gem.required_ruby_version = '>= 1.9.3'
101
- gem.licenses = ['R2CORBA', 'ACE', 'GPL']
103
+ gem.required_ruby_version = '>= 2.0'
104
+ gem.licenses = ['Nonstandard', 'DOC', 'GPL-2.0']
102
105
  gem.require_paths << 'ext'
103
- gem.add_dependency 'ridl', '~> 2.5'
104
- gem.add_dependency 'rake', '~> 10.0'
106
+ gem.add_dependency 'ridl', '~> 2.8'
107
+ gem.add_dependency 'rake', '>= 12.3.3'
105
108
  gem.rdoc_options << '--exclude=\\.dll' << '--exclude=\\.so' << '--exclude=\\.pidlc'
109
+ gem.metadata = {
110
+ "bug_tracker_uri" => "https://github.com/RemedyIT/r2corba/issues",
111
+ "source_code_uri" => "https://github.com/RemedyIT/r2corba"
112
+ }
106
113
  end
107
114
  R2CORBA::Gem.build_gem(gemspec)
108
115
  end
@@ -124,21 +131,21 @@ t_ = file File.join('pkg', "#{R2CORBA::Gem.gem_name('r2corba', R2CORBA::R2CORBA_
124
131
  begin
125
132
  gemspec = R2CORBA::Gem.define_spec('r2corba', R2CORBA::R2CORBA_VERSION, :extbin) do |gem|
126
133
  gem.summary = %Q{CORBA language mapping implementation for Ruby (extension binaries)}
127
- gem.description = %Q{OMG CORBA v. 3.3 compliant CORBA language mapping implementation for Ruby. Depends on ridl gem for providing native Ruby IDL compiler. (extension binaries)}
134
+ gem.description = %Q{OMG CORBA v3.3 compliant CORBA language mapping implementation for Ruby. Depends on ridl gem for providing native Ruby IDL compiler. (extension binaries)}
128
135
  gem.email = 'mcorino@remedy.nl'
129
- gem.homepage = "https://osportal.remedy.nl/projects/r2corba"
130
- gem.authors = ['Martin Corino']
136
+ gem.homepage = "https://www.remedy.nl/opensource/r2corba.html"
137
+ gem.authors = ['Martin Corino', 'Johnny Willemsen']
131
138
  gem.files = R2CORBA::Gem.manifest(:extbin)
132
139
  gem.extensions = []
133
140
  gem.require_paths = %w{ext}
134
141
  gem.executables = []
135
- if R2CORBA::Config.rb_ver_major < 2
136
- gem.required_ruby_version = '>= 1.9.3'
137
- else
138
- gem.required_ruby_version = '>= 2.0.0'
139
- end
140
- gem.licenses = ['R2CORBA', 'ACE']
142
+ gem.required_ruby_version = '>= 2.0'
143
+ gem.licenses = ['Nonstandard', 'DOC']
141
144
  gem.rdoc_options << '--exclude=\\.dll' << '--exclude=\\.so'
145
+ gem.metadata = {
146
+ "bug_tracker_uri" => "https://github.com/RemedyIT/r2corba/issues",
147
+ "source_code_uri" => "https://github.com/RemedyIT/r2corba"
148
+ }
142
149
  end
143
150
  R2CORBA::Gem.build_gem(gemspec)
144
151
  ensure
@@ -167,27 +174,31 @@ t_ = file File.join('pkg', "#{R2CORBA::Gem.gem_name('r2corba', R2CORBA::R2CORBA_
167
174
  # create gemspec
168
175
  gemspec = R2CORBA::Gem.define_spec('r2corba', R2CORBA::R2CORBA_VERSION, :bin) do |gem|
169
176
  gem.summary = %Q{CORBA language mapping implementation for Ruby}
170
- gem.description = %Q{OMG CORBA v. 3.3 compliant CORBA language mapping implementation for Ruby. Depends on ridl gem for providing native Ruby IDL compiler. }
177
+ gem.description = %Q{OMG CORBA v3.3 compliant CORBA language mapping implementation for Ruby. Depends on ridl gem for providing native Ruby IDL compiler. }
171
178
  gem.email = 'mcorino@remedy.nl'
172
- gem.homepage = "https://osportal.remedy.nl/projects/r2corba"
173
- gem.authors = ['Martin Corino']
179
+ gem.homepage = "https://www.remedy.nl/opensource/r2corba.html"
180
+ gem.authors = ['Martin Corino', 'Johnny Willemsen']
174
181
  gem.files = R2CORBA::Gem.manifest(:bin)
175
182
  gem.require_paths = %w{lib}
176
183
  gem.executables = %w{ridlc rins r2corba}
177
184
  gem.extensions = ['mkrf_conf_bingem.rb']
178
185
  if defined?(JRUBY_VERSION)
179
186
  gem.require_paths << 'jacorb/lib'
180
- gem.required_ruby_version = '>= 1.7.0'
181
- gem.licenses = ['R2CORBA', 'JacORB']
187
+ gem.required_ruby_version = '>= 2.0'
188
+ gem.licenses = ['Nonstandard', 'GPL-2.0']
182
189
  else
183
190
  gem.files << File.join('ext', '.keep') unless ENV['FULL_BINGEM'] # to force installation of ext folder if libs are left out
184
- gem.required_ruby_version = '>= 1.9.3'
185
- gem.licenses = ['R2CORBA', 'ACE', 'GPL']
191
+ gem.required_ruby_version = '>= 2.0'
192
+ gem.licenses = ['Nonstandard', 'DOC', 'GPL-2.0']
186
193
  gem.require_paths << 'ext'
187
194
  end
188
- gem.add_dependency 'ridl', '~> 2.5'
189
- gem.add_dependency 'rake', '~> 10.0'
195
+ gem.add_dependency 'ridl', '~> 2.8'
196
+ gem.add_dependency 'rake', '>= 12.3.3'
190
197
  gem.rdoc_options << '--exclude=\\.dll' << '--exclude=\\.so' << '--exclude=\\.pidlc'
198
+ gem.metadata = {
199
+ "bug_tracker_uri" => "https://github.com/RemedyIT/r2corba/issues",
200
+ "source_code_uri" => "https://github.com/RemedyIT/r2corba"
201
+ }
191
202
  end
192
203
  R2CORBA::Gem.build_gem(gemspec)
193
204
  ensure
@@ -200,7 +211,7 @@ t_ = file File.join('pkg', "#{R2CORBA::Gem.gem_name('r2corba', R2CORBA::R2CORBA_
200
211
  end
201
212
  t_.enhance ['mkrf_conf_bingem.rb']
202
213
 
203
- unless defined?(JRUBY_VERSION) || !R2CORBA::Config.is_win32
214
+ unless defined?(JRUBY_VERSION)
204
215
  # Devkit faker Gem for binary Windows gems
205
216
  t_devkit = file File.join('pkg', "#{R2CORBA::Gem.gem_name('r2corba_devkit', '1.0.0', :devkit)}.gem") => 'lib/rubygems_plugin.rb' do
206
217
  # create gemspec
@@ -208,14 +219,18 @@ unless defined?(JRUBY_VERSION) || !R2CORBA::Config.is_win32
208
219
  gem.summary = %Q{R2CORBA Devkit faker for RubyInstaller Rubies}
209
220
  gem.description = %Q{Fake Devkit loader to satisfy stupid RubyInstaller pre-install hook. }
210
221
  gem.email = 'mcorino@remedy.nl'
211
- gem.homepage = "https://osportal.remedy.nl/projects/r2corba"
212
- gem.authors = ['Martin Corino']
222
+ gem.homepage = "https://www.remedy.nl/opensource/r2corba.html"
223
+ gem.authors = ['Martin Corino', 'Johnny Willemsen']
213
224
  gem.files = 'lib/rubygems_plugin.rb'
214
225
  gem.require_paths = %w{lib}
215
226
  gem.executables = []
216
227
  gem.extensions = []
217
- gem.required_ruby_version = '>= 1.9.3'
218
- gem.licenses = ['R2CORBA']
228
+ gem.required_ruby_version = '>= 2.0'
229
+ gem.licenses = ['Nonstandard']
230
+ gem.metadata = {
231
+ "bug_tracker_uri" => "https://github.com/RemedyIT/r2corba/issues",
232
+ "source_code_uri" => "https://github.com/RemedyIT/r2corba"
233
+ }
219
234
  end
220
235
  R2CORBA::Gem.build_gem(gemspec)
221
236
  end
@@ -233,4 +248,4 @@ elsif R2CORBA::Config.is_win32
233
248
  task :gem => 'r2corba:gem:bingem'
234
249
  else
235
250
  task :gem => 'r2corba:gem:srcgem'
236
- end
251
+ end
data/rakelib/gem.rb CHANGED
@@ -8,7 +8,6 @@
8
8
  # included with this program.
9
9
  #
10
10
  # Copyright (c) Remedy IT Expertise BV
11
- # Chamber of commerce Rotterdam nr.276339, The Netherlands
12
11
  #--------------------------------------------------------------------
13
12
 
14
13
  require 'rubygems'
@@ -66,7 +65,7 @@ module R2CORBA
66
65
  manifest.concat Dir['lib/ridlbe/**/*']
67
66
  manifest << 'lib/corba.rb'
68
67
  manifest.concat Dir['test/**/*']
69
- manifest.concat %w{LICENSE README THANKS CHANGES mkrf_conf_bingem.rb}
68
+ manifest.concat %w{LICENSE README.rdoc THANKS CHANGES mkrf_conf_bingem.rb}
70
69
  manifest << 'LICENSE.jacorb' if defined?(JRUBY_VERSION)
71
70
  elsif gemtype == :extbin
72
71
  unless defined?(JRUBY_VERSION)
@@ -80,7 +79,7 @@ module R2CORBA
80
79
  manifest.concat Dir['lib/ridlbe/**/*.[^p]*']
81
80
  manifest << 'lib/corba.rb'
82
81
  manifest.concat Dir['test/**/*']
83
- manifest.concat %w{LICENSE README THANKS CHANGES mkrf_conf_srcgem.rb}
82
+ manifest.concat %w{LICENSE README.rdoc THANKS CHANGES mkrf_conf_srcgem.rb}
84
83
  end
85
84
  unless gemtype == :extbin
86
85
  if defined?(JRUBY_VERSION)
@@ -93,9 +92,9 @@ module R2CORBA
93
92
  end
94
93
 
95
94
  def self.define_spec(name, version, gemtype = :src, &block)
96
- name += '_ext' if gemtype == :extbin && !defined?(JRUBY_VERSION)
97
- name = "#{name}#{R2CORBA::Config.rb_ver_major}#{R2CORBA::Config.rb_ver_minor}" if (gemtype == :extbin || (gemtype == :bin && ENV['FULL_BINGEM'])) && !defined?(JRUBY_VERSION)
98
- gemspec = ::Gem::Specification.new(name,version.dup)
95
+ name += '_ext' if gemtype == :extbin && !defined?(JRUBY_VERSION)
96
+ name = "#{name}#{R2CORBA::Config.rb_ver_major}#{R2CORBA::Config.rb_ver_minor}" if (gemtype == :extbin || (gemtype == :bin && ENV['FULL_BINGEM'])) && !defined?(JRUBY_VERSION)
97
+ gemspec = ::Gem::Specification.new(name, version.dup)
99
98
  if gemtype == :bin || gemtype == :extbin
100
99
  gemspec.platform = defined?(JRUBY_VERSION) ? ::Gem::Platform.new('universal-java') : ::Gem::Platform::CURRENT
101
100
  end
@@ -106,8 +105,8 @@ module R2CORBA
106
105
 
107
106
  def self.gem_name(name, version, gemtype = :src)
108
107
  name += '_ext' if gemtype == :extbin && !defined?(JRUBY_VERSION)
109
- name = "#{name}#{R2CORBA::Config.rb_ver_major}#{R2CORBA::Config.rb_ver_minor}" if (gemtype == :extbin || (gemtype == :bin && ENV['FULL_BINGEM'])) && !defined?(JRUBY_VERSION)
110
- gemspec = ::Gem::Specification.new(name,version.dup)
108
+ name = "#{name}#{R2CORBA::Config.rb_ver_major}#{R2CORBA::Config.rb_ver_minor}" if (gemtype == :extbin || (gemtype == :bin && ENV['FULL_BINGEM'])) && !defined?(JRUBY_VERSION)
109
+ gemspec = ::Gem::Specification.new(name, version.dup)
111
110
  if gemtype == :bin || gemtype == :extbin
112
111
  gemspec.platform = defined?(JRUBY_VERSION) ? ::Gem::Platform.new('universal-java') : ::Gem::Platform::CURRENT
113
112
  end
@@ -143,4 +142,4 @@ module R2CORBA
143
142
 
144
143
  end
145
144
 
146
- end
145
+ end
data/rakelib/package.rake CHANGED
@@ -8,7 +8,6 @@
8
8
  # included with this program.
9
9
  #
10
10
  # Copyright (c) Remedy IT Expertise BV
11
- # Chamber of commerce Rotterdam nr.276339, The Netherlands
12
11
  #--------------------------------------------------------------------
13
12
 
14
13
  require 'rake/packagetask'
@@ -21,6 +20,6 @@ Rake::PackageTask.new("r2corba", R2CORBA::R2CORBA_VERSION) do |p|
21
20
  p.package_files.include(%w{ext/**/*.{mwc,cpp,c,h}})
22
21
  p.package_files.include(%w{example/**/* lib/**/*[^C].* test/**/* rpmbuild/**/* rakelib/**/*})
23
22
  p.package_files.exclude(/GNUmakefile/)
24
- p.package_files.include(%w{CHANGES INSTALL* LICENSE* Gemfile Rakefile README* THANKS mkrf_conf*.rb})
23
+ p.package_files.include(%w{CHANGES INSTALL* LICENSE* Gemfile Rakefile README.rdoc THANKS mkrf_conf*.rb})
25
24
  p.package_files.include(%w{ridl/lib/**/*}) if ENV['R2CORBA_PKG_RIDL']
26
25
  end
data/rakelib/test.rake CHANGED
@@ -8,7 +8,6 @@
8
8
  # included with this program.
9
9
  #
10
10
  # Copyright (c) Remedy IT Expertise BV
11
- # Chamber of commerce Rotterdam nr.276339, The Netherlands
12
11
  #--------------------------------------------------------------------
13
12
 
14
13
  require File.join(File.dirname(__FILE__), 'config.rb')
data/test/BiDirectional/Test.idl CHANGED
@@ -6,7 +6,6 @@
6
6
  * included with this program.
7
7
  *
8
8
  * Copyright (c) Remedy IT Expertise BV
9
- * Chamber of commerce Rotterdam nr.276339, The Netherlands
10
9
  *--------------------------------------------------------------------*/
11
10
 
12
11
  interface Callback
data/test/BiDirectional/client.rb CHANGED
@@ -6,7 +6,6 @@
6
6
  # included with this program.
7
7
  #
8
8
  # Copyright (c) Remedy IT Expertise BV
9
- # Chamber of commerce Rotterdam nr.276339, The Netherlands
10
9
  #--------------------------------------------------------------------
11
10
  require 'optparse'
12
11
  require 'lib/assert.rb'
@@ -26,13 +25,13 @@ ARGV.options do |opts|
26
25
 
27
26
  opts.on("--k IORFILE",
28
27
  "Set IOR.",
29
- "Default: 'file://server.ior'") { |v| OPTIONS[:iorfile]=v }
28
+ "Default: 'file://server.ior'") { |v| OPTIONS[:iorfile] = v }
30
29
  opts.on("--d LVL",
31
30
  "Set ORBDebugLevel value.",
32
- "Default: 0", Integer) { |v| OPTIONS[:orb_debuglevel]=v }
31
+ "Default: 0", Integer) { |v| OPTIONS[:orb_debuglevel] = v }
33
32
  opts.on("--use-implement",
34
33
  "Load IDL through CORBA.implement() instead of precompiled code.",
35
- "Default: off") { |v| OPTIONS[:use_implement]=v }
34
+ "Default: off") { |v| OPTIONS[:use_implement] = v }
36
35
 
37
36
  opts.separator ""
38
37
 
@@ -129,4 +128,4 @@ ensure
129
128
 
130
129
  orb.destroy()
131
130
 
132
- end
131
+ end
data/test/BiDirectional/run_test.rb CHANGED
@@ -6,7 +6,6 @@
6
6
  # included with this program.
7
7
  #
8
8
  # Copyright (c) Remedy IT Expertise BV
9
- # Chamber of commerce Rotterdam nr.276339, The Netherlands
10
9
  #--------------------------------------------------------------------
11
10
 
12
11
  OPTIONS = {
@@ -59,7 +58,7 @@ end
59
58
 
60
59
  exrc = clt.wait(400)
61
60
 
62
- if exrc ==0
61
+ if exrc == 0
63
62
  srv.wait(400)
64
63
  else
65
64
  srv.wait_term(400)