r2corba 1.5.5-x64-mingw32 → 1.6.0-x64-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 (149) hide show
  1. checksums.yaml +5 -5
  2. data/lib/corba.rb +1 -1
  3. data/lib/corba/cbase/ORB.rb +19 -16
  4. data/lib/corba/cbase/Request.rb +3 -3
  5. data/lib/corba/cbase/Values.rb +4 -2
  6. data/lib/corba/cbase/exception.rb +4 -2
  7. data/lib/corba/cbase/poa.rb +1 -1
  8. data/lib/corba/cbase/policies.rb +1 -1
  9. data/lib/corba/cbase/require.rb +8 -1
  10. data/lib/corba/common/Any.rb +2 -1
  11. data/lib/corba/common/IDL.rb +1 -1
  12. data/lib/corba/common/ORB.rb +21 -21
  13. data/lib/corba/common/Object.rb +14 -13
  14. data/lib/corba/common/Servant.rb +4 -4
  15. data/lib/corba/common/Stub.rb +6 -6
  16. data/lib/corba/common/Typecode.rb +35 -8
  17. data/lib/corba/common/Union.rb +5 -0
  18. data/lib/corba/common/Values.rb +1 -0
  19. data/lib/corba/common/const.rb +1 -1
  20. data/lib/corba/common/exception.rb +2 -1
  21. data/lib/corba/common/version.rb +2 -2
  22. data/lib/corba/idl/IDL.rb +1 -1
  23. data/lib/corba/jbase/Any.rb +6 -4
  24. data/lib/corba/jbase/ORB.rb +2 -2
  25. data/lib/corba/jbase/Object.rb +13 -13
  26. data/lib/corba/jbase/Request.rb +3 -3
  27. data/lib/corba/jbase/Streams.rb +64 -0
  28. data/lib/corba/jbase/Typecode.rb +3 -2
  29. data/lib/corba/jbase/Values.rb +2 -0
  30. data/lib/corba/jbase/exception.rb +1 -0
  31. data/lib/corba/jbase/poa.rb +18 -18
  32. data/lib/corba/jbase/policies.rb +29 -29
  33. data/lib/corba/jbase/require.rb +4 -0
  34. data/lib/corba/svcs/ins/cos_naming.rb +10 -1
  35. data/lib/corba/svcs/ins/ins.rb +45 -45
  36. data/lib/corba/svcs/ins/naming_service.rb +6 -6
  37. data/lib/ridlbe/ruby/config.rb +27 -20
  38. data/lib/ridlbe/ruby/walker.rb +276 -253
  39. data/mkrf_conf_bingem.rb +4 -4
  40. data/rakelib/build.rake +1 -1
  41. data/rakelib/config.rake +1 -1
  42. data/rakelib/config.rb +9 -9
  43. data/rakelib/ext.rake +6 -65
  44. data/rakelib/ext_r2tao.rb +2 -39
  45. data/rakelib/gem.rake +20 -20
  46. data/rakelib/gem.rb +1 -1
  47. data/rakelib/package.rake +1 -1
  48. data/test/BiDirectional/client.rb +16 -16
  49. data/test/BiDirectional/run_test.rb +10 -10
  50. data/test/BiDirectional/server.rb +20 -20
  51. data/test/CORBA_Services/Naming/BindingIterator/client.rb +14 -14
  52. data/test/CORBA_Services/Naming/BindingIterator/run_test.rb +12 -12
  53. data/test/CORBA_Services/Naming/BindingIterator/server.rb +17 -17
  54. data/test/CORBA_Services/Naming/Corbaname/client.rb +14 -14
  55. data/test/CORBA_Services/Naming/Corbaname/run_test.rb +12 -12
  56. data/test/CORBA_Services/Naming/Corbaname/server.rb +20 -20
  57. data/test/CORBA_Services/Naming/Simple/client.rb +14 -14
  58. data/test/CORBA_Services/Naming/Simple/run_test.rb +12 -12
  59. data/test/CORBA_Services/Naming/Simple/server.rb +17 -17
  60. data/test/Collocation/run_test.rb +10 -10
  61. data/test/Collocation/test.rb +26 -19
  62. data/test/Connect_Timeout/client.rb +15 -15
  63. data/test/Connect_Timeout/run_test.rb +10 -10
  64. data/test/DII/client.rb +27 -27
  65. data/test/DII/run_test.rb +10 -10
  66. data/test/DII/server.rb +15 -15
  67. data/test/DSI/client.rb +15 -15
  68. data/test/DSI/run_test.rb +10 -10
  69. data/test/DSI/server.rb +16 -16
  70. data/test/Exceptions/client.rb +19 -19
  71. data/test/Exceptions/run_test.rb +10 -10
  72. data/test/Exceptions/server.rb +15 -15
  73. data/test/Hello/client.rb +15 -15
  74. data/test/Hello/run_test.rb +10 -10
  75. data/test/Hello/server.rb +16 -16
  76. data/test/IDL_Test/client.rb +20 -20
  77. data/test/IDL_Test/run_test.rb +10 -10
  78. data/test/IDL_Test/server.rb +18 -18
  79. data/test/IORMap/client.rb +14 -14
  80. data/test/IORMap/run_test.rb +10 -10
  81. data/test/IORMap/server.rb +22 -22
  82. data/test/IORTable/client.rb +14 -14
  83. data/test/IORTable/run_test.rb +10 -10
  84. data/test/IORTable/server.rb +22 -22
  85. data/test/Implicit_Conversion/client.rb +19 -16
  86. data/test/Implicit_Conversion/run_test.rb +10 -10
  87. data/test/Implicit_Conversion/server.rb +15 -15
  88. data/test/Multi_Threading/Multiple_ORB/client.rb +13 -13
  89. data/test/Multi_Threading/Multiple_ORB/run_test.rb +10 -10
  90. data/test/Multi_Threading/Multiple_ORB/server.rb +16 -16
  91. data/test/Multi_Threading/Simple/client.rb +15 -15
  92. data/test/Multi_Threading/Simple/run_test.rb +10 -10
  93. data/test/Multi_Threading/Simple/server.rb +15 -15
  94. data/test/Multi_Threading/Threads/client.rb +15 -15
  95. data/test/Multi_Threading/Threads/run_test.rb +10 -10
  96. data/test/Multi_Threading/Threads/server.rb +17 -17
  97. data/test/Multi_Threading/Threads/watchdog.rb +15 -15
  98. data/test/Multiple_Servant_Interfaces/client.rb +13 -13
  99. data/test/Multiple_Servant_Interfaces/run_test.rb +10 -10
  100. data/test/Multiple_Servant_Interfaces/server.rb +17 -17
  101. data/test/Nil/run_test.rb +10 -10
  102. data/test/Nil/test.rb +13 -13
  103. data/test/OBV/AbstractInterface/client.rb +13 -13
  104. data/test/OBV/AbstractInterface/run_test.rb +10 -10
  105. data/test/OBV/AbstractInterface/server.rb +19 -18
  106. data/test/OBV/Custom/OBV_impl.rb +2 -0
  107. data/test/OBV/Custom/client.rb +13 -13
  108. data/test/OBV/Custom/run_test.rb +10 -10
  109. data/test/OBV/Custom/server.rb +15 -15
  110. data/test/OBV/Simple/OBV_impl.rb +1 -0
  111. data/test/OBV/Simple/client.rb +13 -13
  112. data/test/OBV/Simple/run_test.rb +10 -10
  113. data/test/OBV/Simple/server.rb +15 -15
  114. data/test/OBV/Simple_Event/Event_impl.rb +1 -0
  115. data/test/OBV/Simple_Event/client.rb +13 -13
  116. data/test/OBV/Simple_Event/run_test.rb +10 -10
  117. data/test/OBV/Simple_Event/server.rb +15 -15
  118. data/test/OBV/Supports/client.rb +18 -18
  119. data/test/OBV/Supports/run_test.rb +10 -10
  120. data/test/OBV/Supports/server.rb +14 -14
  121. data/test/OBV/Supports/supports_impl.rb +3 -0
  122. data/test/OBV/Tree/client.rb +13 -13
  123. data/test/OBV/Tree/run_test.rb +10 -10
  124. data/test/OBV/Tree/server.rb +18 -18
  125. data/test/OBV/Truncatable/client.rb +56 -56
  126. data/test/OBV/Truncatable/run_test.rb +10 -10
  127. data/test/OBV/Truncatable/server.rb +14 -14
  128. data/test/OBV/ValueBox/client.rb +148 -147
  129. data/test/OBV/ValueBox/run_test.rb +10 -10
  130. data/test/OBV/ValueBox/server.rb +15 -15
  131. data/test/Object/client.rb +13 -13
  132. data/test/Object/run_test.rb +10 -10
  133. data/test/Object/server.rb +18 -18
  134. data/test/POA/run_test.rb +10 -10
  135. data/test/POA/test.rb +15 -15
  136. data/test/Param_Test/client.rb +47 -47
  137. data/test/Param_Test/run_test.rb +10 -10
  138. data/test/Param_Test/server.rb +55 -55
  139. data/test/Performance/Simple/client.rb +15 -15
  140. data/test/Performance/Simple/run_test.rb +10 -10
  141. data/test/Performance/Simple/server.rb +15 -15
  142. data/test/Policies/run_test.rb +10 -10
  143. data/test/Policies/test.rb +23 -23
  144. data/test/Timeout/client.rb +17 -17
  145. data/test/Timeout/run_test.rb +10 -10
  146. data/test/Timeout/server.rb +18 -18
  147. data/test/lib/test.rb +13 -7
  148. data/test/test_runner.rb +19 -19
  149. metadata +8 -8
