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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 102b046c5ccb6cf6c5944ddd330c66e1d5cc9438
-  data.tar.gz: 0ea92713bdc85e1b0ef27fa732c59179ead5aadb
+  metadata.gz: da0ab40365d511197a182ffb45d25ad3f0071e27
+  data.tar.gz: 5dddb23478cecbbcf66c5c62c52c2725f5eb65cd
 SHA512:
-  metadata.gz: adcc79a00c09e53c879b5c03b1f1373e42761881cd0e14a391cfb6ffb1f2d32a9fa062253f3f5613e8159f2641b073c8ee44837915db0953a05d6b0671133595
-  data.tar.gz: 747010bb10b3fa7095f59e356f3f8e4ee15beec28a80508e8b13ac3d150b353486648bafff5dae112290adb04ce2af55d41e3eaa876ace40a0b6c2247c9d00d9
+  metadata.gz: 36c743bcadf84b12256bbec379b940a26e971db8b9590c5b3c7ffbc9928701e7515fe6378f9858a0c946cde851940e2daca5d99323c41df798d890f1115339a3
+  data.tar.gz: 1ab90e278383fb4830b651559135a2463f5d190d49fe83c633f2c4de9865ea0f4727f26b52f4736f2da8ed3301a04e7a88cb980252334a6c6f3e7c4a1e855ceb

data/CHANGES

@@ -1,5 +1,19 @@
 
-Current version: 1.4.1
+Current version: 1.5.1
+
+Changes since version 1.4.1:
+
+o   Added support for MRI Ruby 2.1.x & 2.2.x (32 & 64 bits)
+
+o   Added support for TAO <= 2.3.1
+
+o   Added support for JRuby <= 1.7.19
+
+o   Added support for JacORB <= 3.5
+
+o   Upgraded RIDL frontend to 2.5.5
+
+o   Officially drop MRI Ruby < 1.9 support
 
 Changes since version 1.3.1:
 

data/THANKS

@@ -49,4 +49,6 @@ Our thanks go to:
   
 * Grant Birchmeier for reporting the RIDL logger bug (triggered
   by an unknown pragma)
- 
+
+* Andrey Mramornov for reporting and testing the R2CORBA build
+  problems on Ubuntu.

data/bin/r2corba

@@ -1,4 +1,4 @@
-#!C:\msys\1.0\bin\env.EXE ruby
+#!/bin/ruby
 #---------------------------------
 # This file is generated
 #---------------------------------

data/bin/ridlc

@@ -1,4 +1,4 @@
-#!C:\msys\1.0\bin\env.EXE ruby
+#!/bin/ruby
 #---------------------------------
 # This file is generated
 #---------------------------------

data/bin/rins

@@ -1,4 +1,4 @@
-#!C:\msys\1.0\bin\env.EXE ruby
+#!/bin/ruby
 #---------------------------------
 # This file is generated
 #---------------------------------

data/lib/corba/cbase/ORB.rb

@@ -17,6 +17,13 @@ module R2CORBA
 
     module ORB
 
+      class << self
+        protected
+        def _singleton_orb_init
+          CORBA::Native::ORB.init
+        end
+      end
+
       @@_default_args = []
       unless R2CORBA::TAO::RUBY_THREAD_SUPPORT
         # to prevent problems with "green threads" model of Ruby <=1.8.x run TAO
@@ -28,7 +35,7 @@ module R2CORBA
         ## init() or init(arg1, arg2, arg3[, ...]) or init(orb_id, prop = {}) or init(argv, orb_id, prop={}) or init(argv, prop={})
       def self.init(*args)
         n_orb = if args.empty? && @@_default_args.empty?
-          @@cached_orb = CORBA::Native::ORB.init
+          _singleton_orb_init
         else
           argv = []
           orb_id = nil
@@ -192,7 +199,6 @@ module R2CORBA
          15, # TERM
          17, # CHLD
          18, # CONT
-         19, # STOP
          23, # URG
          30, # PWR
          31  # SYS

data/lib/corba/common/ORB.rb

@@ -42,7 +42,7 @@ module R2CORBA
       @@cached_orb = nil
 
       def self._orb
-        @@cached_orb || CORBA::Native::ORB.init
+        @@cached_orb || _singleton_orb_init
       end
 
       def ==(other)

data/lib/corba/common/Object.rb

@@ -187,7 +187,7 @@ module R2CORBA
       def _get_orb()
         raise CORBA::INV_OBJREF.new if self._is_nil?()
         begin
-          CORBA::ORB._wrap_native(self.objref_._orb)
+          CORBA::ORB._wrap_native(self.objref_._get_orb)
         rescue ::NativeException
           CORBA::Exception.native2r($!)
         end

