r2corba 1.5.1-x64-mingw32 → 1.6.1-x64-mingw32

data/mkrf_conf_bingem.rb

@@ -8,7 +8,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 # generate Rakefile with appropriate default task (all actual task in rakelib)
@@ -24,7 +23,6 @@ File.open('Rakefile', 'w') do |f|
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 if defined?(JRUBY_VERSION)
@@ -38,7 +36,7 @@ end
 if defined?(JRUBY_VERSION)
 
   unless system("ruby -S rake -- configure --jacorb-home=#{File.expand_path('ext')}")
-    $stderr.puts "Failed to configure R2CORBA"
+    $stderr.puts 'Failed to configure R2CORBA'
     exit(1)
   end
 
@@ -143,9 +141,9 @@ else
 
   end
 
-  puts "Running rake -- configure --without-tao"
-  unless system("rake -- configure --without-tao")
-    puts "Failed to configure R2CORBA."
+  puts 'Running rake -- configure --without-tao'
+  unless system('rake -- configure --without-tao')
+    puts 'Failed to configure R2CORBA.'
     exit(1)
   end
 end

data/rakelib/bin.rake

@@ -8,7 +8,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 require File.join(File.dirname(__FILE__), 'bin.rb')
@@ -43,9 +42,9 @@ namespace :r2corba do
 
     task :check do
       R2CORBA::Bin.binaries.each do |bin|
-        if File.exists?(File.join('bin', bin))
+        if File.exist?(File.join('bin', bin))
           content = IO.read(File.join('bin', bin))
-          rm_f(File.join('bin', bin)) unless content == R2CORBA::Bin.__send__(bin.gsub('.','_').to_sym)
+          rm_f(File.join('bin', bin)) unless content == R2CORBA::Bin.__send__(bin.gsub('.', '_').to_sym)
         end
       end
     end

data/rakelib/bin.rb

@@ -8,7 +8,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 require File.join(File.dirname(__FILE__), 'config.rb')
@@ -19,7 +18,7 @@ module R2CORBA
 
     def self.ridlc
       <<_SH_TXT
-#!#{Config.is_win32 ? '/bin/' : (`which env`).strip+' '}#{R2CORBA::RB_CONFIG['ruby_install_name']}
+#!#{Config.is_win32 ? '/bin/' : (`which env`).strip + ' '}#{R2CORBA::RB_CONFIG['ruby_install_name']}
 #---------------------------------
 # This file is generated
 #---------------------------------
@@ -87,7 +86,7 @@ _BAT_TXT
 
     def self.rins
       <<_SH_TXT
-#!#{Config.is_win32 ? '/bin/' : (`which env`).strip+' '}#{R2CORBA::RB_CONFIG['ruby_install_name']}
+#!#{Config.is_win32 ? '/bin/' : (`which env`).strip + ' '}#{R2CORBA::RB_CONFIG['ruby_install_name']}
 #---------------------------------
 # This file is generated
 #---------------------------------
@@ -99,7 +98,7 @@ _SH_TXT
 
     def self.r2corba
       <<_SH_TXT
-#!#{Config.is_win32 ? '/bin/' : (`which env`).strip+' '}#{R2CORBA::RB_CONFIG['ruby_install_name']}
+#!#{Config.is_win32 ? '/bin/' : (`which env`).strip + ' '}#{R2CORBA::RB_CONFIG['ruby_install_name']}
 #---------------------------------
 # This file is generated
 #---------------------------------
@@ -143,4 +142,4 @@ _BAT_TXT
 
   end # Bin
 
-end # R2CORBA
+end # R2CORBA

data/rakelib/build.rake

@@ -8,7 +8,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 require File.join(File.dirname(__FILE__), 'config.rb')
@@ -32,56 +31,57 @@ task :build => 'r2corba:build'
 
 ## compile base IDL
 
-r2c_idlc_root = File.join('lib','corba','idl')
+r2c_idlc_root = File.join('lib', 'corba', 'idl')
+stdidl_root = File.join('lib', 'idl')
 
-orb_pidlc = File.join('lib', 'ridlbe','ruby','orb.pidlc')
+orb_pidlc = File.join('lib', 'ridlbe', 'ruby', 'orb.pidlc')
 file orb_pidlc => [R2CORBA::BUILD_CFG] do |t|
