r2corba 1.5.1 → 1.5.2

data/lib/corba/svcs/ins/ins.rb

@@ -8,7 +8,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 require 'corba/svcs/ins/naming_service'
@@ -16,10 +15,10 @@ require 'optparse'
 
 module R2CORBA
   module INS
-    INS_VERSION_MAJOR = 0.freeze
-    INS_VERSION_MINOR = 1.freeze
-    INS_VERSION_RELEASE = 1.freeze
-    INS_COPYRIGHT = 'Copyright (c) 2011-2013 Remedy IT Expertise BV, The Netherlands'.freeze
+    INS_VERSION_MAJOR = 0
+    INS_VERSION_MINOR = 1
+    INS_VERSION_RELEASE = 1
+    INS_COPYRIGHT = "Copyright (c) 2011-#{Time.now.year} Remedy IT Expertise BV, The Netherlands".freeze
 
     IS_WIN32 = (RUBY_PLATFORM =~ /win32/ || RUBY_PLATFORM =~ /mingw32/ || ENV['OS'] =~ /windows/i) ? true : false
     IS_JRUBY = defined?(JRUBY_VERSION)
@@ -136,7 +135,7 @@ module R2CORBA
         end
 
         def pidfile_exists?
-          File.exists?(self.pidfile)
+          File.exist?(self.pidfile)
         end
 
         def check_pidfile
@@ -327,7 +326,7 @@ module R2CORBA
         end
 
         def pidfile_exists?
-          File.exists?(self.pidfile)
+          File.exist?(self.pidfile)
         end
 
         def check_pidfile

data/lib/corba/svcs/ins/naming_service.rb

@@ -8,7 +8,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 require 'corba'
@@ -28,7 +27,7 @@ module R2CORBA
 
       def initialize(options = {})
         @options = OPTIONS.merge(options)
-        raise RuntimeError, 'nr. of threads must >= 1' if @options[:threads] < 1
+        raise 'nr. of threads must >= 1' if @options[:threads] < 1
       end
 
       def setup

data/lib/ridlbe/ruby/config.rb

@@ -8,7 +8,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 module IDL
@@ -298,8 +297,7 @@ module IDL
             ret = ret[0,1].downcase + ret[1,ret.size].to_s
             ret = 'r_'+ret if IDL::Ruby::LeafMixin::RESERVED_RUBY_MEMBER.include?(ret)
           else
-            raise RuntimeError,
-              "invalid nametype for #{self.class}: #{self::NAMETYPE}"
+            raise "invalid nametype for #{self.class}: #{self::NAMETYPE}"
           end
           ret
         end

data/lib/ridlbe/ruby/require.rb

@@ -8,7 +8,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 (Dir.glob(File.join(File.dirname(__FILE__), '*.rb')) - [__FILE__]).each do |f|

data/lib/ridlbe/ruby/walker.rb

@@ -8,7 +8,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 module IDL
   class RubyWriterBase
@@ -55,10 +54,9 @@ module IDL
 #
 # ****  Code generated by the R2CORBA IDL Compiler ****
 # R2CORBA has been developed by:
-#        Remedy IT
-#        Nijkerk, GLD
+#        Remedy IT Expertise BV
 #        The Netherlands
-#        http://www.remedy.nl \ http://www.theaceorb.nl
+#        https://www.remedy.nl
 #
 })
       println("require 'corba'") if @params[:libinit]
@@ -740,7 +738,7 @@ module IDL
         end
 
       else
-        raise RuntimeError, "invalid type for (un)marshalling: #{_type.typename}"
+        raise "invalid type for (un)marshalling: #{_type.typename}"
       end
     end
 
@@ -764,7 +762,7 @@ module IDL
       when Expression::ScopedName, Expression::Enumerator
         exp.node.scoped_rubyname
       else
-        raise RuntimeError, "unknown expression type: #{exp.class.name}"
+        raise "unknown expression type: #{exp.class.name}"
       end
     end
 
@@ -821,7 +819,7 @@ module IDL
       when Type::ScopedName
         s = value_to_s(Expression::Value.new(exp.idltype.node.idltype, v))
       else
-        raise RuntimeError, "#{exp.typename}'s not been supported yet."
+        raise "#{exp.typename}'s not been supported yet."
       end
       s
     end
@@ -855,7 +853,7 @@ module IDL
       when Expression::Operation::Mod
         s = expression_to_s(op[0]) + " % " + expression_to_s(op[1])
       else
-        raise RuntimeError, "unknown operation: #{exp.type.name}"
+        raise "unknown operation: #{exp.type.name}"
       end
       "(" + s + ")"
     end
