r2corba 1.4.1-x64-mingw32 → 1.5.1-x64-mingw32

Sign up to get free protection for your applications and to get access to all the features.
Files changed (59) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGES +15 -1
  3. data/THANKS +3 -1
  4. data/bin/r2corba +1 -1
  5. data/bin/ridlc +1 -1
  6. data/bin/rins +1 -1
  7. data/lib/corba/cbase/ORB.rb +8 -2
  8. data/lib/corba/common/ORB.rb +1 -1
  9. data/lib/corba/common/Object.rb +1 -1
  10. data/lib/corba/common/version.rb +1 -1
  11. data/lib/corba/jbase/ORB.rb +14 -1
  12. data/lib/corba/jbase/Object.rb +12 -11
  13. data/lib/corba/jbase/Servant.rb +3 -2
  14. data/lib/corba/jbase/require.rb +7 -4
  15. data/lib/ridlbe/ruby/config.rb +6 -6
  16. data/lib/ridlbe/ruby/orb.pidlc +0 -0
  17. data/mkrf_conf_bingem.rb +52 -2
  18. data/rakelib/bin.rb +3 -3
  19. data/rakelib/config.rb +96 -2
  20. data/rakelib/ext.rake +1 -1
  21. data/rakelib/ext.rb +10 -2
  22. data/rakelib/ext_r2tao.rb +6 -3
  23. data/rakelib/gem.rake +48 -24
  24. data/rakelib/gem.rb +6 -6
  25. data/test/BiDirectional/server.ior +1 -1
  26. data/test/CORBA_Services/Naming/BindingIterator/ins.ior +1 -1
  27. data/test/CORBA_Services/Naming/Corbaname/ins.ior +1 -1
  28. data/test/CORBA_Services/Naming/Simple/ins.ior +1 -1
  29. data/test/DII/server.ior +1 -1
  30. data/test/DSI/server.ior +1 -1
  31. data/test/Exceptions/server.ior +1 -1
  32. data/test/IDL_Test/server.ior +1 -1
  33. data/test/IORMap/server.ior +1 -1
  34. data/test/IORTable/server.ior +1 -1
  35. data/test/Implicit_Conversion/server.ior +1 -1
  36. data/test/Multi_Threading/Multiple_ORB/server0.ior +1 -1
  37. data/test/Multi_Threading/Multiple_ORB/server1.ior +1 -1
  38. data/test/Multi_Threading/Simple/Test.idl +1 -1
  39. data/test/Multi_Threading/Simple/client.rb +17 -12
  40. data/test/Multi_Threading/Simple/server.ior +1 -1
  41. data/test/Multi_Threading/Simple/server.rb +2 -2
  42. data/test/Multi_Threading/Threads/server.ior +1 -1
  43. data/test/Multi_Threading/Threads/server.rb +1 -1
  44. data/test/Multi_Threading/Threads/watchdog.ior +1 -1
  45. data/test/Multiple_Servant_Interfaces/server.ior +1 -1
  46. data/test/OBV/AbstractInterface/server.ior +1 -1
  47. data/test/OBV/Custom/server.ior +1 -1
  48. data/test/OBV/Simple/server.ior +1 -1
  49. data/test/OBV/Simple_Event/server.ior +1 -1
  50. data/test/OBV/Supports/server.ior +1 -1
  51. data/test/OBV/Tree/server.ior +1 -1
  52. data/test/OBV/Truncatable/server.ior +1 -1
  53. data/test/OBV/ValueBox/server.ior +1 -1
  54. data/test/Object/client.rb +30 -21
  55. data/test/Object/server.ior +1 -1
  56. data/test/Param_Test/server.ior +1 -1
  57. data/test/Performance/Simple/server.ior +1 -1
  58. data/test/Timeout/server.ior +1 -1
  59. metadata +108 -108
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 102b046c5ccb6cf6c5944ddd330c66e1d5cc9438
4
- data.tar.gz: 0ea92713bdc85e1b0ef27fa732c59179ead5aadb
3
+ metadata.gz: da0ab40365d511197a182ffb45d25ad3f0071e27
4
+ data.tar.gz: 5dddb23478cecbbcf66c5c62c52c2725f5eb65cd
5
5
  SHA512:
6
- metadata.gz: adcc79a00c09e53c879b5c03b1f1373e42761881cd0e14a391cfb6ffb1f2d32a9fa062253f3f5613e8159f2641b073c8ee44837915db0953a05d6b0671133595
7
- data.tar.gz: 747010bb10b3fa7095f59e356f3f8e4ee15beec28a80508e8b13ac3d150b353486648bafff5dae112290adb04ce2af55d41e3eaa876ace40a0b6c2247c9d00d9
6
+ metadata.gz: 36c743bcadf84b12256bbec379b940a26e971db8b9590c5b3c7ffbc9928701e7515fe6378f9858a0c946cde851940e2daca5d99323c41df798d890f1115339a3
7
+ data.tar.gz: 1ab90e278383fb4830b651559135a2463f5d190d49fe83c633f2c4de9865ea0f4727f26b52f4736f2da8ed3301a04e7a88cb980252334a6c6f3e7c4a1e855ceb
data/CHANGES CHANGED
@@ -1,5 +1,19 @@
1
1
 
2
- Current version: 1.4.1
2
+ Current version: 1.5.1
3
+
4
+ Changes since version 1.4.1:
5
+
6
+ o Added support for MRI Ruby 2.1.x & 2.2.x (32 & 64 bits)
7
+
8
+ o Added support for TAO <= 2.3.1
9
+
10
+ o Added support for JRuby <= 1.7.19
11
+
12
+ o Added support for JacORB <= 3.5
13
+
14
+ o Upgraded RIDL frontend to 2.5.5
15
+
16
+ o Officially drop MRI Ruby < 1.9 support
3
17
 
4
18
  Changes since version 1.3.1:
5
19
 
data/THANKS CHANGED
@@ -49,4 +49,6 @@ Our thanks go to:
49
49
 
50
50
  * Grant Birchmeier for reporting the RIDL logger bug (triggered
51
51
  by an unknown pragma)
52
-
52
+
53
+ * Andrey Mramornov for reporting and testing the R2CORBA build
54
+ problems on Ubuntu.
data/bin/r2corba CHANGED
@@ -1,4 +1,4 @@
1
- #!C:\msys\1.0\bin\env.EXE ruby
1
+ #!/bin/ruby
2
2
  #---------------------------------
3
3
  # This file is generated
4
4
  #---------------------------------
data/bin/ridlc CHANGED
@@ -1,4 +1,4 @@
1
- #!C:\msys\1.0\bin\env.EXE ruby
1
+ #!/bin/ruby
2
2
  #---------------------------------
3
3
  # This file is generated
4
4
  #---------------------------------
data/bin/rins CHANGED
@@ -1,4 +1,4 @@
1
- #!C:\msys\1.0\bin\env.EXE ruby
1
+ #!/bin/ruby
2
2
  #---------------------------------
3
3
  # This file is generated
4
4
  #---------------------------------
@@ -17,6 +17,13 @@ module R2CORBA
17
17
 
18
18
  module ORB
19
19
 
20
+ class << self
21
+ protected
22
+ def _singleton_orb_init
23
+ CORBA::Native::ORB.init
24
+ end
25
+ end
26
+
20
27
  @@_default_args = []
21
28
  unless R2CORBA::TAO::RUBY_THREAD_SUPPORT
22
29
  # to prevent problems with "green threads" model of Ruby <=1.8.x run TAO
@@ -28,7 +35,7 @@ module R2CORBA
28
35
  ## init() or init(arg1, arg2, arg3[, ...]) or init(orb_id, prop = {}) or init(argv, orb_id, prop={}) or init(argv, prop={})
29
36
  def self.init(*args)
30
37
  n_orb = if args.empty? && @@_default_args.empty?
31
- @@cached_orb = CORBA::Native::ORB.init
38
+ _singleton_orb_init
32
39
  else
33
40
  argv = []
34
41
  orb_id = nil
@@ -192,7 +199,6 @@ module R2CORBA
192
199
  15, # TERM
193
200
  17, # CHLD
194
201
  18, # CONT
195
- 19, # STOP
196
202
  23, # URG
197
203
  30, # PWR
198
204
  31 # SYS
@@ -42,7 +42,7 @@ module R2CORBA
42
42
  @@cached_orb = nil
43
43
 
44
44
  def self._orb
45
- @@cached_orb || CORBA::Native::ORB.init
45
+ @@cached_orb || _singleton_orb_init
46
46
  end
47
47
 
48
48
  def ==(other)
@@ -187,7 +187,7 @@ module R2CORBA
187
187
  def _get_orb()
188
188
  raise CORBA::INV_OBJREF.new if self._is_nil?()
189
189
  begin
190
- CORBA::ORB._wrap_native(self.objref_._orb)
190
+ CORBA::ORB._wrap_native(self.objref_._get_orb)
191
191
  rescue ::NativeException