-  sh("#{R2CORBA::Config.ridlc} --preprocess --output #{t.name} --stdidl orb.idl")
+  sh("#{R2CORBA::Config.ridlc} --preprocess --output #{t.name} --include=#{stdidl_root} orb.idl")
 end
 Rake::Task['r2corba:build_idl'].enhance [orb_pidlc]
 CLOBBER.include orb_pidlc
 
-file File.join(r2c_idlc_root,'r2c_orb.rb') => [R2CORBA::BUILD_CFG, orb_pidlc] do |t|
+file File.join(r2c_idlc_root, 'r2c_orb.rb') => [R2CORBA::BUILD_CFG, orb_pidlc] do |t|
   cmd = R2CORBA::Config.ridlc
-  cmd << " --ignore-pidl --output #{t.name} --namespace=R2CORBA --stdidl" <<
-         " --stubs-only --expand-includes --search-includepath --no-libinit --interface-as-class=TypeCode orb.idl"
+  cmd << " --ignore-pidl --output #{t.name} --namespace=R2CORBA --include=#{stdidl_root}" <<
+         ' --stubs-only --expand-includes --search-includepath --no-libinit --interface-as-class=TypeCode orb.idl'
   sh(cmd)
 end
-Rake::Task['r2corba:build_idl'].enhance [File.join(r2c_idlc_root,'r2c_orb.rb')]
-CLOBBER.include File.join(r2c_idlc_root,'r2c_orb.rb')
+Rake::Task['r2corba:build_idl'].enhance [File.join(r2c_idlc_root, 'r2c_orb.rb')]
+CLOBBER.include File.join(r2c_idlc_root, 'r2c_orb.rb')
 
 [ ['POA', 'PortableServer.pidl'],
   ['Messaging', 'Messaging.pidl'],
   ['BiDirPolicy', 'BiDirPolicy.pidl'],
 ].each do |stub, pidl|
-  file File.join(r2c_idlc_root,stub+'C.rb') => [R2CORBA::BUILD_CFG, orb_pidlc] do |t|
+  file File.join(r2c_idlc_root, stub + 'C.rb') => [R2CORBA::BUILD_CFG, orb_pidlc] do |t|
     cmd = R2CORBA::Config.ridlc
-    cmd << " --output #{t.name} --namespace=R2CORBA --stdidl --stubs-only --expand-includes --search-includepath --no-libinit #{pidl}"
+    cmd << " --output #{t.name} --namespace=R2CORBA --include=#{stdidl_root} --stubs-only --expand-includes --search-includepath --no-libinit #{pidl}"
     sh(cmd)
   end
-  Rake::Task['r2corba:build_idl'].enhance [File.join(r2c_idlc_root,stub+'C.rb')]
-  CLOBBER.include File.join(r2c_idlc_root,stub+'C.rb')
+  Rake::Task['r2corba:build_idl'].enhance [File.join(r2c_idlc_root, stub + 'C.rb')]
+  CLOBBER.include File.join(r2c_idlc_root, stub + 'C.rb')
 end
 
 unless defined?(JRUBY_VERSION)
-  r2tao_root = File.join('lib','corba','cbase')
+  r2tao_root = File.join('lib', 'corba', 'cbase')
   tao_root = get_config('taoroot')
   [ 'TAO_Ext', 'IORTable' ].each do |stub|
-    file File.join(r2c_idlc_root,stub+'C.rb') => [R2CORBA::BUILD_CFG, orb_pidlc] do |t|
+    file File.join(r2c_idlc_root, stub + 'C.rb') => [R2CORBA::BUILD_CFG, orb_pidlc] do |t|
       cmd = R2CORBA::Config.ridlc
-      cmd << " --output #{t.name} --namespace=R2CORBA --stdidl --stubs-only --expand-includes -I#{tao_root}" <<
-          " --search-includepath --no-libinit #{File.join(r2c_idlc_root, stub+'.pidl')}"
+      cmd << " --output #{t.name} --namespace=R2CORBA --include=#{stdidl_root} --stubs-only --expand-includes -I#{tao_root}" <<
+          " --search-includepath --no-libinit #{File.join(r2c_idlc_root, stub + '.pidl')}"
       sh(cmd)
     end