data/lib/corba/common/version.rb

@@ -14,7 +14,7 @@
 module R2CORBA
 
   R2CORBA_MAJOR = 1.freeze
-  R2CORBA_MINOR = 4.freeze
+  R2CORBA_MINOR = 5.freeze
   R2CORBA_RELEASE = '1'.freeze
 
   R2CORBA_VERSION = "#{R2CORBA_MAJOR}.#{R2CORBA_MINOR}.#{R2CORBA_RELEASE}".freeze

data/lib/corba/jbase/ORB.rb

@@ -16,10 +16,23 @@ module R2CORBA
 
     module ORB
 
+      class << self
+        protected
+        def _singleton_orb_init
+          begin
+            CORBA::Native::ORB.init
+          rescue ArgumentError
+            # this will happen if java.endorsed.dirs is used with JacORB
+            # in that case just directly init on the singleton class itself
+            CORBA::Native::ORBSingleton.init
+          end
+        end
+      end
+
       ## init() or init(arg1, arg2[, ...]) or init(orb_id, prop = {}) or init(argv, orb_id, prop={}) or init(argv, prop={})
       def self.init(*args)
         n_orb = if args.empty?
-          CORBA::Native::ORB.init
+          _singleton_orb_init
         else
           argv = []
           orb_id = nil

data/lib/corba/jbase/Object.rb

@@ -42,22 +42,23 @@ module R2CORBA
         ## if this object ref has already been narrowed
         return self._interface_repository_id if self.respond_to?(:_interface_repository_id)
         ## ask the remote side
-        ## have to do this ourselves since JacORB does not support this method
-        ## and we can't use #invoke since this should work without narrowing
+        ## have to do this ourselves since JacORB only resolves this locally (never calling remote)
         req = self._request('_repository_id')
         req.set_return_type(CORBA._tc_string)
         return req.invoke
       end
 
-      #ret ::CORBA::Object
-      def _get_component()
-        raise CORBA::INV_OBJREF.new if self._is_nil?()
-        ## ask the remote side
-        ## have to do this ourselves since JacORB does not support this method
-        ## and we can't use #invoke since this should work without narrowing
-        req = self._request('_component')
-        req.set_return_type(CORBA._tc_Object)
-        return req.invoke
+      unless CORBA::Native::Portable::ObjectImpl.public_instance_methods.include?(:_get_component)
+        #ret ::CORBA::Object
+        def _get_component()
+          raise CORBA::INV_OBJREF.new if self._is_nil?()
+          ## ask the remote side
+          ## have to do this ourselves since JacORB does not support this remote method on Object
+          ## and we can't use #invoke since this should work without narrowing
+          req = self._request('_component')
+          req.set_return_type(CORBA._tc_Object)
+          return req.invoke
+        end
       end
 
       #def PolicyType policy_type

data/lib/corba/jbase/Servant.rb

@@ -66,7 +66,7 @@ module R2CORBA
                 rsrvreq.describe({:arg_list => [], :result_type => CORBA._tc_Object})
                 rc = self._get_component(*rsrvreq.arguments)
                 jany = rsrvreq.orb_.create_any()
-                jany.insert_Object(rc.objref_)
+                jany.insert_Object(rc)
                 jsrvreq.set_result(jany)
               else
                 @rsrv.is_a?(PortableServer::DynamicImplementation) ? self.invoke_DSI(rsrvreq) : self.invoke_SI(rsrvreq)
@@ -156,7 +156,8 @@ module R2CORBA
           if @rsrv.nil?
             return nil
           elsif @rsrv.respond_to?(:_get_component)
-            return @rsrv._get_component
+            obj = @rsrv._get_component
+            return obj ? obj.objref_ : nil
           else
             return super
           end

data/lib/corba/jbase/require.rb

@@ -14,18 +14,21 @@ require 'rbconfig'
 require 'java'
 
 module R2CORBA
-  if ENV['JACORB_HOME'] && File.exists?(File.join(ENV['JACORB_HOME'], 'lib', 'jacorb.jar'))
+  if ENV['JACORB_HOME'] &&
+      (File.exists?(File.join(ENV['JACORB_HOME'], 'lib', 'jacorb.jar')) ||
+       Dir[File.join(ENV['JACORB_HOME'], 'lib', 'jacorb-*.jar')].any? {|p| p =~ /\/jacorb\-\d\.\d\.jar\Z/})
     JACORB_HOME = ENV['JACORB_HOME']
   else
     # find jacorb.jar in library search path
