r2corba 1.5.1 → 1.5.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (269) hide show
  1. checksums.yaml +5 -5
  2. data/LICENSE +5 -5
  3. data/README.rdoc +59 -0
  4. data/THANKS +4 -4
  5. data/ext/libr2tao/any.cpp +0 -1
  6. data/ext/libr2tao/exception.cpp +0 -1
  7. data/ext/libr2tao/exception.h +0 -1
  8. data/ext/libr2tao/longdouble.cpp +0 -1
  9. data/ext/libr2tao/longdouble.h +0 -1
  10. data/ext/libr2tao/object.cpp +3 -3
  11. data/ext/libr2tao/object.h +0 -1
  12. data/ext/libr2tao/orb.cpp +4 -5
  13. data/ext/libr2tao/orb.h +0 -1
  14. data/ext/libr2tao/r2tao_export.h +0 -1
  15. data/ext/libr2tao/r2tao_ext.h +0 -1
  16. data/ext/libr2tao/required.cpp +1 -1
  17. data/ext/libr2tao/required.h +7 -1
  18. data/ext/libr2tao/typecode.cpp +0 -1
  19. data/ext/libr2tao/typecode.h +0 -1
  20. data/ext/libr2tao/values.cpp +8 -9
  21. data/ext/libr2tao/values.h +0 -1
  22. data/ext/librpoa/iortable.cpp +1 -1
  23. data/ext/librpoa/poa.cpp +3 -3
  24. data/ext/librpoa/poa.h +0 -1
  25. data/ext/librpoa/rpoa_export.h +0 -1
  26. data/ext/librpoa/servant.cpp +1 -1
  27. data/ext/librpoa/servant.h +0 -1
  28. data/ext/librpoa/srvreq_fix.cpp +0 -1
  29. data/ext/librpoa/srvreq_fix.h +0 -1
  30. data/ext/librpol/policies.cpp +0 -1
  31. data/ext/librpol/policies.h +0 -1
  32. data/ext/librpol/rpol_export.h +0 -1
  33. data/lib/corba.rb +0 -1
  34. data/lib/corba/cbase/IORMap.rb +0 -1
  35. data/lib/corba/cbase/ORB.rb +0 -1
  36. data/lib/corba/cbase/Request.rb +1 -2
  37. data/lib/corba/cbase/Streams.rb +0 -1
  38. data/lib/corba/cbase/Stub.rb +0 -1
  39. data/lib/corba/cbase/Typecode.rb +0 -1
  40. data/lib/corba/cbase/Values.rb +0 -1
  41. data/lib/corba/cbase/exception.rb +0 -1
  42. data/lib/corba/cbase/poa.rb +0 -1
  43. data/lib/corba/cbase/policies.rb +1 -2
  44. data/lib/corba/cbase/post_require.rb +1 -2
  45. data/lib/corba/cbase/require.rb +2 -1
  46. data/lib/corba/cmds/base.rb +0 -1
  47. data/lib/corba/cmds/test.rb +0 -1
  48. data/lib/corba/common/Any.rb +0 -1
  49. data/lib/corba/common/IDL.rb +2 -3
  50. data/lib/corba/common/ORB.rb +0 -1
  51. data/lib/corba/common/Object.rb +4 -1
  52. data/lib/corba/common/Request.rb +1 -2
  53. data/lib/corba/common/Servant.rb +0 -1
  54. data/lib/corba/common/Struct.rb +1 -2
  55. data/lib/corba/common/Stub.rb +0 -1
  56. data/lib/corba/common/Typecode.rb +19 -20
  57. data/lib/corba/common/Union.rb +1 -2
  58. data/lib/corba/common/Values.rb +1 -2
  59. data/lib/corba/common/const.rb +0 -1
  60. data/lib/corba/common/exception.rb +0 -1
  61. data/lib/corba/common/require.rb +0 -1
  62. data/lib/corba/common/version.rb +3 -4
  63. data/lib/corba/idl/IDL.rb +0 -1
  64. data/lib/corba/idl/IORTable.pidl +0 -1
  65. data/lib/corba/idl/TAO_Ext.pidl +0 -1
  66. data/lib/corba/idl/require.rb +0 -1
  67. data/lib/corba/jbase/Any.rb +1 -2
  68. data/lib/corba/jbase/IORMap.rb +1 -2
  69. data/lib/corba/jbase/ORB.rb +0 -1
  70. data/lib/corba/jbase/Object.rb +0 -1
  71. data/lib/corba/jbase/Request.rb +1 -2
  72. data/lib/corba/jbase/Servant.rb +1 -2
  73. data/lib/corba/jbase/ServerRequest.rb +1 -2
  74. data/lib/corba/jbase/Streams.rb +1 -2
  75. data/lib/corba/jbase/Stub.rb +0 -1
  76. data/lib/corba/jbase/Typecode.rb +0 -1
  77. data/lib/corba/jbase/Values.rb +0 -1
  78. data/lib/corba/jbase/exception.rb +0 -1
  79. data/lib/corba/jbase/poa.rb +1 -2
  80. data/lib/corba/jbase/policies.rb +1 -2
  81. data/lib/corba/jbase/post_require.rb +0 -1
  82. data/lib/corba/jbase/require.rb +1 -2
  83. data/lib/corba/naming.rb +0 -1
  84. data/lib/corba/naming_service.rb +0 -1
  85. data/lib/corba/poa.rb +0 -1
  86. data/lib/corba/policies.rb +0 -1
  87. data/lib/corba/require.rb +0 -1
  88. data/lib/corba/svcs/ins/cos_naming.rb +37 -40
  89. data/lib/corba/svcs/ins/ins.rb +6 -7
  90. data/lib/corba/svcs/ins/naming_service.rb +1 -2
  91. data/lib/ridlbe/ruby/config.rb +1 -3
  92. data/lib/ridlbe/ruby/require.rb +0 -1
  93. data/lib/ridlbe/ruby/walker.rb +16 -16
  94. data/mkrf_conf_srcgem.rb +4 -6
  95. data/rakelib/bin.rake +1 -2
  96. data/rakelib/bin.rb +1 -2
  97. data/rakelib/build.rake +6 -6
  98. data/rakelib/config.rake +1 -2
  99. data/rakelib/config.rb +6 -7
  100. data/rakelib/ext.rake +14 -12
  101. data/rakelib/ext.rb +5 -44
  102. data/rakelib/ext_r2tao.rb +23 -7
  103. data/rakelib/gem.rake +23 -24
  104. data/rakelib/gem.rb +3 -4
  105. data/rakelib/package.rake +1 -2
  106. data/rakelib/test.rake +0 -1
  107. data/test/BiDirectional/Test.idl +0 -1
  108. data/test/BiDirectional/client.rb +1 -2
  109. data/test/BiDirectional/run_test.rb +0 -1
  110. data/test/BiDirectional/server.rb +0 -1
  111. data/test/CORBA_Services/Naming/BindingIterator/Test.idl +0 -1
  112. data/test/CORBA_Services/Naming/BindingIterator/client.rb +0 -1
  113. data/test/CORBA_Services/Naming/BindingIterator/run_test.rb +0 -1
  114. data/test/CORBA_Services/Naming/BindingIterator/server.rb +0 -1
  115. data/test/CORBA_Services/Naming/Corbaname/Test.idl +0 -1
  116. data/test/CORBA_Services/Naming/Corbaname/client.rb +0 -1
  117. data/test/CORBA_Services/Naming/Corbaname/run_test.rb +0 -1
  118. data/test/CORBA_Services/Naming/Corbaname/server.rb +0 -1
  119. data/test/CORBA_Services/Naming/Simple/Test.idl +0 -1
  120. data/test/CORBA_Services/Naming/Simple/client.rb +0 -1
  121. data/test/CORBA_Services/Naming/Simple/run_test.rb +0 -1
  122. data/test/CORBA_Services/Naming/Simple/server.rb +0 -1
  123. data/test/Collocation/Diamond.idl +0 -1
  124. data/test/Collocation/run_test.rb +0 -1
  125. data/test/Collocation/test.rb +0 -1
  126. data/test/Connect_Timeout/Test.idl +0 -1
  127. data/test/Connect_Timeout/client.rb +0 -1
  128. data/test/Connect_Timeout/run_test.rb +0 -1
  129. data/test/DII/Test.idl +0 -1
  130. data/test/DII/client.rb +0 -1
  131. data/test/DII/run_test.rb +0 -1
  132. data/test/DII/server.rb +0 -1
  133. data/test/DSI/Test.idl +0 -1
  134. data/test/DSI/client.rb +0 -1
  135. data/test/DSI/run_test.rb +0 -1
  136. data/test/DSI/server.rb +0 -1
  137. data/test/Exceptions/Test.idl +0 -1
  138. data/test/Exceptions/client.rb +1 -2
  139. data/test/Exceptions/run_test.rb +0 -1
  140. data/test/Exceptions/server.rb +0 -1
  141. data/test/Hello/Test.idl +0 -1
  142. data/test/Hello/client.rb +0 -1
  143. data/test/Hello/run_test.rb +0 -1
  144. data/test/Hello/server.rb +0 -1
  145. data/test/IDL_Test/Test.idl +4 -1
  146. data/test/IDL_Test/client.rb +3 -2
  147. data/test/IDL_Test/run_test.rb +0 -1
  148. data/test/IDL_Test/server.rb +5 -1
  149. data/test/IORMap/Test.idl +0 -1
  150. data/test/IORMap/client.rb +0 -1
  151. data/test/IORMap/run_test.rb +0 -1
  152. data/test/IORMap/server.rb +0 -1
  153. data/test/IORTable/Test.idl +0 -1
  154. data/test/IORTable/client.rb +0 -1
  155. data/test/IORTable/run_test.rb +0 -1
  156. data/test/IORTable/server.rb +0 -1
  157. data/test/Implicit_Conversion/Test.idl +0 -1
  158. data/test/Implicit_Conversion/client.rb +0 -1
  159. data/test/Implicit_Conversion/run_test.rb +0 -1
  160. data/test/Implicit_Conversion/server.rb +0 -1
  161. data/test/Multi_Threading/Multiple_ORB/Test.idl +0 -1
  162. data/test/Multi_Threading/Multiple_ORB/client.rb +0 -1
  163. data/test/Multi_Threading/Multiple_ORB/run_test.rb +0 -1
  164. data/test/Multi_Threading/Multiple_ORB/server.rb +0 -1
  165. data/test/Multi_Threading/Simple/Test.idl +0 -1
  166. data/test/Multi_Threading/Simple/client.rb +0 -1
  167. data/test/Multi_Threading/Simple/run_test.rb +0 -1
  168. data/test/Multi_Threading/Simple/server.rb +1 -2
  169. data/test/Multi_Threading/Threads/Test.idl +0 -4
  170. data/test/Multi_Threading/Threads/client.rb +7 -10
  171. data/test/Multi_Threading/Threads/run_test.rb +0 -1
  172. data/test/Multi_Threading/Threads/server.rb +0 -3
  173. data/test/Multiple_Servant_Interfaces/Test.idl +0 -1
  174. data/test/Multiple_Servant_Interfaces/client.rb +0 -1
  175. data/test/Multiple_Servant_Interfaces/run_test.rb +0 -1
  176. data/test/Multiple_Servant_Interfaces/server.rb +0 -1
  177. data/test/Nil/Test.idl +0 -1
  178. data/test/Nil/run_test.rb +0 -1
  179. data/test/Nil/test.rb +0 -1
  180. data/test/OBV/AbstractInterface/client.rb +0 -1
  181. data/test/OBV/AbstractInterface/run_test.rb +0 -1
  182. data/test/OBV/AbstractInterface/server.rb +0 -1
  183. data/test/OBV/AbstractInterface/test.idl +0 -1
  184. data/test/OBV/Custom/OBV_impl.rb +0 -1
  185. data/test/OBV/Custom/client.rb +0 -1
  186. data/test/OBV/Custom/run_test.rb +0 -1
  187. data/test/OBV/Custom/server.rb +0 -1
  188. data/test/OBV/Simple/OBV_impl.rb +0 -1
  189. data/test/OBV/Simple/client.rb +0 -1
  190. data/test/OBV/Simple/run_test.rb +0 -1
  191. data/test/OBV/Simple/server.rb +0 -1
  192. data/test/OBV/Simple_Event/Event_impl.rb +0 -1
  193. data/test/OBV/Simple_Event/client.rb +0 -1
  194. data/test/OBV/Simple_Event/run_test.rb +0 -1
  195. data/test/OBV/Simple_Event/server.rb +0 -1
  196. data/test/OBV/Supports/client.rb +0 -1
  197. data/test/OBV/Supports/run_test.rb +0 -1
  198. data/test/OBV/Supports/server.rb +0 -1
  199. data/test/OBV/Supports/supports.idl +0 -1
  200. data/test/OBV/Supports/supports_impl.rb +0 -1
  201. data/test/OBV/Tree/client.rb +0 -1
  202. data/test/OBV/Tree/run_test.rb +0 -1
  203. data/test/OBV/Tree/server.rb +0 -1
  204. data/test/OBV/Tree/test.idl +0 -1
  205. data/test/OBV/Truncatable/Extra.idl +0 -1
  206. data/test/OBV/Truncatable/Truncatable_impl.rb +0 -1
  207. data/test/OBV/Truncatable/client.rb +0 -1
  208. data/test/OBV/Truncatable/run_test.rb +0 -1
  209. data/test/OBV/Truncatable/server.rb +0 -1
  210. data/test/OBV/ValueBox/client.rb +0 -1
  211. data/test/OBV/ValueBox/run_test.rb +0 -1
  212. data/test/Object/Test.idl +0 -1
  213. data/test/Object/client.rb +0 -1
  214. data/test/Object/run_test.rb +0 -1
  215. data/test/Object/server.rb +0 -1
  216. data/test/POA/run_test.rb +0 -1
  217. data/test/POA/test.rb +1 -2
  218. data/test/Param_Test/client.rb +2 -3
  219. data/test/Param_Test/run_test.rb +0 -1
  220. data/test/Param_Test/server.rb +1 -2
  221. data/test/Performance/Simple/Test.idl +0 -1
  222. data/test/Performance/Simple/client.rb +0 -1
  223. data/test/Performance/Simple/run_test.rb +0 -1
  224. data/test/Performance/Simple/server.rb +0 -1
  225. data/test/Policies/Test.idl +0 -1
  226. data/test/Policies/run_test.rb +0 -1
  227. data/test/Policies/test.rb +0 -1
  228. data/test/Timeout/client.rb +0 -1
  229. data/test/Timeout/run_test.rb +0 -1
  230. data/test/Timeout/server.rb +0 -1
  231. data/test/Timeout/test.idl +0 -1
  232. data/test/lib/assert.rb +0 -1
  233. data/test/lib/test.rb +1 -2
  234. data/test/test_runner.rb +1 -2
  235. metadata +23 -55
  236. data/README +0 -62
  237. data/test/BiDirectional/server.ior +0 -1
  238. data/test/CORBA_Services/Naming/BindingIterator/ins.ior +0 -1
  239. data/test/CORBA_Services/Naming/Corbaname/corbaname.ior +0 -1
  240. data/test/CORBA_Services/Naming/Corbaname/ins.ior +0 -1
  241. data/test/CORBA_Services/Naming/Simple/ins.ior +0 -1
  242. data/test/DII/server.ior +0 -1
  243. data/test/DSI/server.ior +0 -1
  244. data/test/Exceptions/server.ior +0 -1
  245. data/test/Hello/gateway.ior +0 -1
  246. data/test/IDL_Test/server.ior +0 -1
  247. data/test/IORMap/server.ior +0 -1
  248. data/test/IORTable/server.ior +0 -0
  249. data/test/Implicit_Conversion/server.ior +0 -1
  250. data/test/Multi_Threading/Multiple_ORB/server0.ior +0 -1
  251. data/test/Multi_Threading/Multiple_ORB/server1.ior +0 -1
  252. data/test/Multi_Threading/Simple/server.ior +0 -1
  253. data/test/Multi_Threading/Threads/server.ior +0 -1
  254. data/test/Multi_Threading/Threads/watchdog.ior +0 -1
  255. data/test/Multiple_Servant_Interfaces/server.ior +0 -1
  256. data/test/OBV/AbstractInterface/server.ior +0 -1
  257. data/test/OBV/Custom/server.ior +0 -1
  258. data/test/OBV/Simple/server.ior +0 -1
  259. data/test/OBV/Simple_Event/server.ior +0 -1
  260. data/test/OBV/Supports/server.ior +0 -1
  261. data/test/OBV/Tree/server.ior +0 -1
  262. data/test/OBV/Truncatable/server.ior +0 -1
  263. data/test/OBV/ValueBox/server.ior +0 -1
  264. data/test/Object/server.ior +0 -1
  265. data/test/Param_Test/server.ior +0 -1
  266. data/test/Performance/Simple/server.ior +0 -1
  267. data/test/Timeout/server.ior +0 -1
  268. data/test/test.log +0 -20
  269. data/test/test2.log +0 -5000