-    Rake::Task['r2corba:build_idl'].enhance [File.join(r2c_idlc_root,stub+'C.rb')]
-    CLOBBER.include File.join(r2c_idlc_root,stub+'C.rb')
+    Rake::Task['r2corba:build_idl'].enhance [File.join(r2c_idlc_root, stub + 'C.rb')]
+    CLOBBER.include File.join(r2c_idlc_root, stub + 'C.rb')
   end
 end
 
 file File.join(r2c_idlc_root, 'CosNamingC.rb') => [R2CORBA::BUILD_CFG, orb_pidlc] do |t|
   cmd = R2CORBA::Config.ridlc
-  cmd << " -o #{r2c_idlc_root} --stdidl --expand-includes --search-includepath CosNaming.idl"
+  cmd << " -o #{r2c_idlc_root} --include=#{stdidl_root} --expand-includes --search-includepath CosNaming.idl"
   sh(cmd)
 end
-Rake::Task['r2corba:build_idl'].enhance [File.join(r2c_idlc_root,'CosNamingC.rb')]
-CLOBBER.include File.join(r2c_idlc_root,'CosNamingC.rb')
+Rake::Task['r2corba:build_idl'].enhance [File.join(r2c_idlc_root, 'CosNamingC.rb')]
+CLOBBER.include File.join(r2c_idlc_root, 'CosNamingC.rb')

data/rakelib/config.rake

@@ -8,7 +8,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 require File.join(File.dirname(__FILE__), 'config.rb')
@@ -30,7 +29,7 @@ namespace :r2corba do
   namespace :config do
     task :show do
       R2CORBA::CFGKEYS.each do |ck|
-        puts "%20s => %s" % [ck, get_config(ck)]
+        puts '%20s => %s' % [ck, get_config(ck)]
       end
     end
   end
@@ -49,4 +48,4 @@ file R2CORBA::BUILD_CFG do
   end
 end
 
-CLOBBER.include R2CORBA::BUILD_CFG
+CLOBBER.include R2CORBA::BUILD_CFG

data/rakelib/config.rb

@@ -8,7 +8,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 require 'rbconfig'
@@ -87,8 +86,8 @@ if (Rake::Version::MAJOR.to_i == 10 &&
 
       begin
         return OptionParser.new do |opts|
-          opts.banner = ""
-          opts.separator ""
+          opts.banner = ''
+          opts.separator ''
 
           standard_rake_options.each { |args| opts.on(*args) }
           opts.environment('RAKEOPT')
@@ -172,7 +171,7 @@ module R2CORBA
       :aceinstdir => '',
       :'with-ipv6' => false,
       :'with-ssl' => false,
-      :sslroot => ENV['SSL_ROOT'] || (RUBY_PLATFORM =~ /mingw32/ ? '' : '/usr'),
+      :sslroot => ENV['SSL_ROOT'] || (RUBY_PLATFORM =~ /mingw/ ? '' : '/usr'),
       :'with-debug' => false,
     })
     BUILD_CFG = '.rconfig'
@@ -206,18 +205,17 @@ module R2CORBA
       @@ruby_ver[2]
     end
 
-    @@is_win32 = RUBY_PLATFORM =~ /mingw32/ ? true : false
+    @@is_win32 = RUBY_PLATFORM =~ /mingw/ ? true : false
     @@is_win64 = (@@is_win32 && (RUBY_PLATFORM =~ /x64/)) ? true : false
     @@is_linux = RB_CONFIG['target_os'] =~ /linux/ ? true : false
     @@is_osx = RUBY_PLATFORM =~ /darwin/ ? true : false
 
     if @@is_linux
       # determin distro
-      io_args = [$/, {:encoding => 'utf-8'}] if rb_ver_major > 1 || (rb_ver_minor > 8 && rb_ver_major == 1)
       name = 'linux'
       if File.readable?('/etc/os-release')
         # find 'NAME=...'
-        File.foreach('/etc/os-release', *io_args) do |ln|
+        File.foreach('/etc/os-release', :encoding => 'utf-8') do |ln|
           if /^NAME=(.*)$/ =~ ln.strip
             name = $1.downcase
             break
@@ -225,7 +223,7 @@ module R2CORBA
         end
       elsif File.readable?('/etc/lsb-release')
         # find 'DISTRIB_ID='
-        File.foreach('/etc/lsb-release', *io_args) do |ln|
+        File.foreach('/etc/lsb-release', :encoding => 'utf-8') do |ln|
           if /^DISTRIB_ID=(.*)$/ =~ ln.strip
             name = $1.downcase
             break
