r2corba 1.4.1 → 1.5.5

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.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',
@@ -56,9 +55,9 @@ module R2CORBA
     if is_win32
       def self.sys_dlls
         sysdlls = []
-        except_dll = R2CORBA::Config.is_win64 ? 'libgcc_s_sjlj-1.dll' : 'libgcc_s_dw2-1.dll'
+        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,27 +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,7,8
-                         'snowleopard'
-                     end
-      end
-      platform_error unless @@osx_name
-    end
-    def self.osx_name
-      @@osx_name
-    end
-
     def self.ace_config
       case RUBY_PLATFORM
         when /mingw32/
@@ -113,7 +91,6 @@ module R2CORBA
 }
         when /linux/
           %Q{
-#define ACE_HAS_GETIFADDRS
 #include "ace/config-linux.h"
 }
         when /sparc-solaris/
@@ -124,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
@@ -146,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')}
       }
@@ -172,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/
@@ -184,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']}
@@ -202,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
@@ -229,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}
@@ -238,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
@@ -269,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
@@ -284,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")
@@ -295,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
@@ -305,4 +275,3 @@ ipv6=#{get_config('with-ipv6') ? 1 : 0}
   end # Ext
 
 end # R2CORBA
-

data/rakelib/ext_r2tao.rb

@@ -8,7 +8,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 require 'open-uri'
@@ -20,7 +19,7 @@ module R2CORBA
     if RUBY_PLATFORM =~ /mingw32/
 
       mpc_os_block = <<OS_DEP__
-  libs += #{File.basename(RB_CONFIG['LIBRUBY'],'.a').sub(/^lib/,'')}
+  libs += #{File.basename(RB_CONFIG['LIBRUBY'], '.a').sub(/^lib/, '')}
   libout = .
   dllout = .
   verbatim(gnuace, macros, 1) {
@@ -74,7 +73,7 @@ project : taolib, portableserver, anytypecode, dynamicany, dynamicinterface, typ
   }
   dynamicflags = R2TAO_BUILD_DLL
   includes += "#{RB_CONFIG['rubyhdrdir'] || RB_CONFIG['archdir']}" \\
-              #{RB_CONFIG['rubyhdrdir'] ? '"'+File.join(RB_CONFIG['rubyhdrdir'], RB_CONFIG['arch'])+'"' : ''} \\
+              #{RB_CONFIG['rubyhdrdir'] ? '"' + File.join(RB_CONFIG['rubyhdrdir'], RB_CONFIG['arch']) + '"' : ''} \\
               .
   macros += RUBY_VER_MAJOR=#{Config.rb_ver_major} RUBY_VER_MINOR=#{Config.rb_ver_minor} RUBY_VER_RELEASE=#{Config.rb_ver_release}
   sharedname = r2tao
@@ -92,16 +91,16 @@ project : taolib, portableserver, anytypecode, dynamicany, dynamicinterface, typ
     iortable.cpp
   }
   dynamicflags = R2TAO_POA_BUILD_DLL
-  libpaths += #{File.join('..','libr2tao')}
+  libpaths += #{File.join('..', 'libr2tao')}
   includes += "#{RB_CONFIG['rubyhdrdir'] || RB_CONFIG['archdir']}" \\
-               #{RB_CONFIG['rubyhdrdir'] ? '"'+File.join(RB_CONFIG['rubyhdrdir'], RB_CONFIG['arch'])+'"' : ''} \\
+               #{RB_CONFIG['rubyhdrdir'] ? '"' + File.join(RB_CONFIG['rubyhdrdir'], RB_CONFIG['arch']) + '"' : ''} \\
                #{File.join('..', 'libr2tao')} \\
                .
   macros += RUBY_VER_MAJOR=#{Config.rb_ver_major} RUBY_VER_MINOR=#{Config.rb_ver_minor} RUBY_VER_RELEASE=#{Config.rb_ver_release}
   sharedname = rpoa
   libpaths += "#{RB_CONFIG['libdir']}"
   #{mpc_os_block}