data/rakelib/ext.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 File.join(File.dirname(__FILE__), 'config.rb')
@@ -58,7 +57,7 @@ module R2CORBA
58
57
  sysdlls = []
59
58
  except_dll = R2CORBA::Config.is_win64 ? 'libgcc_s_seh-1.dll' : 'libgcc_s_dw2-1.dll'
60
59
  ENV['PATH'].split(';').each do |p|
61
- if File.exists?(File.join(p, except_dll)) && File.exists?(File.join(p, 'libstdc++-6.dll'))
60
+ if File.exist?(File.join(p, except_dll)) && File.exist?(File.join(p, 'libstdc++-6.dll'))
62
61
  sysdlls << File.join(p, except_dll)
63
62
  sysdlls << File.join(p, 'libstdc++-6.dll')
64
63
  break
@@ -83,35 +82,6 @@ module R2CORBA
83
82
  ACE_FILES.collect { |fn| File.join(libdir, "lib#{fn}#{so_ext_}") }
84
83
  end
85
84
 
86
- @@osx_name = nil
87
- if RUBY_PLATFORM =~ /darwin/
88
- osx_ver_major, osx_ver_minor = (`uname -r`).strip.split('.')[0,2].collect {|n| n.to_i }
89
- if osx_ver_major == 10
90
- @@osx_name = case osx_ver_minor
91
- when 3
92
- 'panther'
93
- when 4
94
- 'tiger'
95
- when 5
96
- 'leopard'
97
- when 6
98
- 'snowleopard'
99
- when 7
100
- 'lion'
101
- when 8
102
- 'mountainlion'
103
- when 9
104
- 'mavericks'
105
- when 10
106
- 'yosemite'
107
- end
108
- end
109
- platform_error unless @@osx_name
110
- end
111
- def self.osx_name
112
- @@osx_name
113
- end
114
-
115
85
  def self.ace_config