@@ -233,9 +231,9 @@ module R2CORBA
         end
       elsif File.readable?('/etc/redhat-release')
         name = File.read('/etc/redhat-release').strip.downcase
-      elsif File.exists?('/etc/SuSE-release')
+      elsif File.exist?('/etc/SuSE-release')
         name = 'suse'
-      elsif File.exists?('/etc/debian_version')
+      elsif File.exist?('/etc/debian_version')
         name = 'debian'
       end
       @@linux_distro = case name
@@ -274,7 +272,7 @@ module R2CORBA
       @@is_osx
     end
 
-    @@cpu_cores = (@@is_linux ? `cat /proc/cpuinfo | grep processor | wc -l`.to_i : 1)
+    @@cpu_cores = (@@is_linux ? `cat /proc/cpuinfo | grep processor | wc -l`.to_i : (ENV['NUMBER_OF_PROCESSORS'] || 1).to_i)
 
     def self.cpu_cores
       @@cpu_cores
@@ -311,14 +309,14 @@ module R2CORBA
           ENV['MPC_ROOT'] = get_config('mpcroot')
 
           if is_win32
-            ENV['PATH'] = "#{File.join(ENV['ACE_ROOT'],'lib')}#{';'}#{ENV['PATH']}"
+            ENV['PATH'] = "#{File.join(ENV['ACE_ROOT'], 'lib')}#{';'}#{ENV['PATH']}"
             ENV['SSL_ROOT'] = get_config('sslroot') if get_config('with-ssl')
           elsif RUBY_PLATFORM =~ /darwin/
-            ENV['DYLD_LIBRARY_PATH'] = "#{File.join(ENV['ACE_ROOT'],'lib')}#{File::PATH_SEPARATOR}#{ENV['DYLD_LIBRARY_PATH'] || ""}"
-            ENV['SSL_ROOT'] = get_config('sslroot') if get_config('with-ssl') && get_config('sslroot')!='/usr'
+            ENV['DYLD_LIBRARY_PATH'] = "#{File.join(ENV['ACE_ROOT'], 'lib')}#{File::PATH_SEPARATOR}#{ENV['DYLD_LIBRARY_PATH'] || ""}"
+            ENV['SSL_ROOT'] = get_config('sslroot') if get_config('with-ssl') && get_config('sslroot') != '/usr'
           else
-            ENV['LD_LIBRARY_PATH'] = "#{File.join(ENV['ACE_ROOT'],'lib')}#{File::PATH_SEPARATOR}#{ENV['LD_LIBRARY_PATH'] || ""}"
-            ENV['SSL_ROOT'] = get_config('sslroot') if get_config('with-ssl') && get_config('sslroot')!='/usr'
+            ENV['LD_LIBRARY_PATH'] = "#{File.join(ENV['ACE_ROOT'], 'lib')}#{File::PATH_SEPARATOR}#{ENV['LD_LIBRARY_PATH'] || ""}"
+            ENV['SSL_ROOT'] = get_config('sslroot') if get_config('with-ssl') && get_config('sslroot') != '/usr'
           end
 
         else
@@ -349,7 +347,7 @@ module R2CORBA
       @@ridlc = File.join('bin', 'ridlc')
 
       # check availability of RIDL; either as gem or in subdir
-      if (@@ridl_local = File.exists?(File.join('ridl', 'lib', 'ridl', 'ridl.rb')))
+      if (@@ridl_local = File.exist?(File.join('ridl', 'lib', 'ridl', 'ridl.rb')))
         incdirs = [
             File.expand_path(File.join('ridl', 'lib')),
             File.expand_path('lib'),
@@ -369,9 +367,9 @@ module R2CORBA
     def self.define
       _argv = Rake.application.cleanup_args(ARGV)
       OptionParser.new do |opts|
-        opts.banner = "Usage: rake [rake options] -- configure [options]"
+        opts.banner = 'Usage: rake [rake options] -- configure [options]'
 
-        opts.separator ""
+        opts.separator ''
 
         opts.on('--prefix=path',
                 "path prefix of target environment [#{get_config(:prefix)}]") {|v| set_config(:prefix, File.expand_path(v))}
@@ -402,7 +400,7 @@ module R2CORBA
         opts.on('--rbdir=path',
                 "the directory for ruby scripts [#{get_config(:rbdir)}]")  {|v| CONFIG[:rbdir] = v}
         opts.on('--sodir=path',
-                "the directory for ruby extentions [#{get_config(:sodir)}]")  {|v| CONFIG[:sodir] = v}
+                "the directory for ruby extensions [#{get_config(:sodir)}]")  {|v| CONFIG[:sodir] = v}
         if defined?(JRUBY_VERSION)
           opts.on('--without-jacorb',
                   "do *not* install JacORB JAR files with R2CORBA [#{get_config('without-jacorb')}]")  {|v| CONFIG[:'without-jacorb'] = true}