-  libs += r2tao#{Config.is_win32 ? '.'+RB_CONFIG['DLEXT'] : ''}
+  libs += r2tao#{Config.is_win32 ? '.' + RB_CONFIG['DLEXT'] : ''}
 }
 THE_END
 
@@ -114,7 +113,7 @@ project : taolib, portableserver, anytypecode, dynamicany, dynamicinterface, typ
   dynamicflags = R2TAO_POL_BUILD_DLL
   libpaths += #{File.join('..', 'libr2tao')} #{File.join('..', 'librpoa')}
   includes += "#{RB_CONFIG['rubyhdrdir'] || RB_CONFIG['archdir']}" \\
-               #{RB_CONFIG['rubyhdrdir'] ? '"'+File.join(RB_CONFIG['rubyhdrdir'], RB_CONFIG['arch'])+'"' : ''} \\
+               #{RB_CONFIG['rubyhdrdir'] ? '"' + File.join(RB_CONFIG['rubyhdrdir'], RB_CONFIG['arch']) + '"' : ''} \\
                #{File.join('..', 'libr2tao')} \\
                #{File.join('..', 'librpoa')} \\
                .
@@ -122,8 +121,8 @@ project : taolib, portableserver, anytypecode, dynamicany, dynamicinterface, typ
   sharedname = rpol
   libpaths += "#{RB_CONFIG['libdir']}"
   #{mpc_os_block}
-  libs += r2tao#{Config.is_win32 ? '.'+RB_CONFIG['DLEXT'] : ''}
-  libs += rpoa#{Config.is_win32 ? '.'+RB_CONFIG['DLEXT'] : ''}
+  libs += r2tao#{Config.is_win32 ? '.' + RB_CONFIG['DLEXT'] : ''}
+  libs += rpoa#{Config.is_win32 ? '.' + RB_CONFIG['DLEXT'] : ''}
 }
 THE_END
 
@@ -148,13 +147,7 @@ project {
     extload.c
   }
   dynamicflags = EXTLOAD_BUILD_DLL
-  includes += "#{RB_CONFIG['rubyhdrdir'] || RB_CONFIG['archdir']}" \\
-              #{RB_CONFIG['rubyhdrdir'] ? '"'+File.join(RB_CONFIG['rubyhdrdir'], RB_CONFIG['arch'])+'"' : ''} \\
-              .
-  macros += RUBY_VER_MAJOR=#{Config.rb_ver_major} RUBY_VER_MINOR=#{Config.rb_ver_minor} RUBY_VER_RELEASE=#{Config.rb_ver_release}
   sharedname = extload