192
192
  CORBA::Exception.native2r($!)
193
193
  end
@@ -14,7 +14,7 @@
14
14
  module R2CORBA
15
15
 
16
16
  R2CORBA_MAJOR = 1.freeze
17
- R2CORBA_MINOR = 4.freeze
17
+ R2CORBA_MINOR = 5.freeze
18
18
  R2CORBA_RELEASE = '1'.freeze
19
19
 
20
20
  R2CORBA_VERSION = "#{R2CORBA_MAJOR}.#{R2CORBA_MINOR}.#{R2CORBA_RELEASE}".freeze
@@ -16,10 +16,23 @@ module R2CORBA
16
16
 
17
17
  module ORB
18
18
 
19
+ class << self
20
+ protected
21
+ def _singleton_orb_init
22
+ begin
23
+ CORBA::Native::ORB.init
24
+ rescue ArgumentError
25
+ # this will happen if java.endorsed.dirs is used with JacORB
26
+ # in that case just directly init on the singleton class itself
27
+ CORBA::Native::ORBSingleton.init
28
+ end
29
+ end
30
+ end
31
+
19
32
  ## init() or init(arg1, arg2[, ...]) or init(orb_id, prop = {}) or init(argv, orb_id, prop={}) or init(argv, prop={})
20
33
  def self.init(*args)
21
34
  n_orb = if args.empty?
22
- CORBA::Native::ORB.init
35
+ _singleton_orb_init
23
36
  else
24
37
  argv = []
25
38
  orb_id = nil
@@ -42,22 +42,23 @@ module R2CORBA
42
42
  ## if this object ref has already been narrowed
43
43
  return self._interface_repository_id if self.respond_to?(:_interface_repository_id)
44
44
  ## ask the remote side
45
- ## have to do this ourselves since JacORB does not support this method
46
- ## and we can't use #invoke since this should work without narrowing
45
+ ## have to do this ourselves since JacORB only resolves this locally (never calling remote)
47
46
  req = self._request('_repository_id')
48
47
  req.set_return_type(CORBA._tc_string)
49
48
  return req.invoke
50
49
  end
51
50
 
52
- #ret ::CORBA::Object
53
- def _get_component()
54
- raise CORBA::INV_OBJREF.new if self._is_nil?()
55
- ## ask the remote side
56
- ## have to do this ourselves since JacORB does not support this method
57
- ## and we can't use #invoke since this should work without narrowing
58
- req = self._request('_component')
59
- req.set_return_type(CORBA._tc_Object)
60
- return req.invoke
51
+ unless CORBA::Native::Portable::ObjectImpl.public_instance_methods.include?(:_get_component)
52
+ #ret ::CORBA::Object
53
+ def _get_component()
54
+ raise CORBA::INV_OBJREF.new if self._is_nil?()
55
+ ## ask the remote side
56
+ ## have to do this ourselves since JacORB does not support this remote method on Object
57
+ ## and we can't use #invoke since this should work without narrowing
58
+ req = self._request('_component')
59
+ req.set_return_type(CORBA._tc_Object)
60
+ return req.invoke
61
+ end
61
62
  end
62
63
 
63
64
  #def PolicyType policy_type
@@ -66,7 +66,7 @@ module R2CORBA
66
66
  rsrvreq.describe({:arg_list => [], :result_type => CORBA._tc_Object})
67
67
  rc = self._get_component(*rsrvreq.arguments)
68
68
  jany = rsrvreq.orb_.create_any()
69
- jany.insert_Object(rc.objref_)
69
+ jany.insert_Object(rc)
70
70
  jsrvreq.set_result(jany)
71
71
  else
72
72
  @rsrv.is_a?(PortableServer::DynamicImplementation) ? self.invoke_DSI(rsrvreq) : self.invoke_SI(rsrvreq)
@@ -156,7 +156,8 @@ module R2CORBA
156
156
  if @rsrv.nil?
157
157
  return nil
158
158
  elsif @rsrv.respond_to?(:_get_component)
159
- return @rsrv._get_component
159
+ obj = @rsrv._get_component
160
+ return obj ? obj.objref_ : nil
160
161
  else
161
162
  return super
162
163
  end
@@ -14,18 +14,21 @@ require 'rbconfig'
14
14
  require 'java'
15
15
 
16
16
  module R2CORBA
