r2corba 1.5.1-x64-mingw32 → 1.5.5-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)

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" <<
+  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')
@@ -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'
@@ -213,11 +212,10 @@ module R2CORBA
 
     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'),
@@ -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',
@@ -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?
       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(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')))
             end
 
             set_config('aceinstdir', get_config('sodir')) if get_config('aceinstdir').empty?
@@ -516,7 +514,7 @@ 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'
+      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)
@@ -50,7 +49,7 @@ else # !JRUBY_VERSION
     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
@@ -105,7 +104,7 @@ else # !JRUBY_VERSION
       cur_dir = Dir.getwd
       Dir.chdir File.join('ext', 'extload')
       begin
-        sh("perl #{_mwc} -type gnuace")
+        sh("perl #{_mwc} -type gnuace -workers #{R2CORBA::Config.cpu_cores}")
       ensure
         Dir.chdir cur_dir
       end
@@ -120,6 +119,8 @@ else # !JRUBY_VERSION
           cur_dir = Dir.getwd
           Dir.chdir File.join('ext', 'extload')
           begin
+            # check availability of make program
+            raise "#{get_config('makeprog')} missing! A working version of #{get_config('makeprog')} in the PATH is required." unless system("#{get_config('makeprog')}")
             sh("#{get_config('makeprog')}#{get_config('with-debug') ? ' debug=1' : ''}")
           ensure
             Dir.chdir cur_dir
@@ -130,7 +131,7 @@ else # !JRUBY_VERSION
           cur_dir = Dir.getwd
           Dir.chdir File.join('ext', 'extload')
           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
@@ -188,7 +189,7 @@ else # !JRUBY_VERSION
       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 +207,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 +221,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

data/rakelib/ext.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')
@@ -17,7 +16,7 @@ require File.join(File.dirname(__FILE__), 'ext_r2tao.rb')
 module R2CORBA
 
   module Ext
-    ACE_FILES  = [
+    ACE_FILES = [
         'ACE',
         'TAO',
         'TAO_TypeCodeFactory',
@@ -58,7 +57,7 @@ module R2CORBA
         sysdlls = []
         except_dll = R2CORBA::Config.is_win64 ? 'libgcc_s_seh-1.dll' : 'libgcc_s_dw2-1.dll'
         ENV['PATH'].split(';').each do |p|
-          if File.exists?(File.join(p, except_dll)) && File.exists?(File.join(p, 'libstdc++-6.dll'))
+          if File.exist?(File.join(p, except_dll)) && File.exist?(File.join(p, 'libstdc++-6.dll'))
             sysdlls << File.join(p, except_dll)
             sysdlls << File.join(p, 'libstdc++-6.dll')
             break
@@ -83,35 +82,6 @@ module R2CORBA
       ACE_FILES.collect { |fn| File.join(libdir, "lib#{fn}#{so_ext_}") }
     end
 
-    @@osx_name = nil
-    if RUBY_PLATFORM =~ /darwin/
-      osx_ver_major, osx_ver_minor = (`uname -r`).strip.split('.')[0,2].collect {|n| n.to_i }
-      if osx_ver_major == 10
-        @@osx_name = case osx_ver_minor
-                       when 3
-                         'panther'
-                       when 4
-                         'tiger'
-                       when 5
-                         'leopard'
-                       when 6
-                         'snowleopard'
-                       when 7
-                         'lion'
-                       when 8
-                         'mountainlion'
-                       when 9
-                         'mavericks'
-                       when 10
-                         'yosemite'
-                     end
-      end
-      platform_error unless @@osx_name
-    end
-    def self.osx_name
-      @@osx_name
-    end
-
     def self.ace_config
       case RUBY_PLATFORM
         when /mingw32/
@@ -121,7 +91,6 @@ module R2CORBA
 }
         when /linux/
           %Q{
-#define ACE_HAS_GETIFADDRS
 #include "ace/config-linux.h"
 }
         when /sparc-solaris/
@@ -132,8 +101,7 @@ module R2CORBA
 }
         when /darwin/
           %Q{
-#define ACE_HAS_GETIFADDRS
-#include "ace/config-macosx-#{osx_name}.h"
+#include "ace/config-macosx.h"
 }
         else
           platform_error
@@ -154,19 +122,15 @@ debug=#{get_config('with-debug') ? 1 : 0}
 fl_reactor=0
 tk_reactor=0
 boost=0
-no_strict_aliasing=1
+inline=0
 include $(ACE_ROOT)/include/makeinclude/platform_mingw32.GNU
       }
         when /linux/
           %Q{
 versioned_so=1
-threads=1
 ssl=#{get_config('with-ssl') ? 1 : 0}
 optimize=1
 debug=#{get_config('with-debug') ? 1 : 0}
-fl_reactor=0
-tk_reactor=0
-boost=0
 include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU
 LDFLAGS += -Wl,-rpath,#{get_config('aceinstdir')}
       }
@@ -180,7 +144,7 @@ debug=#{get_config('with-debug') ? 1 : 0}
 fl_reactor=0
 tk_reactor=0
 no_hidden_visibility=1
-#{ /^cc/i =~ RB_CONFIG['CC'] ? 'include $(ACE_ROOT)/include/makeinclude/platform_sunos5_sunc++.GNU' :  'include $(ACE_ROOT)/include/makeinclude/platform_sunos5_g++.GNU' }
+#{ /^cc/i =~ RB_CONFIG['CC'] ? 'include $(ACE_ROOT)/include/makeinclude/platform_sunos5_sunc++.GNU' : 'include $(ACE_ROOT)/include/makeinclude/platform_sunos5_g++.GNU' }
 LDFLAGS += #{RB_CONFIG['SOLIBS']} #{ /^cc/i =~ RB_CONFIG['CC'] ? '-lCrun -lCstd' : ''}
       }
         when /darwin/