-  libpaths += "#{RB_CONFIG['libdir']}"
-  libs += #{File.basename(RB_CONFIG['LIBRUBY'],'.a').sub(/^lib/,'')}
   libout = .
   dllout = .
   verbatim(gnuace, macros, 1) {
@@ -182,7 +175,7 @@ THE_END__
     def self.get_latest_ace_version
       print 'Latest ACE release is '
       _version = nil
-      open('https://svn.dre.vanderbilt.edu/viewvc/Middleware/trunk/ACE/ace/Version.h?revision=HEAD') do |f|
+      open('https://raw.githubusercontent.com/DOCGroup/ACE_TAO/master/ACE/ace/Version.h') do |f|
         f.each_line do |ln|
           if /define\s+ACE_VERSION\s+\"(.*)\"/ =~ ln
             _version = $1
@@ -193,13 +186,31 @@ THE_END__
       _version
     end
 
+    # Downloading from github results in some http redirects which we first have to follow
+    def self.follow_url(uri_str, limit = 10)
+      raise ArgumentError, 'HTTP redirect too deep' if limit == 0
+      url = URI(uri_str)
+      req = Net::HTTP::Get.new(url)
+      response = Net::HTTP.start(url.host, url.port, use_ssl: true) { |http| http.request(req) }
+      case response
+      when Net::HTTPSuccess     then uri_str
+      when Net::HTTPRedirection then follow_url(response['location'], limit - 1)
+      else
+        response.error!
+      end
+    end
+
     def self.download_tao_source(version, targetdir)
-      print(_msg = "Downloading ACE+TAO-src-#{version}.tar.gz ")
-      _url = "http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-#{version}.tar.gz"
-      Net::HTTP.start("download.dre.vanderbilt.edu") do |http|
-        _fout = File.open(File.join(targetdir, "ACE+TAO-src-#{version}.tar.gz"), "wb")
+      version_dir = version.gsub('.', '_')
+      _url = "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-#{version_dir}/ACE+TAO-src-#{version}.tar.gz"
+      print(_msg = "Downloading ACE+TAO-src-#{version}.tar.gz from #{_url}")
+      _fnm = File.join(targetdir, "ACE+TAO-src-#{version}.tar.gz")
+      # First follow all http redirects
+      url = URI(follow_url(_url))
+      Net::HTTP.start(url.host, url.port, use_ssl: true) do |http|
+       _fout = File.open(_fnm, "wb")
         begin
-          http.request_get("/previous_versions/ACE+TAO-src-#{version}.tar.gz") do |resp|
+          http.request_get(url) do |resp|
             _sndlen =  resp.content_length
             _reclen = 0
             resp.read_body do |segment|
@@ -217,16 +228,18 @@ THE_END__
           puts
         end
       end
+      FileUtils::Verbose.sh("rm -rf #{File.join(targetdir, 'ACE_wrappers')} && tar -xzf #{_fnm} -C #{targetdir}")
+      FileUtils::Verbose.sh("rm -f #{_fnm} && tar --format=gnu -czf #{_fnm} -C src ACE_wrappers")
     end
 
     def self.ext_shlibs
       (if Config.is_win32
-        %w{libr2taow libepoaw librpolw}
+        %w{libr2taow librpoaw librpolw}
       else
-        %w{libr2tao libepoa librpol}
-      end).collect {|lib| File.join('ext', lib+'.so') }
+        %w{libr2tao librpoa librpol}
+      end).collect {|lib| File.join('ext', lib + '.so') }
     end
 
   end
 
-end
+end

data/rakelib/gem.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__), 'gem.rb')
@@ -26,7 +25,7 @@ namespace :r2corba do
       unless defined?(JRUBY_VERSION) || get_config('without-tao')
         # install ACE+TAO dlls
         R2CORBA::Ext.ace_shlibs.each do |acelib|
-          libmask = R2CORBA::Config.is_linux ? acelib+'.*' : acelib
+          libmask = R2CORBA::Config.is_linux ? acelib + '.*' : acelib
           path = Dir.glob(libmask).first
           raise "Cannot find ACE+TAO library #{File.basename(acelib)}." unless path
           FileUtils.install(path, ext_dir, :mode => 0555, :verbose => Rake.verbose)
@@ -40,16 +39,18 @@ namespace :r2corba do
     end
 
     task :binbuild => ['r2corba:bin:build', 'r2corba:build_idl'] do
-      if R2CORBA::Config.is_linux
-        # create unversioned ACE/TAO lib symlinks
-        R2CORBA::Ext.ace_shlibs('.so', 'ext').each do |acelib|
-          acelib_ver = File.expand_path(Dir[acelib+'.*'].first)
-          ln_s(acelib_ver, acelib)
+      unless defined?(JRUBY_VERSION)
+        if R2CORBA::Config.is_linux
+          # create unversioned ACE/TAO lib symlinks
+          R2CORBA::Ext.ace_shlibs('.so', 'ext').each do |acelib|
+            acelib_ver = File.expand_path(Dir[acelib + '.*'].first)
+            ln_s(acelib_ver, acelib)
+          end
+        end
+        unless R2CORBA::Config.is_win32
+          # patch RPATH setting of shared libs
+          R2CORBA::Gem.patch_extlib_rpath
         end