data/mkrf_conf_bingem.rb CHANGED
@@ -36,7 +36,7 @@ end
36
36
  if defined?(JRUBY_VERSION)
37
37
 
38
38
  unless system("ruby -S rake -- configure --jacorb-home=#{File.expand_path('ext')}")
39
- $stderr.puts "Failed to configure R2CORBA"
39
+ $stderr.puts 'Failed to configure R2CORBA'
40
40
  exit(1)
41
41
  end
42
42
 
@@ -141,9 +141,9 @@ else
141
141
 
142
142
  end
143
143
 
144
- puts "Running rake -- configure --without-tao"
145
- unless system("rake -- configure --without-tao")
146
- puts "Failed to configure R2CORBA."
144
+ puts 'Running rake -- configure --without-tao'
145
+ unless system('rake -- configure --without-tao')
146
+ puts 'Failed to configure R2CORBA.'
147
147
  exit(1)
148
148
  end
149
149
  end
data/rakelib/build.rake CHANGED
@@ -44,7 +44,7 @@ CLOBBER.include orb_pidlc
44
44
  file File.join(r2c_idlc_root, 'r2c_orb.rb') => [R2CORBA::BUILD_CFG, orb_pidlc] do |t|
45
45
  cmd = R2CORBA::Config.ridlc
