r2corba 1.5.2 → 1.6.0

data/mkrf_conf_srcgem.rb

@@ -33,7 +33,7 @@ require 'optparse'
 
 if defined?(JRUBY_VERSION)
 
-  usage_text =<<-__EOT
+  usage_text = <<-__EOT
 Make sure you have provided a JACORB_HOME definition pointing at a valid JacORB installation
 with all required .jar files located at JACORB_HOME\lib. You can do this either by setting
 the JACORB_HOME environment variable or by providing the --jacorb-home buildflag to the
@@ -51,13 +51,13 @@ __EOT
 
   # check for proper JacORB installation
   if jacorb_home
-    jar_files = Dir.glob(File.join(jacorb_home, 'lib', 'jacorb.jar'))+
+    jar_files = Dir.glob(File.join(jacorb_home, 'lib', 'jacorb.jar')) +
                 Dir.glob(File.join(jacorb_home, 'lib', 'jacorb-services.jar')) +
                 Dir.glob(File.join(jacorb_home, 'lib', 'slf4j*.jar')) +
                 Dir.glob(File.join(jacorb_home, 'lib', 'antlr*.jar'))
     if jar_files.size == 5
       # run configure with appropriate settings
-      puts "Valid JacORB installation found.\n"+
+      puts "Valid JacORB installation found.\n" +
            "Running 'ruby -S rake -- configure --without-jacorb --jacorb-home=#{jacorb_home}'"
       unless system("ruby -S rake -- configure --without-jacorb --jacorb-home=#{jacorb_home}")
         puts 'Failed to configure R2CORBA'
@@ -82,7 +82,7 @@ else
     RB_CONFIG = ::Config
   end unless defined? RB_CONFIG
   RB_CONFIG::MAKEFILE_CONFIG['TRY_LINK'] = "$(CXX) #{RB_CONFIG::MAKEFILE_CONFIG['OUTFLAG']}conftest#{$EXEEXT} $(INCFLAGS) $(CPPFLAGS) " \
-      "$(CFLAGS) $(src) $(LIBPATH) $(LDFLAGS) $(ARCH_FLAG) $(LOCAL_LIBS) $(LIBS)"
+      '$(CFLAGS) $(src) $(LIBPATH) $(LDFLAGS) $(ARCH_FLAG) $(LOCAL_LIBS) $(LIBS)'
   require 'mkmf'
   if defined?(MakeMakefile)
     MakeMakefile::COMMON_HEADERS.clear
@@ -90,7 +90,7 @@ else
     COMMON_HEADERS.slice!(/./)
   end
 
-  usage_txt =<<-__EOT
+  usage_txt = <<-__EOT
 Please define a valid ACE/TAO build environment either by defining the ACE_ROOT and (optionally)
 the TAO_ROOT (defaults to ACE_ROOT/TAO) and MPC_ROOT (defaults to ACE_ROOT/MPC) environment
 variable OR by providing the --aceroot and (optionally) --taoroot and --mpcroot build flags to
@@ -138,7 +138,7 @@ __EOT
     end
     inst = Gem::DependencyInstaller.new
     begin
-      inst.install "taosource", ">= 6.5.7"
+      inst.install 'taosource', '>= 7.0.0'
     rescue
       $stderr.puts 'Failed to install taosource gem.'
       exit(1)

data/rakelib/bin.rake

@@ -44,7 +44,7 @@ namespace :r2corba do
       R2CORBA::Bin.binaries.each do |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

@@ -18,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
 #---------------------------------
@@ -86,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
 #---------------------------------
@@ -98,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
 #---------------------------------

data/rakelib/build.rake

@@ -31,50 +31,50 @@ 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} --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 --include=#{stdidl_root}" <<
-         " --stubs-only --expand-includes --search-includepath --no-libinit --interface-as-class=TypeCode orb.idl"
+         ' --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 --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 --include=#{stdidl_root} --stubs-only --expand-includes -I#{tao_root}" <<
-          " --search-includepath --no-libinit #{File.join(r2c_idlc_root, stub+'.pidl')}"
+          " --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
 
@@ -83,5 +83,5 @@ file File.join(r2c_idlc_root, 'CosNamingC.rb') => [R2CORBA::BUILD_CFG, orb_pidlc
   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

@@ -29,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

data/rakelib/config.rb

@@ -86,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')
@@ -212,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
@@ -224,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
@@ -273,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
@@ -310,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
@@ -368,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))}
@@ -430,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)
@@ -439,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?
@@ -461,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,7 +515,7 @@ module R2CORBA
 
       # check availability of RIDL; either as gem or in subdir
       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."
+        raise 'Missing RIDL installation. R2CORBA requires RIDL installed either as gem or in subdirectory ridl.'
       end
     end
 
@@ -540,4 +539,4 @@ end
 include R2CORBA::AccessMethods
 
 # load current config (if any)
-R2CORBA::Config.load
+R2CORBA::Config.load

data/rakelib/ext.rake

@@ -42,7 +42,7 @@ 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')
 
@@ -85,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 -workers #{R2CORBA::Config.cpu_cores}")
-      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.exist?('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
@@ -154,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
@@ -162,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
@@ -170,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
@@ -182,7 +125,7 @@ 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'))
@@ -205,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} #{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

data/rakelib/ext.rb

@@ -16,7 +16,7 @@ require File.join(File.dirname(__FILE__), 'ext_r2tao.rb')
 module R2CORBA
 
   module Ext
-    ACE_FILES  = [
+    ACE_FILES = [
         'ACE',
         'TAO',
         'TAO_TypeCodeFactory',
@@ -122,6 +122,7 @@ debug=#{get_config('with-debug') ? 1 : 0}
 fl_reactor=0
 tk_reactor=0
 boost=0
+inline=0
 include $(ACE_ROOT)/include/makeinclude/platform_mingw32.GNU
       }
         when /linux/
@@ -143,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/
@@ -207,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
@@ -238,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
@@ -253,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")
@@ -264,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.exist?(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
@@ -274,4 +275,3 @@ ipv6=#{get_config('with-ipv6') ? 1 : 0}
   end # Ext
 
 end # R2CORBA
-