@@ -410,7 +408,7 @@ module R2CORBA
                   "the path to the root directory of JacORB [#{get_config(:jacorb_home)}]")  {|v| CONFIG[:jacorb_home] = v}
         else
           opts.on('--makeprog=name',
-                  "the make program to compile ruby extentions [#{get_config(:makeprog)}]")  {|v| CONFIG[:makeprog] = v}
+                  "the make program to compile ruby extensions [#{get_config(:makeprog)}]")  {|v| CONFIG[:makeprog] = v}
           opts.on('--without-tao',
                   "do *not* configure/build/clean the ACE+TAO libraries [#{get_config('without-tao')}]")  {|v| CONFIG[:'without-tao'] = true }
           opts.on('--aceroot=path',
@@ -431,7 +429,7 @@ module R2CORBA
                   "build with debugger support [#{get_config('with-debug')}]")  {|v| CONFIG[:'with-debug'] = true}
         end
 
-        opts.separator ""
+        opts.separator ''
 
         opts.on('--help', 'Show this help message') { puts opts; puts; exit }
       end.parse!(_argv)
@@ -440,14 +438,14 @@ module R2CORBA
     def self.check
       if defined?(JRUBY_VERSION)
         # check availability of JacORB
-        if get_config('jacorb_home')=='' && File.directory?('jacorb')
+        if get_config('jacorb_home') == '' && File.directory?('jacorb')
           set_config('jacorb_home', File.expand_path('jacorb'))
         end
-        raise "Cannot find JacORB. Missing JACORB_HOME configuration!" if get_config('jacorb_home').empty?
+        raise 'Cannot find JacORB. Missing JACORB_HOME configuration!' if get_config('jacorb_home').empty?
       else
         if Dir[File.join('ext', 'libACE.*')].empty? # Don't check for ACE/TAO installation when executed for binary gem install
 
-          if get_config('without-tao') && !(File.directory?(File.join('ACE','ACE_wrappers')) || File.directory?(File.join('ACE','ACE')))
+          if get_config('without-tao') && !(File.directory?(File.join('ACE', 'ACE_wrappers')) || File.directory?(File.join('ACE', 'ACE')))
 
             # check if a user defined ACE/TAO location is specified or we're using a system standard install
             if get_config('aceroot').empty?
@@ -462,14 +460,14 @@ module R2CORBA
 
           else
             # check availability of ACE/TAO
-            if get_config('aceroot').empty? && (File.directory?(File.join('ACE','ACE_wrappers')) || File.directory?(File.join('ACE','ACE')))
-              set_config('aceroot', File.directory?(File.join('ACE','ACE_wrappers')) ? File.expand_path(File.join('ACE','ACE_wrappers')) : File.expand_path(File.join('ACE','ACE')))
+            if get_config('aceroot').empty? && (File.directory?(File.join('ACE', 'ACE_wrappers')) || File.directory?(File.join('ACE', 'ACE')))
+              set_config('aceroot', File.directory?(File.join('ACE', 'ACE_wrappers')) ? File.expand_path(File.join('ACE', 'ACE_wrappers')) : File.expand_path(File.join('ACE', 'ACE')))
             end
-            if get_config('taoroot').empty? && (File.directory?(File.join(get_config('aceroot'),'TAO')) || File.directory?(File.join('ACE','TAO')))
-              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')))
+            if get_config('taoroot').empty? && (File.directory?(File.join(get_config('aceroot'), 'TAO')) || File.directory?(File.join('ACE', 'TAO')))
+              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')))
             end
-            if get_config('mpcroot').empty? && (File.directory?(File.join(get_config('aceroot'),'MPC')) || File.directory?(File.join('ACE','MPC')))
-              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')))
+            if get_config('mpcroot').empty? && (File.directory?(File.join('ACE', 'MPC')) || File.directory?(File.join(get_config('aceroot'), 'MPC')))
+              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')))
             end
 
             set_config('aceinstdir', get_config('sodir')) if get_config('aceinstdir').empty?