46
46
  cmd << " --ignore-pidl --output #{t.name} --namespace=R2CORBA --include=#{stdidl_root}" <<
47
- " --stubs-only --expand-includes --search-includepath --no-libinit --interface-as-class=TypeCode orb.idl"
47
+ ' --stubs-only --expand-includes --search-includepath --no-libinit --interface-as-class=TypeCode orb.idl'
48
48
  sh(cmd)
49
49
  end
50
50
  Rake::Task['r2corba:build_idl'].enhance [File.join(r2c_idlc_root, 'r2c_orb.rb')]
data/rakelib/config.rake CHANGED
@@ -29,7 +29,7 @@ namespace :r2corba do
29
29
  namespace :config do
30
30
  task :show do
31
31
  R2CORBA::CFGKEYS.each do |ck|
32
- puts "%20s => %s" % [ck, get_config(ck)]
32
+ puts '%20s => %s' % [ck, get_config(ck)]
33
33
  end
34
34
  end
35
35
  end
data/rakelib/config.rb CHANGED
@@ -86,8 +86,8 @@ if (Rake::Version::MAJOR.to_i == 10 &&
86
86
 
87
87
  begin
88
88
  return OptionParser.new do |opts|
89
- opts.banner = ""
90
- opts.separator ""
89
+ opts.banner = ''
90
+ opts.separator ''
91
91
 
92
92
  standard_rake_options.each { |args| opts.on(*args) }
93
93
  opts.environment('RAKEOPT')
@@ -367,9 +367,9 @@ module R2CORBA
367
367
  def self.define
368
368
  _argv = Rake.application.cleanup_args(ARGV)
369
369
  OptionParser.new do |opts|
370
- opts.banner = "Usage: rake [rake options] -- configure [options]"
370
+ opts.banner = 'Usage: rake [rake options] -- configure [options]'
371
371
 
372
- opts.separator ""
372
+ opts.separator ''
373
373
 
374
374
  opts.on('--prefix=path',
375
375
  "path prefix of target environment [#{get_config(:prefix)}]") {|v| set_config(:prefix, File.expand_path(v))}
@@ -429,7 +429,7 @@ module R2CORBA
429
429
  "build with debugger support [#{get_config('with-debug')}]") {|v| CONFIG[:'with-debug'] = true}
430
430
  end
431
431
 
432
- opts.separator ""
432
+ opts.separator ''
433
433
 
434
434
  opts.on('--help', 'Show this help message') { puts opts; puts; exit }
435
435
  end.parse!(_argv)
@@ -441,7 +441,7 @@ module R2CORBA
441
441
  if get_config('jacorb_home') == '' && File.directory?('jacorb')
442
442
  set_config('jacorb_home', File.expand_path('jacorb'))
443
443
  end
444
- raise "Cannot find JacORB. Missing JACORB_HOME configuration!" if get_config('jacorb_home').empty?
444
+ raise 'Cannot find JacORB. Missing JACORB_HOME configuration!' if get_config('jacorb_home').empty?
445
445
  else
446
446
  if Dir[File.join('ext', 'libACE.*')].empty? # Don't check for ACE/TAO installation when executed for binary gem install
447
447
 
