r2corba 1.5.1-x64-mingw32 → 1.6.1-x64-mingw32

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,45 +82,15 @@ 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/
+        when /mingw/
           %Q{
 #define ACE_DISABLE_WIN32_ERROR_WINDOWS
 #include "ace/config-win32.h"
 }
         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
@@ -142,7 +110,7 @@ module R2CORBA
 
     def self.platform_macros
       case RUBY_PLATFORM
-        when /mingw32/
+        when /mingw/
           (is_win64 ? %Q{
 TCPU:=generic
 buildbits=64
@@ -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
-

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'
@@ -17,10 +16,10 @@ module R2CORBA
 
   module Ext
 
-    if RUBY_PLATFORM =~ /mingw32/
+    if RUBY_PLATFORM =~ /mingw/
 
       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
 
@@ -140,49 +139,10 @@ THE_END
       File.join('ext', 'librpol', 'rpol.mpc')
     end
 
-    if Config.is_win32
-
-      EXTLOAD_MPC = <<THE_END__
-project {
-  Source_Files {
-    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) {
-    override SOEXT := #{RB_CONFIG['DLEXT']}
-  }
-  postbuild  = <%cp%> lib<%sharedname%>.so ..<%slash%>libr2taow.so
-  postbuild += <%cp%> lib<%sharedname%>.so ..<%slash%>librpoaw.so
-  postbuild += <%cp%> lib<%sharedname%>.so ..<%slash%>librpolw.so
-  postclean  = <%rm%> ..<%slash%>libr2taow.so
-  postclean += <%rm%> ..<%slash%>librpoaw.so
-  postclean += <%rm%> ..<%slash%>librpolw.so
-}
-THE_END__
-
-      def self.extload_mpc_file
-        File.join('ext', 'extload', 'extload.mpc')
-      end
-
-      def self.extload_makefile
-        File.join('ext', 'extload', 'GNUmakefile')
-      end
-
-    end
-
     def self.get_latest_ace_version
       print 'Latest ACE release is '
       _version = nil
-      open('https://raw.githubusercontent.com/DOCGroup/ATCD/master/ACE/ace/Version.h') 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,14 +153,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"
+      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")
-      Net::HTTP.start("download.dre.vanderbilt.edu") do |http|
-        _fout = File.open(_fnm, "wb")
+      # 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|
@@ -223,11 +200,7 @@ THE_END__
     end
 
     def self.ext_shlibs
-      (if Config.is_win32
-        %w{libr2taow libepoaw librpolw}
-      else
-        %w{libr2tao libepoa librpol}
-      end).collect {|lib| File.join('ext', lib+'.so') }
+      %w{libr2tao librpoa librpol}.collect {|lib| File.join('ext', lib + '.so') }
     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)
@@ -44,7 +43,7 @@ namespace :r2corba 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)
+            acelib_ver = File.expand_path(Dir[acelib + '.*'].first)
             ln_s(acelib_ver, acelib)
           end
         end
@@ -68,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.9.3'
-          gem.licenses = ['ACE']
+          gem.required_ruby_version = '>= 2.4'
+          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
@@ -89,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.9.3'
-    gem.licenses = ['R2CORBA', 'ACE', 'GPL']
+    gem.required_ruby_version = '>= 2.4'
+    gem.licenses = ['Nonstandard', 'DOC', 'GPL-2.0']
     gem.require_paths << 'ext'
-    gem.add_dependency 'ridl', '~> 2.5'
-    gem.add_dependency 'rake', '~> 10.0'
+    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
@@ -124,21 +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
-        gem.required_ruby_version = '>= 1.9.3'
-      else
-        gem.required_ruby_version = '>= 2.0.0'
-      end
-      gem.licenses = ['R2CORBA', 'ACE']
+      gem.required_ruby_version = '>= 2.4'
+      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
@@ -167,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.7.0'
-        gem.licenses = ['R2CORBA', 'JacORB']
+        gem.required_ruby_version = '>= 2.4'
+        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.9.3'
-        gem.licenses = ['R2CORBA', 'ACE', 'GPL']
+        gem.required_ruby_version = '>= 2.4'
+        gem.licenses = ['Nonstandard', 'DOC', 'GPL-2.0']
         gem.require_paths << 'ext'
       end