17
- if ENV['JACORB_HOME'] && File.exists?(File.join(ENV['JACORB_HOME'], 'lib', 'jacorb.jar'))
17
+ if ENV['JACORB_HOME'] &&
18
+ (File.exists?(File.join(ENV['JACORB_HOME'], 'lib', 'jacorb.jar')) ||
19
+ Dir[File.join(ENV['JACORB_HOME'], 'lib', 'jacorb-*.jar')].any? {|p| p =~ /\/jacorb\-\d\.\d\.jar\Z/})
18
20
  JACORB_HOME = ENV['JACORB_HOME']
19
21
  else
20
22
  # find jacorb.jar in library search path
21
- JACORB_HOME = File.dirname(($:.find { |path| File.exists?(File.join(path, 'jacorb.jar')) }).to_s)
23
+ JACORB_HOME = File.dirname(($:.find { |path| Dir[File.join(path, 'jacorb-*.jar')].any? {|p| p =~ /\/jacorb(\.jar|\-\d\.\d\.jar)\Z/} }).to_s)
22
24
  end
23
25
 
24
26
  $LOAD_PATH << File.join(JACORB_HOME, 'lib')
25
27
  module JavaLang
26
28
  include_package 'java.lang'
27
- prop = System.getProperties['java.endorsed.dirs']
28
- System.setProperty('java.endorsed.dirs', "#{File.join(R2CORBA::JACORB_HOME, 'lib')}:#{prop}")
29
+ ## Only works if passed as Java commandline arg
30
+ # prop = System.getProperties['java.endorsed.dirs']
31
+ # System.setProperty('java.endorsed.dirs', "#{File.join(R2CORBA::JACORB_HOME, 'lib')}:#{prop}")
29
32
  System.setProperty('jacorb.home', "#{R2CORBA::JACORB_HOME}")
30
33
  System.setProperty('org.omg.CORBA.ORBClass', 'org.jacorb.orb.ORB')
31
34
  System.setProperty('org.omg.CORBA.ORBSingletonClass', 'org.jacorb.orb.ORBSingleton')
@@ -82,12 +82,12 @@ module IDL
82
82
  end # module RIDL
83
83
 
84
84
  module Ruby
85
- COPYRIGHT = 'Copyright (c) 2007-2013 Remedy IT Expertise BV, The Netherlands'.freeze
85
+ COPYRIGHT = "Copyright (c) 2007-#{Time.now.year} Remedy IT Expertise BV, The Netherlands".freeze
86
86
  TITLE = 'RIDL Ruby backend'.freeze
87
87
  VERSION = {
88
- :major => 1,
89
- :minor => 9,
90
- :release => 2
88
+ :major => 2,
89
+ :minor => 0,
90
+ :release => 1
91
91
  }
92
92
 
93
93
  ## Configure Ruby backend
@@ -108,7 +108,7 @@ module IDL
108
108
 
109
109
  # ruby specific option switches
110
110
 
111
- unless IDL.preprocessing? # same switch defined for IDL preprocessing mode
111
+ unless ridl_params[:preprocess] # same switch defined for IDL preprocessing mode
112
112
  optlist.for_switch "--output=FILE", :type => String,
113
113
  :description => ['Specifies filename to generate output in.',
114
114
  'Default: File.basename(idlfile, \'.idl\')+<postfix>+<ext>'] do |swcfg|
@@ -333,4 +333,4 @@ module IDL
333
333
 
334
334
  end # module Ruby
335
335
 
336
- end # module IDL
336
+ end # module IDL
Binary file
data/mkrf_conf_bingem.rb CHANGED
@@ -62,12 +62,62 @@ else
62
62
  require 'rubygems/dependency_installer.rb'
63
63
  require 'rubygems/uninstaller'
64
64
  require 'fileutils'
65
+
66
+ ## ==========================================================================================##
67
+
68
+ # determin rubygems version
69
+ gem_ver_major, gem_ver_minor, gem_ver_release = Gem::VERSION.split('.').collect {|s| s.to_i }
70
+ # in case of rubygems 2.3.0 - 2.4.5
71
+ if gem_ver_major == 2 && (gem_ver_minor == 3 || (gem_ver_minor == 4 && gem_ver_release <= 5))
72
+ # patch the Gem::Resolver::InstallerSet class
73
+ require 'rubygems/resolver/installer_set'
74
+ class ::Gem::Resolver::InstallerSet
75
+ def add_always_install dependency
76
+ request = Gem::Resolver::DependencyRequest.new dependency, nil
77
+
78
+ found = find_all request
79
+
80
+ found.delete_if { |s|
81
+ s.version.prerelease? and not s.local?
82
+ } unless dependency.prerelease?
83
+
84
+ found = found.select do |s|
85
+ Gem::Source::SpecificFile === s.source or
86
+ Gem::Platform::RUBY == s.platform or
87
+ # *** MCO patch *** use correct platform comparison -> s.platform === String
88
+ Gem::Platform.local =~ s.platform
89
+ end
90
+
91
+ if found.empty? then
92
+ exc = Gem::UnsatisfiableDependencyError.new request
93
+ exc.errors = errors
94
+
95
+ raise exc
96
+ end
97
+
98
+ newest = found.max_by do |s|
99
+ [s.version, s.platform == Gem::Platform::RUBY ? -1 : 1]
100
+ end
101
+
102
+ @always_install << newest.spec
103
+ end
104
+ end
105
+ end
106
+
107
+ ## ==========================================================================================##
108
+
65
109
  begin