@@ -466,8 +466,8 @@ module R2CORBA
466
466
  if get_config('taoroot').empty? && (File.directory?(File.join(get_config('aceroot'), 'TAO')) || File.directory?(File.join('ACE', 'TAO')))
467
467
  set_config('taoroot', File.directory?(File.join(get_config('aceroot'), 'TAO')) ? File.expand_path(File.join(get_config('aceroot'), 'TAO')) : File.expand_path(File.join('ACE', 'TAO')))
468
468
  end
469
- if get_config('mpcroot').empty? && (File.directory?(File.join(get_config('aceroot'), 'MPC')) || File.directory?(File.join('ACE', 'MPC')))
470
- set_config('mpcroot', File.directory?(File.join(get_config('aceroot'), 'MPC')) ? File.expand_path(File.join(get_config('aceroot'), 'MPC')) : File.expand_path(File.join('ACE', 'MPC')))
469
+ if get_config('mpcroot').empty? && (File.directory?(File.join('ACE', 'MPC')) || File.directory?(File.join(get_config('aceroot'), 'MPC')))
470
+ set_config('mpcroot', File.directory?(File.join('ACE', 'MPC')) ? File.expand_path(File.join('ACE', 'MPC')) : File.expand_path(File.join(get_config('aceroot'), 'MPC')))
471
471
  end
472
472
 
473
473
  set_config('aceinstdir', get_config('sodir')) if get_config('aceinstdir').empty?
@@ -515,7 +515,7 @@ module R2CORBA
515
515
 
516
516
  # check availability of RIDL; either as gem or in subdir
517
517
  unless File.exist?(File.join('ridl', 'lib', 'ridl', 'ridl.rb')) || (`gem search -i -q ridl`.strip) == 'true'
518
- raise "Missing RIDL installation. R2CORBA requires RIDL installed either as gem or in subdirectory ridl."
518
+ raise 'Missing RIDL installation. R2CORBA requires RIDL installed either as gem or in subdirectory ridl.'
519
519
  end
520
520
  end
521
521
 
data/rakelib/ext.rake CHANGED
@@ -42,7 +42,7 @@ else # !JRUBY_VERSION
42
42
  R2CORBA::Ext.rpoa_mpc_file,
43
43
  R2CORBA::Ext.rpol_mpc_file] do
44
44
  # check availability of PERL
45
- raise "PERL missing! A working version of PERL in the PATH is required." unless system('perl -v')
45
+ raise 'PERL missing! A working version of PERL in the PATH is required.' unless system('perl -v')
46
46
  # configure R2TAO build
47
47
  _mwc = File.join(get_config('aceroot'), 'bin', 'mwc.pl')
48
48
 
@@ -85,70 +85,11 @@ else # !JRUBY_VERSION
85
85
 
86
86
  Rake::Task['clobber'].enhance ['r2corba:ext:clobber']
87
87
 
88
- if R2CORBA::Config.is_win32
89
-
90
- file R2CORBA::Ext.extload_mpc_file do |t|
91
- File.open(t.name, 'w') {|f| f.puts R2CORBA::Ext::EXTLOAD_MPC }
92
- end
93
-
94
- file R2CORBA::Ext.extload_makefile => [R2CORBA::BUILD_CFG,
95
- R2CORBA::Ext.default_features_path,
96
- R2CORBA::Ext.ace_config_path,
97
- R2CORBA::Ext.platform_macros_path,
98
- R2CORBA::Ext.extload_mpc_file] do
99
- # check availability of PERL
100
- raise "PERL missing! A working version of PERL in the PATH is required." unless system('perl -v')
101
- # configure extload build
102
- _mwc = File.join(get_config('aceroot'), 'bin', 'mwc.pl')
103
-
104
- cur_dir = Dir.getwd
105
- Dir.chdir File.join('ext', 'extload')
106
- begin
107
- sh("perl #{_mwc} -type gnuace -workers #{R2CORBA::Config.cpu_cores}")
108
- ensure
109
- Dir.chdir cur_dir
110
- end
111
- end
112
-
113
- CLOBBER.include [R2CORBA::Ext.extload_makefile, R2CORBA::Ext.extload_mpc_file]
114
-
115
- namespace :r2corba do
116
- namespace :ext do
117
- #desc 'Build extension loader'
118
- task :build_extload => R2CORBA::Ext.extload_makefile do
119
- cur_dir = Dir.getwd
120
- Dir.chdir File.join('ext', 'extload')
121
- begin
122
- # check availability of make program
123
- raise "#{get_config('makeprog')} missing! A working version of #{get_config('makeprog')} in the PATH is required." unless system("#{get_config('makeprog')}")
124
- sh("#{get_config('makeprog')}#{get_config('with-debug') ? ' debug=1' : ''}")
125
- ensure
126
- Dir.chdir cur_dir
127
- end
128
- end
129
-
130
- task :clobber_extload do
131
- cur_dir = Dir.getwd
132
- Dir.chdir File.join('ext', 'extload')
133
- begin
134
- sh("#{get_config('makeprog')} realclean") if File.exist?('GNUmakefile')
135
- ensure
136
- Dir.chdir cur_dir
137
- end
138
- end
139
- end
140
- end
141
-
142
- Rake::Task['r2corba:ext:build'].enhance ['r2corba:ext:build_extload']
143
- Rake::Task['clobber'].enhance ['r2corba:ext:clobber_extload']
144
-
145
- end
146
-
147
88
  # Do we handle ACE+TAO here?