@@ -516,8 +514,8 @@ module R2CORBA
       end
 
       # check availability of RIDL; either as gem or in subdir
-      unless File.exists?(File.join('ridl', 'lib', 'ridl', 'ridl.rb')) || (`gem search -i -q ridl`.strip) == 'true'
-        raise "Missing RIDL installation. R2CORBA requires RIDL installed either as gem or in subdirectory ridl."
+      unless File.exist?(File.join('ridl', 'lib', 'ridl', 'ridl.rb')) || (`gem search -i -q ridl`.strip) == 'true'
+        raise 'Missing RIDL installation. R2CORBA requires RIDL installed either as gem or in subdirectory ridl.'
       end
     end
 
@@ -541,4 +539,4 @@ end
 include R2CORBA::AccessMethods
 
 # load current config (if any)
-R2CORBA::Config.load
+R2CORBA::Config.load

data/rakelib/ext.rake

@@ -8,7 +8,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 if defined?(JRUBY_VERSION)
@@ -43,14 +42,14 @@ else # !JRUBY_VERSION
                                      R2CORBA::Ext.rpoa_mpc_file,
                                      R2CORBA::Ext.rpol_mpc_file] do
     # check availability of PERL
-    raise "PERL missing! A working version of PERL in the PATH is required." unless system('perl -v')
+    raise 'PERL missing! A working version of PERL in the PATH is required.' unless system('perl -v')
     # configure R2TAO build
     _mwc = File.join(get_config('aceroot'), 'bin', 'mwc.pl')
 
     cur_dir = Dir.getwd
     Dir.chdir 'ext'
     begin
-      sh("perl #{_mwc} -type gnuace ext.mwc")
+      sh("perl #{_mwc} -type gnuace ext.mwc -workers #{R2CORBA::Config.cpu_cores}")
     ensure
       Dir.chdir cur_dir
     end
@@ -76,7 +75,7 @@ else # !JRUBY_VERSION
         cur_dir = Dir.getwd
         Dir.chdir 'ext'
         begin
-          sh("#{get_config('makeprog')} realclean") if File.exists?('GNUmakefile')
+          sh("#{get_config('makeprog')} realclean") if File.exist?('GNUmakefile')
         ensure
           Dir.chdir cur_dir
         end
@@ -86,68 +85,11 @@ else # !JRUBY_VERSION
 
   Rake::Task['clobber'].enhance ['r2corba:ext:clobber']
 
-  if R2CORBA::Config.is_win32
-
-    file R2CORBA::Ext.extload_mpc_file do |t|
-      File.open(t.name, 'w') {|f| f.puts R2CORBA::Ext::EXTLOAD_MPC }
-    end
-
-    file R2CORBA::Ext.extload_makefile => [R2CORBA::BUILD_CFG,
-                                           R2CORBA::Ext.default_features_path,
-                                           R2CORBA::Ext.ace_config_path,
-                                           R2CORBA::Ext.platform_macros_path,
-                                           R2CORBA::Ext.extload_mpc_file] do
-      # check availability of PERL
-      raise "PERL missing! A working version of PERL in the PATH is required." unless system('perl -v')
-      # configure extload build
-      _mwc = File.join(get_config('aceroot'), 'bin', 'mwc.pl')
-
-      cur_dir = Dir.getwd
-      Dir.chdir File.join('ext', 'extload')
-      begin
-        sh("perl #{_mwc} -type gnuace")
-      ensure
-        Dir.chdir cur_dir
-      end
-    end
-
-    CLOBBER.include [R2CORBA::Ext.extload_makefile, R2CORBA::Ext.extload_mpc_file]
-
-    namespace :r2corba do
-      namespace :ext do
-        #desc 'Build extension loader'
-        task :build_extload => R2CORBA::Ext.extload_makefile do
-          cur_dir = Dir.getwd
-          Dir.chdir File.join('ext', 'extload')
-          begin
-            sh("#{get_config('makeprog')}#{get_config('with-debug') ? ' debug=1' : ''}")
-          ensure
-            Dir.chdir cur_dir
-          end
-        end
-
-        task :clobber_extload do
-          cur_dir = Dir.getwd
-          Dir.chdir File.join('ext', 'extload')
-          begin
-            sh("#{get_config('makeprog')} realclean") if File.exists?('GNUmakefile')
-          ensure
-            Dir.chdir cur_dir
-          end
-        end
-      end
-    end
-
-    Rake::Task['r2corba:ext:build'].enhance ['r2corba:ext:build_extload']
-    Rake::Task['clobber'].enhance ['r2corba:ext:clobber_extload']
-
-  end
-
   # Do we handle ACE+TAO here?
   unless get_config('without-tao')
 
     file R2CORBA::Ext.ace_config_path => R2CORBA::BUILD_CFG do |t|