66
110
  Gem::Command.build_args = ARGV
67
111
  rescue NoMethodError
68
112
  end
69
- Gem.sources << ENV['R2CORBA_GEM_SOURCE'] unless ENV['R2CORBA_GEM_SOURCE'].to_s.empty?
70
- puts "Gem sources: #{Gem.sources.to_a}"
113
+ unless ENV['R2CORBA_GEM_SOURCE'].to_s.empty?
114
+ # make sure the RubyGems configuration has been loaded as this potentially overwrites
115
+ # Gem.sources
116
+ Gem.configuration
117
+ # add custom source
118
+ Gem.sources << ENV['R2CORBA_GEM_SOURCE']
119
+ puts "Gem sources: #{Gem.sources.to_a}"
120
+ end
71
121
  inst = Gem::DependencyInstaller.new
72
122
  begin
73
123
  # install corresponding gem with extension binaries
data/rakelib/bin.rb CHANGED
@@ -19,7 +19,7 @@ module R2CORBA
19
19
 
20
20
  def self.ridlc
21
21
  <<_SH_TXT
22
- #!#{(`which env`).strip} #{R2CORBA::RB_CONFIG['ruby_install_name']}
22
+ #!#{Config.is_win32 ? '/bin/' : (`which env`).strip+' '}#{R2CORBA::RB_CONFIG['ruby_install_name']}
23
23
  #---------------------------------
24
24
  # This file is generated
25
25
  #---------------------------------
@@ -87,7 +87,7 @@ _BAT_TXT
87
87
 
88
88
  def self.rins
89
89
  <<_SH_TXT
90
- #!#{(`which env`).strip} #{R2CORBA::RB_CONFIG['ruby_install_name']}
90
+ #!#{Config.is_win32 ? '/bin/' : (`which env`).strip+' '}#{R2CORBA::RB_CONFIG['ruby_install_name']}
91
91
  #---------------------------------
92
92
  # This file is generated
93
93
  #---------------------------------
@@ -99,7 +99,7 @@ _SH_TXT
99
99
 
100
100
  def self.r2corba
101
101
  <<_SH_TXT
102
- #!#{(`which env`).strip} #{R2CORBA::RB_CONFIG['ruby_install_name']}
102
+ #!#{Config.is_win32 ? '/bin/' : (`which env`).strip+' '}#{R2CORBA::RB_CONFIG['ruby_install_name']}
103
103
  #---------------------------------
104
104
  # This file is generated
105
105
  #---------------------------------
data/rakelib/config.rb CHANGED
@@ -69,6 +69,49 @@ require File.join(File.dirname(__FILE__), '../lib/corba/common/version')
69
69
  jacorb_home ENV['JACORB_HOME']
70
70
  =end
71
71
 
72
+ if (Rake::Version::MAJOR.to_i == 10 &&
73
+ ((Rake::Version::MINOR.to_i == 4 && Rake::Version::BUILD.to_i >= 2) ||
74
+ Rake::Version::MINOR.to_i > 4)) || Rake::Version::MAJOR.to_i > 10
75
+
76
+ # patch Rake::Application with method to cleanup ARGV consuming
77
+ # all Rake options
78
+ class Rake::Application
79
+
80
+ def cleanup_args(argv = ARGV) # :nodoc:
81
+ return argv if options.r2corba_cleanup_done
82
+
83
+ _opt_backup = options
84
+ @options = OpenStruct.new
85
+ options.rakelib = ['rakelib']
86
+ options.trace_output = $stderr
87
+
88
+ begin
89
+ return OptionParser.new do |opts|
90
+ opts.banner = ""
91
+ opts.separator ""
92
+
93
+ standard_rake_options.each { |args| opts.on(*args) }
94
+ opts.environment('RAKEOPT')
95
+ end.parse!(argv)
96
+ ensure
97
+ @options = _opt_backup
98
+ @options.r2corba_cleanup_done = true
99
+ end
100
+ end
101
+
102
+ end
103
+ else
104
+
105
+ class Rake::Application
106
+
107
+ ## noop for other Rake versions
108
+ def cleanup_args(argv = ARGV) # :nodoc:
109
+ argv
110
+ end
111
+
112
+ end
113
+ end
114
+
72
115
  module R2CORBA