116
86
  case RUBY_PLATFORM
117
87
  when /mingw32/
@@ -121,7 +91,6 @@ module R2CORBA
121
91
  }
122
92
  when /linux/
123
93
  %Q{
124
- #define ACE_HAS_GETIFADDRS
125
94
  #include "ace/config-linux.h"
126
95
  }
127
96
  when /sparc-solaris/
@@ -132,8 +101,7 @@ module R2CORBA
132
101
  }
133
102
  when /darwin/
134
103
  %Q{
135
- #define ACE_HAS_GETIFADDRS
136
- #include "ace/config-macosx-#{osx_name}.h"
104
+ #include "ace/config-macosx.h"
137
105
  }
138
106
  else
139
107
  platform_error
@@ -154,19 +122,14 @@ debug=#{get_config('with-debug') ? 1 : 0}
154
122
  fl_reactor=0
155
123
  tk_reactor=0
156
124
  boost=0
157
- no_strict_aliasing=1
158
125
  include $(ACE_ROOT)/include/makeinclude/platform_mingw32.GNU
159
126
  }
160
127
  when /linux/
161
128
  %Q{
162
129
  versioned_so=1
163
- threads=1
164
130
  ssl=#{get_config('with-ssl') ? 1 : 0}
165
131
  optimize=1
166
132
  debug=#{get_config('with-debug') ? 1 : 0}
167
- fl_reactor=0
168
- tk_reactor=0
169
- boost=0
170
133
  include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU
171
134
  LDFLAGS += -Wl,-rpath,#{get_config('aceinstdir')}
172
135
  }