148
89
  unless get_config('without-tao')
149
90
 
150
91
  file R2CORBA::Ext.ace_config_path => R2CORBA::BUILD_CFG do |t|
151
- File.open(t.name, "w") {|f|
92
+ File.open(t.name, 'w') {|f|
152
93
  f.puts R2CORBA::Ext.ace_config
153
94
  }
154
95
  end
@@ -156,7 +97,7 @@ else # !JRUBY_VERSION
156
97
  CLOBBER.include R2CORBA::Ext.ace_config_path
157
98
 
158
99
  file R2CORBA::Ext.platform_macros_path => R2CORBA::BUILD_CFG do |t|
159
- File.open(t.name, "w") {|f|
100
+ File.open(t.name, 'w') {|f|
160
101
  f.puts R2CORBA::Ext.platform_macros
161
102
  }
162
103
  end
@@ -164,7 +105,7 @@ else # !JRUBY_VERSION
164
105
  CLOBBER.include R2CORBA::Ext.platform_macros_path
165
106
 
166
107
  file R2CORBA::Ext.default_features_path => R2CORBA::BUILD_CFG do |t|
167
- File.open(t.name, "w") do |f|
108
+ File.open(t.name, 'w') do |f|
168
109
  f.puts R2CORBA::Ext.default_features
169
110
  end
170
111
  end
@@ -172,7 +113,7 @@ else # !JRUBY_VERSION
172
113
  CLOBBER.include R2CORBA::Ext.default_features_path
173
114
 
174
115
  file R2CORBA::Ext.tao_mwc_path => R2CORBA::BUILD_CFG do |t|
175
- File.open(t.name, "w") do |f|
116
+ File.open(t.name, 'w') do |f|
176
117
  f.puts R2CORBA::Ext.tao_mwc
177
118
  end
178
119
  end
@@ -184,7 +125,7 @@ else # !JRUBY_VERSION
184
125
  R2CORBA::Ext.default_features_path,
185
126
  R2CORBA::Ext.tao_mwc_path] do
186
127
  # check availability of PERL
187
- raise "PERL missing! A working version of PERL in the PATH is required." unless system('perl -v')
128
+ raise 'PERL missing! A working version of PERL in the PATH is required.' unless system('perl -v')
188
129
  # generate ACE+TAO makefile
189
130
  cur_dir = Dir.getwd
190
131
  Dir.chdir File.expand_path(get_config('aceroot'))
data/rakelib/ext_r2tao.rb CHANGED
@@ -139,39 +139,6 @@ THE_END
139
139
  File.join('ext', 'librpol', 'rpol.mpc')
140
140
  end
141
141
 
142
- if Config.is_win32
143
-
144
- EXTLOAD_MPC = <<THE_END__
145
- project {
146
- Source_Files {
147
- extload.c
148
- }
149
- dynamicflags = EXTLOAD_BUILD_DLL
150
- sharedname = extload
151
- libout = .
152
- dllout = .
153
- verbatim(gnuace, macros, 1) {
154
- override SOEXT := #{RB_CONFIG['DLEXT']}
155
- }
156
- postbuild = <%cp%> lib<%sharedname%>.so ..<%slash%>libr2taow.so
157
- postbuild += <%cp%> lib<%sharedname%>.so ..<%slash%>librpoaw.so
158
- postbuild += <%cp%> lib<%sharedname%>.so ..<%slash%>librpolw.so
159
- postclean = <%rm%> ..<%slash%>libr2taow.so
160
- postclean += <%rm%> ..<%slash%>librpoaw.so
161
- postclean += <%rm%> ..<%slash%>librpolw.so
162
- }
163
- THE_END__
164
-
165
- def self.extload_mpc_file
166
- File.join('ext', 'extload', 'extload.mpc')
167
- end
168
-
169
- def self.extload_makefile
170
- File.join('ext', 'extload', 'GNUmakefile')
171
- end
172
-
173
- end
174
-
175
142
  def self.get_latest_ace_version
176
143
  print 'Latest ACE release is '
177
144
  _version = nil
@@ -208,7 +175,7 @@ THE_END__
208
175
  # First follow all http redirects
209
176
  url = URI(follow_url(_url))
210
177
  Net::HTTP.start(url.host, url.port, use_ssl: true) do |http|
211
- _fout = File.open(_fnm, "wb")
178
+ _fout = File.open(_fnm, 'wb')
212
179
  begin
213
180
  http.request_get(url) do |resp|
214
181
  _sndlen = resp.content_length
@@ -233,11 +200,7 @@ THE_END__
233
200
  end
234
201
 
235
202
  def self.ext_shlibs
236
- (if Config.is_win32
237
- %w{libr2taow librpoaw librpolw}
238
- else
239
- %w{libr2tao librpoa librpol}
240
- end).collect {|lib| File.join('ext', lib + '.so') }
203
+ %w{libr2tao librpoa librpol}.collect {|lib| File.join('ext', lib + '.so') }
241
204
  end
242
205
 
243
206
  end
data/rakelib/gem.rake CHANGED
@@ -67,7 +67,7 @@ namespace :r2corba do
67
67
  gem.summary = %Q{TAO sourcecode for building R2CORBA}
68
68
  gem.description = %Q{TAO sourcecode for building R2CORBA.}
69
69
  gem.email = 'mcorino@remedy.nl'
70
- gem.homepage = "https://www.remedy.nl/opensource/r2corba.html"
70
+ gem.homepage = 'https://www.remedy.nl/opensource/r2corba.html'
71
71
  gem.authors = ['Martin Corino', 'Johnny Willemsen']
72
72
  gem.files = Dir['lib/taosource/**/*']
73
73
  gem.files.concat(Dir["src/ACE+TAO-src-#{_ace_ver}.tar.gz"])
@@ -75,11 +75,11 @@ namespace :r2corba do
75
75
  gem.extensions = ['mkrf_conf_taogem.rb']
76
76
  gem.require_paths = %w{lib}
77
77
  gem.executables = []
78
- gem.required_ruby_version = '>= 2.0'
78
+ gem.required_ruby_version = '>= 2.4'
79
79
  gem.licenses = ['DOC']
80
80
  gem.metadata = {
81
- "bug_tracker_uri" => "https://github.com/DOCGroup/ACE_TAO/issues",
82
- "source_code_uri" => "https://github.com/DOCGroup/ACE_TAO"
81
+ 'bug_tracker_uri' => 'https://github.com/DOCGroup/ACE_TAO/issues',
82
+ 'source_code_uri' => 'https://github.com/DOCGroup/ACE_TAO'
83
83
  }
84
84
  end
85
85
  R2CORBA::Gem.build_gem(gemspec)
@@ -94,21 +94,21 @@ t_ = file File.join('pkg', "#{R2CORBA::Gem.gem_name('r2corba', R2CORBA::R2CORBA_
94
94
  gem.summary = %Q{CORBA language mapping implementation for Ruby}
95
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. }
96
96
  gem.email = 'mcorino@remedy.nl'
97
- gem.homepage = "https://www.remedy.nl/opensource/r2corba.html"
97
+ gem.homepage = 'https://www.remedy.nl/opensource/r2corba.html'
98
98
  gem.authors = ['Martin Corino', 'Johnny Willemsen']
99
99
  gem.files = R2CORBA::Gem.manifest
100
100
  gem.extensions = ['mkrf_conf_srcgem.rb']
101
101
  gem.require_paths = %w{lib}
102
102
  gem.executables = %w{ridlc rins r2corba}
103
- gem.required_ruby_version = '>= 2.0'
103
+ gem.required_ruby_version = '>= 2.4'
104
104
  gem.licenses = ['Nonstandard', 'DOC', 'GPL-2.0']
105
105
  gem.require_paths << 'ext'
106
106
  gem.add_dependency 'ridl', '~> 2.8'
107
107
  gem.add_dependency 'rake', '>= 12.3.3'
108
108
  gem.rdoc_options << '--exclude=\\.dll' << '--exclude=\\.so' << '--exclude=\\.pidlc'
109
109
  gem.metadata = {
110
- "bug_tracker_uri" => "https://github.com/RemedyIT/r2corba/issues",
111
- "source_code_uri" => "https://github.com/RemedyIT/r2corba"
110
+ 'bug_tracker_uri' => 'https://github.com/RemedyIT/r2corba/issues',
111
+ 'source_code_uri' => 'https://github.com/RemedyIT/r2corba'
112
112
  }
113
113
  end
114
114
  R2CORBA::Gem.build_gem(gemspec)
@@ -133,18 +133,18 @@ t_ = file File.join('pkg', "#{R2CORBA::Gem.gem_name('r2corba', R2CORBA::R2CORBA_
133
133
  gem.summary = %Q{CORBA language mapping implementation for Ruby (extension binaries)}
134
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)}
135
135
  gem.email = 'mcorino@remedy.nl'