-      end
-      unless defined?(JRUBY_VERSION) || R2CORBA::Config.is_win32
-        # patch RPATH setting of shared libs
-        R2CORBA::Gem.patch_extlib_rpath
       end
     end
 
@@ -66,16 +67,20 @@ namespace :r2corba do
           gem.summary = %Q{TAO sourcecode for building R2CORBA}
           gem.description = %Q{TAO sourcecode for building R2CORBA.}
           gem.email = 'mcorino@remedy.nl'
-          gem.homepage = "https://osportal.remedy.nl/projects/r2corba"
-          gem.authors = ['Martin Corino']
+          gem.homepage = "https://www.remedy.nl/opensource/r2corba.html"
+          gem.authors = ['Martin Corino', 'Johnny Willemsen']
           gem.files = Dir['lib/taosource/**/*']
           gem.files.concat(Dir["src/ACE+TAO-src-#{_ace_ver}.tar.gz"])
           gem.files << 'mkrf_conf_taogem.rb'
           gem.extensions = ['mkrf_conf_taogem.rb']
           gem.require_paths = %w{lib}
           gem.executables = []
-          gem.required_ruby_version = '>= 1.8.6'
-          gem.licenses = ['ACE']
+          gem.required_ruby_version = '>= 2.0'
+          gem.licenses = ['DOC']
+          gem.metadata = {
+            "bug_tracker_uri"   => "https://github.com/DOCGroup/ACE_TAO/issues",
+            "source_code_uri"   => "https://github.com/DOCGroup/ACE_TAO"
+          }
         end
         R2CORBA::Gem.build_gem(gemspec)
       end
@@ -87,20 +92,24 @@ end
 t_ = file File.join('pkg', "#{R2CORBA::Gem.gem_name('r2corba', R2CORBA::R2CORBA_VERSION)}.gem") => R2CORBA::Gem.manifest do
   gemspec = R2CORBA::Gem.define_spec('r2corba', R2CORBA::R2CORBA_VERSION) do |gem|
     gem.summary = %Q{CORBA language mapping implementation for Ruby}
-    gem.description = %Q{OMG CORBA v. 3.3 compliant CORBA language mapping implementation for Ruby. Depends on ridl gem for providing native Ruby IDL compiler. }
+    gem.description = %Q{OMG CORBA v3.3 compliant CORBA language mapping implementation for Ruby. Depends on ridl gem for providing native Ruby IDL compiler. }
     gem.email = 'mcorino@remedy.nl'
-    gem.homepage = "https://osportal.remedy.nl/projects/r2corba"
-    gem.authors = ['Martin Corino']
+    gem.homepage = "https://www.remedy.nl/opensource/r2corba.html"
+    gem.authors = ['Martin Corino', 'Johnny Willemsen']
     gem.files = R2CORBA::Gem.manifest
     gem.extensions = ['mkrf_conf_srcgem.rb']
     gem.require_paths = %w{lib}
     gem.executables = %w{ridlc rins r2corba}
-    gem.required_ruby_version = '>= 1.8.6'
-    gem.licenses = ['R2CORBA', 'ACE', 'GPL']
+    gem.required_ruby_version = '>= 2.0'
+    gem.licenses = ['Nonstandard', 'DOC', 'GPL-2.0']
     gem.require_paths << 'ext'
-    gem.add_dependency 'ridl', '>= 2.2.2'
-    gem.add_dependency 'rake', '>= 10.0.1'
+    gem.add_dependency 'ridl', '~> 2.8'
+    gem.add_dependency 'rake', '>= 12.3.3'
     gem.rdoc_options << '--exclude=\\.dll' << '--exclude=\\.so' << '--exclude=\\.pidlc'