-    JACORB_HOME = File.dirname(($:.find { |path| File.exists?(File.join(path, 'jacorb.jar')) }).to_s)
+    JACORB_HOME = File.dirname(($:.find { |path| Dir[File.join(path, 'jacorb-*.jar')].any? {|p| p =~ /\/jacorb(\.jar|\-\d\.\d\.jar)\Z/} }).to_s)
   end
 
   $LOAD_PATH << File.join(JACORB_HOME, 'lib')
   module JavaLang
     include_package 'java.lang'
-    prop = System.getProperties['java.endorsed.dirs']
-    System.setProperty('java.endorsed.dirs', "#{File.join(R2CORBA::JACORB_HOME, 'lib')}:#{prop}")
+    ## Only works if passed as Java commandline arg
+    # prop = System.getProperties['java.endorsed.dirs']
+    # System.setProperty('java.endorsed.dirs', "#{File.join(R2CORBA::JACORB_HOME, 'lib')}:#{prop}")
     System.setProperty('jacorb.home', "#{R2CORBA::JACORB_HOME}")
     System.setProperty('org.omg.CORBA.ORBClass', 'org.jacorb.orb.ORB')
     System.setProperty('org.omg.CORBA.ORBSingletonClass', 'org.jacorb.orb.ORBSingleton')

data/lib/ridlbe/ruby/config.rb

@@ -82,12 +82,12 @@ module IDL
   end # module RIDL
 
   module Ruby
-    COPYRIGHT = 'Copyright (c) 2007-2013 Remedy IT Expertise BV, The Netherlands'.freeze
+    COPYRIGHT = "Copyright (c) 2007-#{Time.now.year} Remedy IT Expertise BV, The Netherlands".freeze
     TITLE = 'RIDL Ruby backend'.freeze
     VERSION = {
-      :major => 1,
-      :minor => 9,
-      :release => 2
+      :major => 2,
+      :minor => 0,
+      :release => 1
     }
 
     ## Configure Ruby backend
@@ -108,7 +108,7 @@ module IDL
 
         # ruby specific option switches
 
-        unless IDL.preprocessing?   # same switch defined for IDL preprocessing mode
+        unless ridl_params[:preprocess]   # same switch defined for IDL preprocessing mode
           optlist.for_switch "--output=FILE", :type => String,
               :description => ['Specifies filename to generate output in.',
                                'Default: File.basename(idlfile, \'.idl\')+<postfix>+<ext>'] do |swcfg|
@@ -333,4 +333,4 @@ module IDL
 
   end # module Ruby
 
-end # module IDL
+end # module IDL

data/mkrf_conf_bingem.rb

@@ -62,12 +62,62 @@ else
     require 'rubygems/dependency_installer.rb'
     require 'rubygems/uninstaller'
     require 'fileutils'
+
+    ## ==========================================================================================##
+
+    # determin rubygems version
+    gem_ver_major, gem_ver_minor, gem_ver_release = Gem::VERSION.split('.').collect {|s| s.to_i }
+    # in case of rubygems 2.3.0 - 2.4.5
+    if gem_ver_major == 2 && (gem_ver_minor == 3 || (gem_ver_minor == 4 && gem_ver_release <= 5))
+      # patch the Gem::Resolver::InstallerSet class
+      require 'rubygems/resolver/installer_set'
+      class ::Gem::Resolver::InstallerSet
+        def add_always_install dependency
+          request = Gem::Resolver::DependencyRequest.new dependency, nil
+
+          found = find_all request
+
+          found.delete_if { |s|
+            s.version.prerelease? and not s.local?
+          } unless dependency.prerelease?
+
+          found = found.select do |s|
+            Gem::Source::SpecificFile === s.source or
+                Gem::Platform::RUBY == s.platform or
+                # *** MCO patch *** use correct platform comparison -> s.platform === String
+                Gem::Platform.local =~ s.platform
+          end
+
+          if found.empty? then
+            exc = Gem::UnsatisfiableDependencyError.new request
+            exc.errors = errors
+
+            raise exc
+          end
+
+          newest = found.max_by do |s|
+            [s.version, s.platform == Gem::Platform::RUBY ? -1 : 1]
+          end
+
+          @always_install << newest.spec
+        end
+      end
+    end
+
+    ## ==========================================================================================##
+
     begin
       Gem::Command.build_args = ARGV
     rescue NoMethodError
     end
-    Gem.sources << ENV['R2CORBA_GEM_SOURCE'] unless ENV['R2CORBA_GEM_SOURCE'].to_s.empty?
-    puts "Gem sources: #{Gem.sources.to_a}"
+    unless ENV['R2CORBA_GEM_SOURCE'].to_s.empty?
+      # make sure the RubyGems configuration has been loaded as this potentially overwrites
+      # Gem.sources
+      Gem.configuration
+      # add custom source
+      Gem.sources << ENV['R2CORBA_GEM_SOURCE']
+      puts "Gem sources: #{Gem.sources.to_a}"
+    end
     inst = Gem::DependencyInstaller.new
     begin
       # install corresponding gem with extension binaries