-      gem.add_dependency 'ridl', '~> 2.5'
-      gem.add_dependency 'rake', '~> 10.0'
+      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
@@ -200,7 +211,7 @@ t_ = file File.join('pkg', "#{R2CORBA::Gem.gem_name('r2corba', R2CORBA::R2CORBA_
 end
 t_.enhance ['mkrf_conf_bingem.rb']
 
-unless defined?(JRUBY_VERSION) || !R2CORBA::Config.is_win32
+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
@@ -208,14 +219,18 @@ unless defined?(JRUBY_VERSION) || !R2CORBA::Config.is_win32
       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://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 = 'lib/rubygems_plugin.rb'
       gem.require_paths = %w{lib}
       gem.executables = []
       gem.extensions = []
-      gem.required_ruby_version = '>= 1.9.3'
-      gem.licenses = ['R2CORBA']
+      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
@@ -233,4 +248,4 @@ elsif R2CORBA::Config.is_win32
   task :gem => 'r2corba:gem:bingem'
 else
   task :gem => 'r2corba:gem:srcgem'
-end
+end

data/rakelib/gem.rb

@@ -8,7 +8,6 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 require 'rubygems'
@@ -66,7 +65,7 @@ module R2CORBA
         manifest.concat Dir['lib/ridlbe/**/*']
         manifest << 'lib/corba.rb'
         manifest.concat Dir['test/**/*']
-        manifest.concat %w{LICENSE README THANKS CHANGES mkrf_conf_bingem.rb}
+        manifest.concat %w{LICENSE README.rdoc THANKS CHANGES mkrf_conf_bingem.rb}
         manifest << 'LICENSE.jacorb' if defined?(JRUBY_VERSION)
       elsif gemtype == :extbin
         unless defined?(JRUBY_VERSION)
@@ -80,7 +79,7 @@ module R2CORBA
         manifest.concat Dir['lib/ridlbe/**/*.[^p]*']
         manifest << 'lib/corba.rb'
         manifest.concat Dir['test/**/*']
-        manifest.concat %w{LICENSE README THANKS CHANGES mkrf_conf_srcgem.rb}
+        manifest.concat %w{LICENSE README.rdoc THANKS CHANGES mkrf_conf_srcgem.rb}
       end
       unless gemtype == :extbin
         if defined?(JRUBY_VERSION)
@@ -93,21 +92,21 @@ module R2CORBA
     end
 
     def self.define_spec(name, version, gemtype = :src, &block)
-      name += '_ext' if gemtype == :extbin &&  !defined?(JRUBY_VERSION)
-      name = "#{name}#{R2CORBA::Config.rb_ver_major}#{R2CORBA::Config.rb_ver_minor}" if (gemtype == :extbin || (gemtype == :bin && ENV['FULL_BINGEM'])) &&  !defined?(JRUBY_VERSION)
-      gemspec = ::Gem::Specification.new(name,version.dup)
+      name += '_ext' if gemtype == :extbin && !defined?(JRUBY_VERSION)
+      name = "#{name}#{R2CORBA::Config.rb_ver_major}#{R2CORBA::Config.rb_ver_minor}" if (gemtype == :extbin || (gemtype == :bin && ENV['FULL_BINGEM'])) && !defined?(JRUBY_VERSION)
+      gemspec = ::Gem::Specification.new(name, version.dup)
       if gemtype == :bin || gemtype == :extbin
         gemspec.platform = defined?(JRUBY_VERSION) ? ::Gem::Platform.new('universal-java') : ::Gem::Platform::CURRENT
       end
-      gemspec.required_rubygems_version = ::Gem::Requirement.new(">= 0") if gemspec.respond_to? :required_rubygems_version=
+      gemspec.required_rubygems_version = ::Gem::Requirement.new('>= 0') if gemspec.respond_to? :required_rubygems_version=
       block.call(gemspec) if block_given?
       gemspec
     end
 
     def self.gem_name(name, version, gemtype = :src)
       name += '_ext' if gemtype == :extbin &&  !defined?(JRUBY_VERSION)
-      name = "#{name}#{R2CORBA::Config.rb_ver_major}#{R2CORBA::Config.rb_ver_minor}" if (gemtype == :extbin || (gemtype == :bin && ENV['FULL_BINGEM'])) &&  !defined?(JRUBY_VERSION)
-      gemspec = ::Gem::Specification.new(name,version.dup)
+      name = "#{name}#{R2CORBA::Config.rb_ver_major}#{R2CORBA::Config.rb_ver_minor}" if (gemtype == :extbin || (gemtype == :bin && ENV['FULL_BINGEM'])) && !defined?(JRUBY_VERSION)
+      gemspec = ::Gem::Specification.new(name, version.dup)
       if gemtype == :bin || gemtype == :extbin
         gemspec.platform = defined?(JRUBY_VERSION) ? ::Gem::Platform.new('universal-java') : ::Gem::Platform::CURRENT
       end
@@ -143,4 +142,4 @@ module R2CORBA
 
   end
 
-end
+end

data/rakelib/package.rake

@@ -8,19 +8,18 @@
 # included with this program.
 #
 # Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
 #--------------------------------------------------------------------
 
 require 'rake/packagetask'
 
 require File.join(File.dirname(__FILE__), 'config.rb')
 
-Rake::PackageTask.new("r2corba", R2CORBA::R2CORBA_VERSION) do |p|
+Rake::PackageTask.new('r2corba', R2CORBA::R2CORBA_VERSION) do |p|
   p.need_tar_gz = true
   p.need_zip = true
   p.package_files.include(%w{ext/**/*.{mwc,cpp,c,h}})
   p.package_files.include(%w{example/**/* lib/**/*[^C].* test/**/* rpmbuild/**/* rakelib/**/*})
   p.package_files.exclude(/GNUmakefile/)
-  p.package_files.include(%w{CHANGES INSTALL* LICENSE* Gemfile Rakefile README* THANKS mkrf_conf*.rb})
+  p.package_files.include(%w{CHANGES INSTALL* LICENSE* Gemfile Rakefile README.rdoc THANKS mkrf_conf*.rb})
   p.package_files.include(%w{ridl/lib/**/*}) if ENV['R2CORBA_PKG_RIDL']
 end