136
- gem.homepage = "https://www.remedy.nl/opensource/r2corba.html"
136
+ gem.homepage = 'https://www.remedy.nl/opensource/r2corba.html'
137
137
  gem.authors = ['Martin Corino', 'Johnny Willemsen']
138
138
  gem.files = R2CORBA::Gem.manifest(:extbin)
139
139
  gem.extensions = []
140
140
  gem.require_paths = %w{ext}
141
141
  gem.executables = []
142
- gem.required_ruby_version = '>= 2.0'
142
+ gem.required_ruby_version = '>= 2.4'
143
143
  gem.licenses = ['Nonstandard', 'DOC']
144
144
  gem.rdoc_options << '--exclude=\\.dll' << '--exclude=\\.so'
145
145
  gem.metadata = {
146
- "bug_tracker_uri" => "https://github.com/RemedyIT/r2corba/issues",
147
- "source_code_uri" => "https://github.com/RemedyIT/r2corba"
146
+ 'bug_tracker_uri' => 'https://github.com/RemedyIT/r2corba/issues',
147
+ 'source_code_uri' => 'https://github.com/RemedyIT/r2corba'
148
148
  }
149
149
  end
150
150
  R2CORBA::Gem.build_gem(gemspec)
@@ -176,7 +176,7 @@ t_ = file File.join('pkg', "#{R2CORBA::Gem.gem_name('r2corba', R2CORBA::R2CORBA_
176
176
  gem.summary = %Q{CORBA language mapping implementation for Ruby}
177
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. }
178
178
  gem.email = 'mcorino@remedy.nl'