data/rakelib/bin.rb

@@ -19,7 +19,7 @@ module R2CORBA
 
     def self.ridlc
       <<_SH_TXT
-#!#{(`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 +87,7 @@ _BAT_TXT
 
     def self.rins
       <<_SH_TXT
-#!#{(`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 +99,7 @@ _SH_TXT
 
     def self.r2corba
       <<_SH_TXT
-#!#{(`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/config.rb

@@ -69,6 +69,49 @@ require File.join(File.dirname(__FILE__), '../lib/corba/common/version')
   jacorb_home     ENV['JACORB_HOME']
 =end
 
+if (Rake::Version::MAJOR.to_i == 10 &&
+    ((Rake::Version::MINOR.to_i == 4 && Rake::Version::BUILD.to_i >= 2) ||
+        Rake::Version::MINOR.to_i > 4)) || Rake::Version::MAJOR.to_i > 10
+
+  # patch Rake::Application with method to cleanup ARGV consuming
+  # all Rake options
+  class Rake::Application
+
+    def cleanup_args(argv = ARGV) # :nodoc:
+      return argv if options.r2corba_cleanup_done
+
+      _opt_backup = options
+      @options = OpenStruct.new
+      options.rakelib = ['rakelib']
+      options.trace_output = $stderr
+
+      begin
+        return OptionParser.new do |opts|
+          opts.banner = ""
+          opts.separator ""
+
+          standard_rake_options.each { |args| opts.on(*args) }
+          opts.environment('RAKEOPT')
+        end.parse!(argv)
+      ensure
+        @options = _opt_backup
+        @options.r2corba_cleanup_done = true
+      end
+    end
+
+  end
+else
+
+  class Rake::Application
+
+    ## noop for other Rake versions
+    def cleanup_args(argv = ARGV) # :nodoc:
+      argv
+    end
+
+  end
+end
+
 module R2CORBA
 
   if defined? ::RbConfig
@@ -168,6 +211,53 @@ module R2CORBA
     @@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|
+          if /^NAME=(.*)$/ =~ ln.strip
+            name = $1.downcase
+            break
+          end
+        end
+      elsif File.readable?('/etc/lsb-release')
+        # find 'DISTRIB_ID='
+        File.foreach('/etc/lsb-release', *io_args) do |ln|
+          if /^DISTRIB_ID=(.*)$/ =~ ln.strip
+            name = $1.downcase
+            break
+          end
+        end
+      elsif File.readable?('/etc/redhat-release')
+        name = File.read('/etc/redhat-release').strip.downcase
+      elsif File.exists?('/etc/SuSE-release')
+        name = 'suse'
+      elsif File.exists?('/etc/debian_version')
+        name = 'debian'
+      end
+      @@linux_distro = case name
+        when /suse/
+          :suse
+        when /fedora/
+          :fedora
+        when /ubuntu/
+          :ubuntu
+        when /red\s*hat/
+          :redhat
+        when /centos/
+          :centos
+        when /debian/
+          :debian
+        else
+          :linux
+        end
+    else
+      @@linux_distro = :none
+    end
+
     def self.is_win32
       @@is_win32
     end
@@ -177,6 +267,9 @@ module R2CORBA
     def self.is_linux
       @@is_linux
     end
+    def self.linux_distro
+      @@linux_distro
+    end
     def self.is_osx
       @@is_osx
     end
@@ -274,6 +367,7 @@ module R2CORBA
     end
 
     def self.define
+      _argv = Rake.application.cleanup_args(ARGV)
       OptionParser.new do |opts|
         opts.banner = "Usage: rake [rake options] -- configure [options]"
 
@@ -318,7 +412,7 @@ module R2CORBA
           opts.on('--makeprog=name',
                   "the make program to compile ruby extentions [#{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}
+                  "do *not* configure/build/clean the ACE+TAO libraries [#{get_config('without-tao')}]")  {|v| CONFIG[:'without-tao'] = true }
           opts.on('--aceroot=path',
                   "the path to the root directory of ACE [#{get_config(:aceroot)}]")  {|v| CONFIG[:aceroot] = v}
           opts.on('--taoroot=path',
@@ -340,7 +434,7 @@ module R2CORBA
         opts.separator ""
 
         opts.on('--help', 'Show this help message') { puts opts; puts; exit }
-      end.parse!(ARGV)
+      end.parse!(_argv)
     end
 
     def self.check