+    gem.metadata = {
+      "bug_tracker_uri"   => "https://github.com/RemedyIT/r2corba/issues",
+      "source_code_uri"   => "https://github.com/RemedyIT/r2corba"
+    }
   end
   R2CORBA::Gem.build_gem(gemspec)
 end
@@ -122,25 +131,21 @@ t_ = file File.join('pkg', "#{R2CORBA::Gem.gem_name('r2corba', R2CORBA::R2CORBA_
   begin
     gemspec = R2CORBA::Gem.define_spec('r2corba', R2CORBA::R2CORBA_VERSION, :extbin) do |gem|
       gem.summary = %Q{CORBA language mapping implementation for Ruby (extension binaries)}
-      gem.description = %Q{OMG CORBA v. 3.3 compliant CORBA language mapping implementation for Ruby. Depends on ridl gem for providing native Ruby IDL compiler. (extension binaries)}
+      gem.description = %Q{OMG CORBA v3.3 compliant CORBA language mapping implementation for Ruby. Depends on ridl gem for providing native Ruby IDL compiler. (extension binaries)}
       gem.email = 'mcorino@remedy.nl'
-      gem.homepage = "https://osportal.remedy.nl/projects/r2corba"
-      gem.authors = ['Martin Corino']
+      gem.homepage = "https://www.remedy.nl/opensource/r2corba.html"
+      gem.authors = ['Martin Corino', 'Johnny Willemsen']
       gem.files = R2CORBA::Gem.manifest(:extbin)
       gem.extensions = []
       gem.require_paths = %w{ext}
       gem.executables = []
-      if R2CORBA::Config.rb_ver_major < 2
-        if R2CORBA::Config.rb_ver_minor > 8
-          gem.required_ruby_version = '>= 1.9.1'
-        else
-          gem.required_ruby_version = '>= 1.8.6'
-        end
-      else
-        gem.required_ruby_version = '>= 2.0.0'
-      end
-      gem.licenses = ['R2CORBA', 'ACE']
-      gem.rdoc_options << '--exclude=\\.dll' << '--exclude=\\.so' << '--exclude=\\.pidlc'
+      gem.required_ruby_version = '>= 2.0'
+      gem.licenses = ['Nonstandard', 'DOC']
+      gem.rdoc_options << '--exclude=\\.dll' << '--exclude=\\.so'
+      gem.metadata = {
+        "bug_tracker_uri"   => "https://github.com/RemedyIT/r2corba/issues",
+        "source_code_uri"   => "https://github.com/RemedyIT/r2corba"
+      }
     end
     R2CORBA::Gem.build_gem(gemspec)
   ensure
@@ -169,27 +174,31 @@ t_ = file File.join('pkg', "#{R2CORBA::Gem.gem_name('r2corba', R2CORBA::R2CORBA_
     # create gemspec
     gemspec = R2CORBA::Gem.define_spec('r2corba', R2CORBA::R2CORBA_VERSION, :bin) do |gem|
       gem.summary = %Q{CORBA language mapping implementation for Ruby}
-      gem.description = %Q{OMG CORBA v. 3.3 compliant CORBA language mapping implementation for Ruby. Depends on ridl gem for providing native Ruby IDL compiler. }
+      gem.description = %Q{OMG CORBA v3.3 compliant CORBA language mapping implementation for Ruby. Depends on ridl gem for providing native Ruby IDL compiler. }
       gem.email = 'mcorino@remedy.nl'
-      gem.homepage = "https://osportal.remedy.nl/projects/r2corba"
-      gem.authors = ['Martin Corino']
+      gem.homepage = "https://www.remedy.nl/opensource/r2corba.html"
+      gem.authors = ['Martin Corino', 'Johnny Willemsen']
       gem.files = R2CORBA::Gem.manifest(:bin)
       gem.require_paths = %w{lib}
       gem.executables = %w{ridlc rins r2corba}
       gem.extensions = ['mkrf_conf_bingem.rb']
       if defined?(JRUBY_VERSION)
         gem.require_paths << 'jacorb/lib'
-        gem.required_ruby_version = '>= 1.5.0'
-        gem.licenses = ['R2CORBA', 'JacORB']
+        gem.required_ruby_version = '>= 2.0'
+        gem.licenses = ['Nonstandard', 'GPL-2.0']
       else
         gem.files << File.join('ext', '.keep') unless ENV['FULL_BINGEM'] # to force installation of ext folder if libs are left out
-        gem.required_ruby_version = '>= 1.8.6'
-        gem.licenses = ['R2CORBA', 'ACE', 'GPL']
+        gem.required_ruby_version = '>= 2.0'
+        gem.licenses = ['Nonstandard', 'DOC', 'GPL-2.0']
         gem.require_paths << 'ext'
       end
-      gem.add_dependency 'ridl', '>= 2.2.2'
-      gem.add_dependency 'rake', '>= 10.0.1'
-      gem.rdoc_options << '--exclude=\\.dll' << '--exclude=\\.so'
+      gem.add_dependency 'ridl', '~> 2.8'
+      gem.add_dependency 'rake', '>= 12.3.3'
+      gem.rdoc_options << '--exclude=\\.dll' << '--exclude=\\.so' << '--exclude=\\.pidlc'
+      gem.metadata = {
+        "bug_tracker_uri"   => "https://github.com/RemedyIT/r2corba/issues",
+        "source_code_uri"   => "https://github.com/RemedyIT/r2corba"
+      }
     end
     R2CORBA::Gem.build_gem(gemspec)
   ensure
@@ -202,6 +211,36 @@ t_ = file File.join('pkg', "#{R2CORBA::Gem.gem_name('r2corba', R2CORBA::R2CORBA_
 end
 t_.enhance ['mkrf_conf_bingem.rb']
 
+unless defined?(JRUBY_VERSION)
+  # Devkit faker Gem for binary Windows gems
+  t_devkit = file File.join('pkg', "#{R2CORBA::Gem.gem_name('r2corba_devkit', '1.0.0', :devkit)}.gem") => 'lib/rubygems_plugin.rb' do
+    # create gemspec
+    gemspec = R2CORBA::Gem.define_spec('r2corba_devkit', '1.0.0', :devkit) do |gem|
+      gem.summary = %Q{R2CORBA Devkit faker for RubyInstaller Rubies}
+      gem.description = %Q{Fake Devkit loader to satisfy stupid RubyInstaller pre-install hook. }
+      gem.email = 'mcorino@remedy.nl'
+      gem.homepage = "https://www.remedy.nl/opensource/r2corba.html"
+      gem.authors = ['Martin Corino', 'Johnny Willemsen']
+      gem.files = 'lib/rubygems_plugin.rb'
+      gem.require_paths = %w{lib}
+      gem.executables = []
+      gem.extensions = []
+      gem.required_ruby_version = '>= 2.0'
+      gem.licenses = ['Nonstandard']
+      gem.metadata = {
+        "bug_tracker_uri"   => "https://github.com/RemedyIT/r2corba/issues",
+        "source_code_uri"   => "https://github.com/RemedyIT/r2corba"
+      }
+    end
+    R2CORBA::Gem.build_gem(gemspec)
+  end
+  namespace :r2corba do
+    namespace :gem do
+      task :devkit => t_devkit.name
+    end
+  end
+end
+
 desc 'Build R2CORBA gem'
 if defined?(JRUBY_VERSION)
   task :gem => 'r2corba:gem:bingem'
@@ -209,4 +248,4 @@ elsif R2CORBA::Config.is_win32
   task :gem => 'r2corba:gem:bingem'
 else
   task :gem => 'r2corba:gem:srcgem'
-end
+end