@@ -192,7 +156,7 @@ debug=#{get_config('with-debug') ? 1 : 0}
 fl_reactor=0
 tk_reactor=0
 boost=0
-include $(ACE_ROOT)/include/makeinclude/platform_macosx_#{osx_name}.GNU
+include $(ACE_ROOT)/include/makeinclude/platform_macosx.GNU
 LDFLAGS += -Wl,-headerpad_max_install_names
 FLAGS_C_CC += #{RB_CONFIG['ARCH_FLAG']}
 LDFLAGS    += #{RB_CONFIG['ARCH_FLAG']}
@@ -210,7 +174,7 @@ workspace {
   $(TAO_ROOT)/TAO_IDL
   $(TAO_ROOT)/tao
   #{get_config('with-ssl') ? '$(TAO_ROOT)/orbsvcs/orbsvcs/Security.mpc' : ''}
-             #{get_config('with-ssl') ? '$(TAO_ROOT)/orbsvcs/orbsvcs/SSLIOP.mpc' : ''}
+  #{get_config('with-ssl') ? '$(TAO_ROOT)/orbsvcs/orbsvcs/SSLIOP.mpc' : ''}
   exclude {
     bin
     docs
@@ -237,8 +201,6 @@ workspace {
 
     def self.default_features
       %Q{
-fl_reactor=0
-tk_reactor=1
 qos=0
 ssl=#{get_config('with-ssl') ? 1 : 0}
 ipv6=#{get_config('with-ipv6') ? 1 : 0}
@@ -246,23 +208,23 @@ ipv6=#{get_config('with-ipv6') ? 1 : 0}
     end
 
     def self.ace_config_path
-      File.join(get_config('aceroot'),'ace','config.h')
+      File.join(get_config('aceroot'), 'ace', 'config.h')
     end
 
     def self.platform_macros_path
-      File.join(get_config('aceroot'),'include','makeinclude','platform_macros.GNU')
+      File.join(get_config('aceroot'), 'include', 'makeinclude', 'platform_macros.GNU')
     end
 
     def self.default_features_path
-      File.join(get_config('aceroot'),'bin','MakeProjectCreator','config','default.features')
+      File.join(get_config('aceroot'), 'bin', 'MakeProjectCreator', 'config', 'default.features')
     end
 
     def self.tao_mwc_path
-      File.join(get_config('aceroot'),'TAO4Ruby.mwc')
+      File.join(get_config('aceroot'), 'TAO4Ruby.mwc')
     end
 
     def self.tao_makefile
-      File.join(get_config('aceroot'),'GNUmakefile')
+      File.join(get_config('aceroot'), 'GNUmakefile')
     end
 
     def self.ext_makefile
@@ -277,12 +239,12 @@ ipv6=#{get_config('with-ipv6') ? 1 : 0}
           so_ext = '.dylib'
 
           inst_extlibs = Dir.glob(File.join('ext', '*.bundle'))
-          inst_dylibs = inst_extlibs + ACE_FILES.collect {|dep| File.join(get_config('aceroot'),'lib', 'lib'+dep+so_ext)}
+          inst_dylibs = inst_extlibs + ACE_FILES.collect {|dep| File.join(get_config('aceroot'), 'lib', 'lib' + dep + so_ext)}
           # cross dependencies of ext dynamic libs on each other
           # make sure they refer to *.bundle NOT *.dylib
           inst_extlibs.each do |extlib|
             inst_extlibs.each do |dep|
-              dep_org = File.basename(dep, '.bundle')+so_ext
+              dep_org = File.basename(dep, '.bundle') + so_ext
               sh("install_name_tool -change #{dep_org} @rpath/#{File.basename(dep)} #{extlib}")
             end
             # add install directory as rpath; first delete rpath ignoring errors, next add the rpath
@@ -292,7 +254,7 @@ ipv6=#{get_config('with-ipv6') ? 1 : 0}
           # dependencies on ACE+TAO libs
           inst_dylibs.each do |dylib|
             ACE_FILES.each do |dep|
-              command("install_name_tool -change lib#{dep+so_ext} @rpath/lib#{dep+so_ext} #{dylib}")
+              command("install_name_tool -change lib#{dep + so_ext} @rpath/lib#{dep + so_ext} #{dylib}")
             end
             # add current dir and install dir as rpath entries; first delete rpath ignoring errors, next add the rpath
             sh("install_name_tool -delete_rpath . #{dylib} >/dev/null 2>&1")
@@ -303,8 +265,8 @@ ipv6=#{get_config('with-ipv6') ? 1 : 0}
         elsif !is_win32
           # create unversioned ACE+TAO lib symlinks
 
-          ACE_FILES.collect {|dep| File.join(get_config('aceroot'),'lib', 'lib'+dep+'.so')}.each do |lib|
-            Dir.glob(lib+'.*').each {|verlib| File.symlink(verlib, lib) unless File.exists?(lib)}
+          ACE_FILES.collect {|dep| File.join(get_config('aceroot'), 'lib', 'lib' + dep + '.so')}.each do |lib|
+            Dir.glob(lib + '.*').each {|verlib| File.symlink(verlib, lib) unless File.exist?(lib)}
           end
         end
       end
@@ -313,4 +275,3 @@ ipv6=#{get_config('with-ipv6') ? 1 : 0}
   end # Ext
 
 end # R2CORBA
-