73
116
 
74
117
  if defined? ::RbConfig
@@ -168,6 +211,53 @@ module R2CORBA
168
211
  @@is_linux = RB_CONFIG['target_os'] =~ /linux/ ? true : false
169
212
  @@is_osx = RUBY_PLATFORM =~ /darwin/ ? true : false
170
213
 
214
+ if @@is_linux
215
+ # determin distro
216
+ io_args = [$/, {:encoding => 'utf-8'}] if rb_ver_major > 1 || (rb_ver_minor > 8 && rb_ver_major == 1)
217
+ name = 'linux'
218
+ if File.readable?('/etc/os-release')
219
+ # find 'NAME=...'
220
+ File.foreach('/etc/os-release', *io_args) do |ln|
221
+ if /^NAME=(.*)$/ =~ ln.strip
222
+ name = $1.downcase
223
+ break
224
+ end
225
+ end
226
+ elsif File.readable?('/etc/lsb-release')
227
+ # find 'DISTRIB_ID='
228
+ File.foreach('/etc/lsb-release', *io_args) do |ln|
229
+ if /^DISTRIB_ID=(.*)$/ =~ ln.strip
230
+ name = $1.downcase
231
+ break
232
+ end
233
+ end
234
+ elsif File.readable?('/etc/redhat-release')
235
+ name = File.read('/etc/redhat-release').strip.downcase
236
+ elsif File.exists?('/etc/SuSE-release')
237
+ name = 'suse'
238
+ elsif File.exists?('/etc/debian_version')
239
+ name = 'debian'
240
+ end
241
+ @@linux_distro = case name
242
+ when /suse/
243
+ :suse
244
+ when /fedora/
245
+ :fedora
246
+ when /ubuntu/
247
+ :ubuntu
248
+ when /red\s*hat/
249
+ :redhat
250
+ when /centos/
251
+ :centos
252
+ when /debian/
253
+ :debian
254
+ else
255
+ :linux
256
+ end
257
+ else
258
+ @@linux_distro = :none
259
+ end
260
+
171
261
  def self.is_win32
172
262
  @@is_win32
173
263
  end
@@ -177,6 +267,9 @@ module R2CORBA
177
267
  def self.is_linux
178
268
  @@is_linux
179
269
  end
270
+ def self.linux_distro
271
+ @@linux_distro
272
+ end
180
273
  def self.is_osx
181
274
  @@is_osx
182
275
  end
@@ -274,6 +367,7 @@ module R2CORBA
274
367
  end
275
368
 
276
369
  def self.define
370
+ _argv = Rake.application.cleanup_args(ARGV)
277
371
  OptionParser.new do |opts|
278
372
  opts.banner = "Usage: rake [rake options] -- configure [options]"
279
373
 
@@ -318,7 +412,7 @@ module R2CORBA
318
412
  opts.on('--makeprog=name',
319
413
  "the make program to compile ruby extentions [#{get_config(:makeprog)}]") {|v| CONFIG[:makeprog] = v}
320
414
  opts.on('--without-tao',
321
- "do *not* configure/build/clean the ACE+TAO libraries [#{get_config('without-tao')}]") {|v| CONFIG[:'without-tao'] = true}
415
+ "do *not* configure/build/clean the ACE+TAO libraries [#{get_config('without-tao')}]") {|v| CONFIG[:'without-tao'] = true }
322
416
  opts.on('--aceroot=path',
323
417
  "the path to the root directory of ACE [#{get_config(:aceroot)}]") {|v| CONFIG[:aceroot] = v}
324
418
  opts.on('--taoroot=path',
@@ -340,7 +434,7 @@ module R2CORBA
340
434
  opts.separator ""
341
435
 
342
436
  opts.on('--help', 'Show this help message') { puts opts; puts; exit }
343
- end.parse!(ARGV)
437
+ end.parse!(_argv)
344
438
  end
345
439
 
346
440
  def self.check