-      File.open(t.name, "w") {|f|
+      File.open(t.name, 'w') {|f|
         f.puts R2CORBA::Ext.ace_config
       }
     end
@@ -155,7 +97,7 @@ else # !JRUBY_VERSION
     CLOBBER.include R2CORBA::Ext.ace_config_path
 
     file R2CORBA::Ext.platform_macros_path => R2CORBA::BUILD_CFG do |t|
-      File.open(t.name, "w") {|f|
+      File.open(t.name, 'w') {|f|
         f.puts R2CORBA::Ext.platform_macros
       }
     end
@@ -163,7 +105,7 @@ else # !JRUBY_VERSION
     CLOBBER.include R2CORBA::Ext.platform_macros_path
 
     file R2CORBA::Ext.default_features_path => R2CORBA::BUILD_CFG do |t|
-      File.open(t.name, "w") do |f|
+      File.open(t.name, 'w') do |f|
         f.puts R2CORBA::Ext.default_features
       end
     end
@@ -171,7 +113,7 @@ else # !JRUBY_VERSION
     CLOBBER.include R2CORBA::Ext.default_features_path
 
     file R2CORBA::Ext.tao_mwc_path => R2CORBA::BUILD_CFG do |t|
-      File.open(t.name, "w") do |f|
+      File.open(t.name, 'w') do |f|
         f.puts R2CORBA::Ext.tao_mwc
       end
     end
@@ -183,12 +125,12 @@ else # !JRUBY_VERSION
                                        R2CORBA::Ext.default_features_path,
                                        R2CORBA::Ext.tao_mwc_path]  do
       # check availability of PERL
-      raise "PERL missing! A working version of PERL in the PATH is required." unless system('perl -v')
+      raise 'PERL missing! A working version of PERL in the PATH is required.' unless system('perl -v')
       # generate ACE+TAO makefile
       cur_dir = Dir.getwd
       Dir.chdir File.expand_path(get_config('aceroot'))
       begin
-        sh("perl bin/mwc.pl -type gnuautobuild TAO4Ruby.mwc")
+        sh("perl bin/mwc.pl -type gnuautobuild TAO4Ruby.mwc -workers #{R2CORBA::Config.cpu_cores}")
       ensure
         Dir.chdir cur_dir
       end
@@ -206,11 +148,7 @@ else # !JRUBY_VERSION
             cur_dir = Dir.getwd
             Dir.chdir File.expand_path(get_config('aceroot'))
             begin
-              if R2CORBA::Config.is_linux && R2CORBA::Config::linux_distro != :ubuntu && R2CORBA::Config.cpu_cores > 2
-                sh("#{get_config('makeprog')} -j#{R2CORBA::Config.cpu_cores - 2} #{get_config('with-debug') ? ' debug=1' : ''}")
-              else
-                sh("#{get_config('makeprog')}#{get_config('with-debug') ? ' debug=1' : ''}")
-              end
+              sh("#{get_config('makeprog')} -j#{R2CORBA::Config.cpu_cores} #{get_config('with-debug') ? ' debug=1' : ''}")
             ensure
               Dir.chdir cur_dir
             end
@@ -224,11 +162,14 @@ else # !JRUBY_VERSION
         task :clobber_tao do
           # clean ACE+TAO
           cur_dir = Dir.getwd
-          Dir.chdir File.expand_path(get_config('aceroot'))
-          begin
-            sh("#{get_config('makeprog')} realclean") if File.exists?('GNUmakefile')
-          ensure
-            Dir.chdir cur_dir
+          ace_root = File.expand_path(get_config('aceroot'))
+          if File.exist?(ace_root)
+            Dir.chdir ace_root
+            begin
+              sh("#{get_config('makeprog')} realclean") if File.exist?('GNUmakefile')
+            ensure
+              Dir.chdir cur_dir
+            end
           end
         end
       end