@@ -192,7 +155,7 @@ debug=#{get_config('with-debug') ? 1 : 0}
192
155
  fl_reactor=0
193
156
  tk_reactor=0
194
157
  boost=0
195
- include $(ACE_ROOT)/include/makeinclude/platform_macosx_#{osx_name}.GNU
158
+ include $(ACE_ROOT)/include/makeinclude/platform_macosx.GNU
196
159
  LDFLAGS += -Wl,-headerpad_max_install_names
197
160
  FLAGS_C_CC += #{RB_CONFIG['ARCH_FLAG']}
198
161
  LDFLAGS += #{RB_CONFIG['ARCH_FLAG']}
@@ -210,7 +173,7 @@ workspace {
210
173
  $(TAO_ROOT)/TAO_IDL
211
174
  $(TAO_ROOT)/tao
212
175
  #{get_config('with-ssl') ? '$(TAO_ROOT)/orbsvcs/orbsvcs/Security.mpc' : ''}
213
- #{get_config('with-ssl') ? '$(TAO_ROOT)/orbsvcs/orbsvcs/SSLIOP.mpc' : ''}
176
+ #{get_config('with-ssl') ? '$(TAO_ROOT)/orbsvcs/orbsvcs/SSLIOP.mpc' : ''}
214
177
  exclude {
215
178
  bin
216
179
  docs
@@ -237,8 +200,6 @@ workspace {
237
200
 
238
201
  def self.default_features
239
202
  %Q{
240
- fl_reactor=0
241
- tk_reactor=1
242
203
  qos=0
243
204
  ssl=#{get_config('with-ssl') ? 1 : 0}
244
205
  ipv6=#{get_config('with-ipv6') ? 1 : 0}
@@ -304,7 +265,7 @@ ipv6=#{get_config('with-ipv6') ? 1 : 0}
304
265
  # create unversioned ACE+TAO lib symlinks
305
266
 
306
267
  ACE_FILES.collect {|dep| File.join(get_config('aceroot'),'lib', 'lib'+dep+'.so')}.each do |lib|
307
- Dir.glob(lib+'.*').each {|verlib| File.symlink(verlib, lib) unless File.exists?(lib)}
268
+ Dir.glob(lib+'.*').each {|verlib| File.symlink(verlib, lib) unless File.exist?(lib)}
308
269
  end
309
270
  end
310
271
  end
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'
@@ -182,7 +181,7 @@ THE_END__
182
181
  def self.get_latest_ace_version
183
182
  print 'Latest ACE release is '
184
183
  _version = nil
185
- open('https://raw.githubusercontent.com/DOCGroup/ATCD/master/ACE/ace/Version.h') do |f|
184
+ open('https://raw.githubusercontent.com/DOCGroup/ACE_TAO/master/ACE/ace/Version.h') do |f|
186
185
  f.each_line do |ln|
187
186
  if /define\s+ACE_VERSION\s+\"(.*)\"/ =~ ln
188
187
  _version = $1
@@ -193,14 +192,31 @@ THE_END__
193
192
  _version
194
193
  end
195
194
 
195
+ # Downloading from github results in some http redirects which we first have to follow
196
+ def self.follow_url(uri_str, limit = 10)
197
+ raise ArgumentError, 'HTTP redirect too deep' if limit == 0
198
+ url = URI(uri_str)
199
+ req = Net::HTTP::Get.new(url)
200
+ response = Net::HTTP.start(url.host, url.port, use_ssl: true) { |http| http.request(req) }
201
+ case response
202
+ when Net::HTTPSuccess then uri_str
203
+ when Net::HTTPRedirection then follow_url(response['location'], limit - 1)
204
+ else
205
+ response.error!
206
+ end
207
+ end
208
+
196
209
  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"
210
+ version_dir = version.gsub('.','_')
211
+ _url = "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-#{version_dir}/ACE+TAO-src-#{version}.tar.gz"
212
+ print(_msg = "Downloading ACE+TAO-src-#{version}.tar.gz from #{_url}")
199
213
  _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")
214
+ # First follow all http redirects
215
+ url = URI(follow_url(_url))
216
+ Net::HTTP.start(url.host, url.port, use_ssl: true) do |http|
217
+ _fout = File.open(_fnm, "wb")
202
218
  begin
203
- http.request_get("/previous_versions/ACE+TAO-src-#{version}.tar.gz") do |resp|
219
+ http.request_get(url) do |resp|
204
220
  _sndlen = resp.content_length
205
221
  _reclen = 0
206
222
  resp.read_body do |segment|
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')
@@ -68,7 +67,7 @@ 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"
70
+ gem.homepage = "https://www.remedy.nl/opensource/r2corba.html"
72
71
  gem.authors = ['Martin Corino']
73
72
  gem.files = Dir['lib/taosource/**/*']
74
73
  gem.files.concat(Dir["src/ACE+TAO-src-#{_ace_ver}.tar.gz"])
@@ -76,8 +75,8 @@ namespace :r2corba do
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']
81
80
  end
82
81
  R2CORBA::Gem.build_gem(gemspec)
83
82
  end
@@ -89,20 +88,24 @@ end
89
88
  t_ = file File.join('pkg', "#{R2CORBA::Gem.gem_name('r2corba', R2CORBA::R2CORBA_VERSION)}.gem") => R2CORBA::Gem.manifest do
90
89
  gemspec = R2CORBA::Gem.define_spec('r2corba', R2CORBA::R2CORBA_VERSION) do |gem|
91
90
  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. }
91
+ 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
92
  gem.email = 'mcorino@remedy.nl'
94
- gem.homepage = "https://osportal.remedy.nl/projects/r2corba"
93
+ gem.homepage = "https://www.remedy.nl/opensource/r2corba.html"
95
94
  gem.authors = ['Martin Corino']
96
95
  gem.files = R2CORBA::Gem.manifest
97
96
  gem.extensions = ['mkrf_conf_srcgem.rb']
98
97
  gem.require_paths = %w{lib}
99
98
  gem.executables = %w{ridlc rins r2corba}
100
- gem.required_ruby_version = '>= 1.9.3'
101
- gem.licenses = ['R2CORBA', 'ACE', 'GPL']
99
+ gem.required_ruby_version = '>= 2.0'
100
+ gem.licenses = ['Nonstandard', 'DOC', 'GPL-2.0']
102
101
  gem.require_paths << 'ext'
103
102
  gem.add_dependency 'ridl', '~> 2.5'
104
103
  gem.add_dependency 'rake', '~> 10.0'
105
104
  gem.rdoc_options << '--exclude=\\.dll' << '--exclude=\\.so' << '--exclude=\\.pidlc'
105
+ gem.metadata = {
106
+ "bug_tracker_uri" => "https://github.com/RemedyIT/r2corba/issues",
107
+ "source_code_uri" => "https://github.com/RemedyIT/r2corba"
108
+ }
106
109
  end
107
110
  R2CORBA::Gem.build_gem(gemspec)
108
111
  end
@@ -124,20 +127,16 @@ t_ = file File.join('pkg', "#{R2CORBA::Gem.gem_name('r2corba', R2CORBA::R2CORBA_
124
127
  begin
125
128
  gemspec = R2CORBA::Gem.define_spec('r2corba', R2CORBA::R2CORBA_VERSION, :extbin) do |gem|
126
129
  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)}
130
+ 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
131
  gem.email = 'mcorino@remedy.nl'
129
- gem.homepage = "https://osportal.remedy.nl/projects/r2corba"
132
+ gem.homepage = "https://www.remedy.nl/opensource/r2corba.html"
130
133
  gem.authors = ['Martin Corino']
131
134
  gem.files = R2CORBA::Gem.manifest(:extbin)
132
135
  gem.extensions = []
133
136
  gem.require_paths = %w{ext}
134
137
  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']
138
+ gem.required_ruby_version = '>= 2.0.0'
139
+ gem.licenses = ['Nonstandard', 'DOC']
141
140
  gem.rdoc_options << '--exclude=\\.dll' << '--exclude=\\.so'
142
141
  end
143
142
  R2CORBA::Gem.build_gem(gemspec)
@@ -167,9 +166,9 @@ t_ = file File.join('pkg', "#{R2CORBA::Gem.gem_name('r2corba', R2CORBA::R2CORBA_
167
166
  # create gemspec
168
167
  gemspec = R2CORBA::Gem.define_spec('r2corba', R2CORBA::R2CORBA_VERSION, :bin) do |gem|
169
168
  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. }
169
+ 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
170
  gem.email = 'mcorino@remedy.nl'
172
- gem.homepage = "https://osportal.remedy.nl/projects/r2corba"
171
+ gem.homepage = "https://www.remedy.nl/opensource/r2corba.html"
173
172
  gem.authors = ['Martin Corino']
174
173
  gem.files = R2CORBA::Gem.manifest(:bin)
175
174
  gem.require_paths = %w{lib}
@@ -178,11 +177,11 @@ t_ = file File.join('pkg', "#{R2CORBA::Gem.gem_name('r2corba', R2CORBA::R2CORBA_
178
177
  if defined?(JRUBY_VERSION)
179
178
  gem.require_paths << 'jacorb/lib'
180
179
  gem.required_ruby_version = '>= 1.7.0'
181
- gem.licenses = ['R2CORBA', 'JacORB']
180
+ gem.licenses = ['Nonstandard', 'GPL-2.0']
182
181
  else
183
182
  gem.files << File.join('ext', '.keep') unless ENV['FULL_BINGEM'] # to force installation of ext folder if libs are left out
184
183
  gem.required_ruby_version = '>= 1.9.3'
185
- gem.licenses = ['R2CORBA', 'ACE', 'GPL']
184
+ gem.licenses = ['Nonstandard', 'DOC', 'GPL-2.0']
186
185
  gem.require_paths << 'ext'
187
186
  end
188
187
  gem.add_dependency 'ridl', '~> 2.5'
@@ -208,14 +207,14 @@ unless defined?(JRUBY_VERSION) || !R2CORBA::Config.is_win32
208
207
  gem.summary = %Q{R2CORBA Devkit faker for RubyInstaller Rubies}
209
208
  gem.description = %Q{Fake Devkit loader to satisfy stupid RubyInstaller pre-install hook. }
210
209
  gem.email = 'mcorino@remedy.nl'
211
- gem.homepage = "https://osportal.remedy.nl/projects/r2corba"
210
+ gem.homepage = "https://www.remedy.nl/opensource/r2corba.html"
212
211
  gem.authors = ['Martin Corino']
213
212
  gem.files = 'lib/rubygems_plugin.rb'
214
213
  gem.require_paths = %w{lib}
215
214
  gem.executables = []
216
215
  gem.extensions = []
217
- gem.required_ruby_version = '>= 1.9.3'
218
- gem.licenses = ['R2CORBA']
216
+ gem.required_ruby_version = '>= 2.0'
217
+ gem.licenses = ['Nonstandard']
219
218
  end
220
219
  R2CORBA::Gem.build_gem(gemspec)
221
220
  end
@@ -233,4 +232,4 @@ elsif R2CORBA::Config.is_win32
233
232
  task :gem => 'r2corba:gem:bingem'
234
233
  else
235
234
  task :gem => 'r2corba:gem:srcgem'
236
- end
235
+ 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)
@@ -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')
@@ -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
@@ -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'
@@ -129,4 +128,4 @@ ensure
129
128
 
130
129
  orb.destroy()
131
130
 
132
- end
131
+ end
@@ -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 = {
@@ -7,7 +7,6 @@
7
7
  # included with this program.
8
8
  #
9
9
  # Copyright (c) Remedy IT Expertise BV
10
- # Chamber of commerce Rotterdam nr.276339, The Netherlands
11
10
  #--------------------------------------------------------------------
12
11
 
13
12
  require 'optparse'
@@ -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
  /// Put the interfaces in a module, to avoid global namespace pollution
@@ -7,7 +7,6 @@
7
7
  # included with this program.
8
8
  #
9
9
  # Copyright (c) Remedy IT Expertise BV
10
- # Chamber of commerce Rotterdam nr.276339, The Netherlands
11
10
  #--------------------------------------------------------------------
12
11
 
13
12
  require 'optparse'
@@ -7,7 +7,6 @@
7
7
  # included with this program.
8
8
  #
9
9
  # Copyright (c) Remedy IT Expertise BV
10
- # Chamber of commerce Rotterdam nr.276339, The Netherlands
11
10
  #--------------------------------------------------------------------
12
11
 
13
12
  OPTIONS = {
@@ -7,7 +7,6 @@
7
7
  # included with this program.
8
8
  #
9
9
  # Copyright (c) Remedy IT Expertise BV
10
- # Chamber of commerce Rotterdam nr.276339, The Netherlands
11
10
  #--------------------------------------------------------------------
12
11
 
13
12
  require 'optparse'
@@ -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
  /// Put the interfaces in a module, to avoid global namespace pollution