@@ -1096,8 +1094,11 @@ module IDL
         }
         printiln(format("end # typedef %s", node.rubyname))
 
+      when IDL::Type::Object
+        printiln(format("%s = CORBA::Object # typedef %s\n", node.rubyname, node.rubyname))
+
       else
-        raise RuntimeError, "unsupported typedef for #{t.class.name}."
+        raise "unsupported typedef for #{t.class.name}."
       end
     end
   end ## RubyStubWriter
@@ -1114,10 +1115,9 @@ module IDL
 #
 # ****  Code generated by the R2CORBA IDL Compiler ****
 # R2CORBA has been developed by:
-#        Remedy IT
-#        Nijkerk, GLD
+#        Remedy IT Expertise BV
 #        The Netherlands
-#        http://www.remedy.nl \ http://www.theaceorb.nl
+#        https://www.remedy.nl
 #
 })
       idleval = @params[:idl_eval] || false
@@ -1457,7 +1457,7 @@ module IDL
         end
 
       else
-        raise RuntimeError, "invalid type for (un)marshalling: #{_type.typename}"
+        raise "invalid type for (un)marshalling: #{_type.typename}"
       end
     end
 
@@ -1481,7 +1481,7 @@ module IDL
       when Expression::ScopedName
         @stub_root + exp.node.scoped_rubyname
       else
-        raise RuntimeError, "unknown expression type: #{exp.class.name}"
+        raise "unknown expression type: #{exp.class.name}"
       end
     end
 
@@ -1511,7 +1511,7 @@ module IDL
       when Type::ScopedName
         s = value_to_s(Expression::Value.new(exp.idltype.node.idltype, v))
       else
-        raise RuntimeError, "#{exp.typename}'s not been supported yet."
+        raise "#{exp.typename}'s not been supported yet."
       end
       s
     end
@@ -1545,7 +1545,7 @@ module IDL
       when Expression::Mod
         s = expression_to_s(op[0]) + " % " + expression_to_s(op[1])
       else
-        raise RuntimeError, "unknown operation: #{exp.type.name}"
+        raise "unknown operation: #{exp.type.name}"
       end
       "(" + s + ")"
     end

data/mkrf_conf_srcgem.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
 #--------------------------------------------------------------------
 
 task :default => 'r2corba:gem:srcbuild'
@@ -40,7 +38,7 @@ Make sure you have provided a JACORB_HOME definition pointing at a valid JacORB
 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
 'gem install' command.
-Checkout the documentation at http://osportal.remedy.nl/projects/r2corba
+Checkout the documentation at https://github.com/RemedyIT/r2corba
 for more information.
 __EOT
 
@@ -95,12 +93,12 @@ else
   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
-variabled OR by providing the --aceroot and (optionally) --taoroot and --mpcroot build flags to
+variable OR by providing the --aceroot and (optionally) --taoroot and --mpcroot build flags to
 the 'gem install' command.
 Alternatively you can have the r2corba gem install the taosource gem for you and use that for
 the ACE/TAO build environment by *not* providing the --without-taogem build flag to the 'gem install'
 command.
-Checkout the documentation at http://osportal.remedy.nl/projects/r2corba for more information.
+Checkout the documentation at https://github.com/RemedyIT/r2corba for more information.
 __EOT
 
   install_taosource_gem = true
@@ -140,7 +138,7 @@ __EOT
     end
     inst = Gem::DependencyInstaller.new
     begin
-      inst.install "taosource", ">= 6.1.8"
+      inst.install "taosource", ">= 6.5.7"
     rescue
       $stderr.puts 'Failed to install taosource gem.'
       exit(1)

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,7 +42,7 @@ 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)
         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')
@@ -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')
@@ -33,17 +32,18 @@ task :build => 'r2corba:build'
 ## compile base IDL
 
 r2c_idlc_root = File.join('lib','corba','idl')
+stdidl_root = File.join('lib', 'idl')
 
 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|
   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
@@ -56,7 +56,7 @@ CLOBBER.include File.join(r2c_idlc_root,'r2c_orb.rb')
 ].each do |stub, pidl|
   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')]
@@ -69,7 +69,7 @@ unless defined?(JRUBY_VERSION)
   [ 'TAO_Ext', 'IORTable' ].each do |stub|
     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}" <<
+      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
@@ -80,7 +80,7 @@ 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')]

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'
@@ -233,9 +232,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
@@ -349,7 +348,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 +401,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 +409,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',
@@ -516,7 +515,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

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
@@ -130,7 +129,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 +187,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
@@ -207,7 +206,7 @@ else # !JRUBY_VERSION
             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' : ''}")
+                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
@@ -224,11 +223,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