179
- gem.homepage = "https://www.remedy.nl/opensource/r2corba.html"
179
+ gem.homepage = 'https://www.remedy.nl/opensource/r2corba.html'
180
180
  gem.authors = ['Martin Corino', 'Johnny Willemsen']
181
181
  gem.files = R2CORBA::Gem.manifest(:bin)
182
182
  gem.require_paths = %w{lib}
@@ -184,11 +184,11 @@ t_ = file File.join('pkg', "#{R2CORBA::Gem.gem_name('r2corba', R2CORBA::R2CORBA_
184
184
  gem.extensions = ['mkrf_conf_bingem.rb']
185
185
  if defined?(JRUBY_VERSION)
186
186
  gem.require_paths << 'jacorb/lib'
187
- gem.required_ruby_version = '>= 2.0'
187
+ gem.required_ruby_version = '>= 2.4'
188
188
  gem.licenses = ['Nonstandard', 'GPL-2.0']
189
189
  else
190
190
  gem.files << File.join('ext', '.keep') unless ENV['FULL_BINGEM'] # to force installation of ext folder if libs are left out
191
- gem.required_ruby_version = '>= 2.0'
191
+ gem.required_ruby_version = '>= 2.4'
192
192
  gem.licenses = ['Nonstandard', 'DOC', 'GPL-2.0']
193
193
  gem.require_paths << 'ext'
194
194
  end
@@ -196,8 +196,8 @@ t_ = file File.join('pkg', "#{R2CORBA::Gem.gem_name('r2corba', R2CORBA::R2CORBA_
196
196
  gem.add_dependency 'rake', '>= 12.3.3'
197
197
  gem.rdoc_options << '--exclude=\\.dll' << '--exclude=\\.so' << '--exclude=\\.pidlc'
198
198
  gem.metadata = {
199
- "bug_tracker_uri" => "https://github.com/RemedyIT/r2corba/issues",
200
- "source_code_uri" => "https://github.com/RemedyIT/r2corba"
199
+ 'bug_tracker_uri' => 'https://github.com/RemedyIT/r2corba/issues',
200
+ 'source_code_uri' => 'https://github.com/RemedyIT/r2corba'
201
201
  }
202
202
  end
203
203
  R2CORBA::Gem.build_gem(gemspec)
@@ -219,7 +219,7 @@ unless defined?(JRUBY_VERSION)
219
219
  gem.summary = %Q{R2CORBA Devkit faker for RubyInstaller Rubies}
220
220
  gem.description = %Q{Fake Devkit loader to satisfy stupid RubyInstaller pre-install hook. }
221
221
  gem.email = 'mcorino@remedy.nl'
222
- gem.homepage = "https://www.remedy.nl/opensource/r2corba.html"
222
+ gem.homepage = 'https://www.remedy.nl/opensource/r2corba.html'
223
223
  gem.authors = ['Martin Corino', 'Johnny Willemsen']
224
224
  gem.files = 'lib/rubygems_plugin.rb'
225
225
  gem.require_paths = %w{lib}
@@ -228,8 +228,8 @@ unless defined?(JRUBY_VERSION)
228
228
  gem.required_ruby_version = '>= 2.0'
229
229
  gem.licenses = ['Nonstandard']
230
230
  gem.metadata = {
231
- "bug_tracker_uri" => "https://github.com/RemedyIT/r2corba/issues",
232
- "source_code_uri" => "https://github.com/RemedyIT/r2corba"
231
+ 'bug_tracker_uri' => 'https://github.com/RemedyIT/r2corba/issues',
232
+ 'source_code_uri' => 'https://github.com/RemedyIT/r2corba'
233
233
  }
234
234
  end
235
235
  R2CORBA::Gem.build_gem(gemspec)
data/rakelib/gem.rb CHANGED
@@ -98,7 +98,7 @@ module R2CORBA
98
98
  if gemtype == :bin || gemtype == :extbin
99
99
  gemspec.platform = defined?(JRUBY_VERSION) ? ::Gem::Platform.new('universal-java') : ::Gem::Platform::CURRENT
100
100
  end
101
- gemspec.required_rubygems_version = ::Gem::Requirement.new(">= 0") if gemspec.respond_to? :required_rubygems_version=
101
+ gemspec.required_rubygems_version = ::Gem::Requirement.new('>= 0') if gemspec.respond_to? :required_rubygems_version=
102
102
  block.call(gemspec) if block_given?
103
103
  gemspec
104
104
  end
data/rakelib/package.rake CHANGED
@@ -14,7 +14,7 @@ require 'rake/packagetask'
14
14
 
15
15
  require File.join(File.dirname(__FILE__), 'config.rb')
16
16
 
17
- Rake::PackageTask.new("r2corba", R2CORBA::R2CORBA_VERSION) do |p|
17
+ Rake::PackageTask.new('r2corba', R2CORBA::R2CORBA_VERSION) do |p|
18
18
  p.need_tar_gz = true
19
19
  p.need_zip = true
20
20
  p.package_files.include(%w{ext/**/*.{mwc,cpp,c,h}})
@@ -21,22 +21,22 @@ ARGV.options do |opts|
21
21
  script_name = File.basename($0)
22
22
  opts.banner = "Usage: ruby #{script_name} [options]"
23
23
 
24
- opts.separator ""
24
+ opts.separator ''
25
25
 
26
- opts.on("--k IORFILE",
27
- "Set IOR.",
26
+ opts.on('--k IORFILE',
27
+ 'Set IOR.',
28
28
  "Default: 'file://server.ior'") { |v| OPTIONS[:iorfile] = v }
29
- opts.on("--d LVL",
30
- "Set ORBDebugLevel value.",
31
- "Default: 0", Integer) { |v| OPTIONS[:orb_debuglevel] = v }
32
- opts.on("--use-implement",
33
- "Load IDL through CORBA.implement() instead of precompiled code.",
34
- "Default: off") { |v| OPTIONS[:use_implement] = v }
29
+ opts.on('--d LVL',
30
+ 'Set ORBDebugLevel value.',
31
+ 'Default: 0', Integer) { |v| OPTIONS[:orb_debuglevel] = v }
32
+ opts.on('--use-implement',
33
+ 'Load IDL through CORBA.implement() instead of precompiled code.',
34
+ 'Default: off') { |v| OPTIONS[:use_implement] = v }
35
35
 
36
- opts.separator ""
36
+ opts.separator ''
37
37
 
38
- opts.on("-h", "--help",
39
- "Show this help message.") { puts opts; exit }
38
+ opts.on('-h', '--help',
39
+ 'Show this help message.') { puts opts; exit }
40
40
 
41
41
  opts.parse!
42
42
  end
@@ -64,19 +64,19 @@ class MyCallback < POA::Callback
64
64
  end
65
65
  end
66
66
 
67
- end #of servant Callback
67
+ end # of servant Callback
68
68
 
69
69
  if defined?(JRUBY_VERSION)
70
70
  ## JacORB needs explicit activation of this option
71
71
  props = {
72
- "org.omg.PortableInterceptor.ORBInitializerClass.bidir_init" =>
73
- "org.jacorb.orb.giop.BiDirConnectionInitializer"
72
+ 'org.omg.PortableInterceptor.ORBInitializerClass.bidir_init' =>
73
+ 'org.jacorb.orb.giop.BiDirConnectionInitializer'
74
74
  }
75
75
  else
76
76
  props = {}
77
77
  end
78
78
 
79
- orb = CORBA.ORB_init(["-ORBDebugLevel", OPTIONS[:orb_debuglevel]], 'myORB', props)
79
+ orb = CORBA.ORB_init(['-ORBDebugLevel', OPTIONS[:orb_debuglevel]], 'myORB', props)
80
80
 
81
81
  begin
82
82