r2corba 1.4.1-x86-mingw32 → 1.5.1-x86-mingw32

data/rakelib/gem.rake

@@ -1,212 +1,236 @@
-#--------------------------------------------------------------------
-# gem.rake - build file
-#
-# Author: Martin Corino
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the R2CORBA LICENSE which is
-# 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')
-
-namespace :r2corba do
-  namespace :gem do
-    task :srcgem => ['r2corba:bin:build', File.join('pkg', "#{R2CORBA::Gem.gem_name('r2corba', R2CORBA::R2CORBA_VERSION)}.gem")]
-
-    task :bingem => ['r2corba:build', File.join('pkg', "#{R2CORBA::Gem.gem_name('r2corba', R2CORBA::R2CORBA_VERSION, :bin)}.gem")]
-
-    task :extbingem => ['r2corba:build', File.join('pkg', "#{R2CORBA::Gem.gem_name('r2corba', R2CORBA::R2CORBA_VERSION, :extbin)}.gem")]
-
-    task :srcbuild => 'r2corba:build' do
-      ext_dir = File.expand_path('ext')
-      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
-          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)
-          # create unversioned symlink
-          ln_s(File.join(ext_dir, File.basename(path)), File.join(ext_dir, File.basename(acelib)), :force => true) if R2CORBA::Config.is_linux
-        end
-        # clean up (uninstall) taosource gem
-        require 'rubygems/uninstaller'
-        Gem::Uninstaller.new('taosource', :all => true).uninstall
-      end
-    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)
-        end
-      end
-      unless defined?(JRUBY_VERSION) || R2CORBA::Config.is_win32
-        # patch RPATH setting of shared libs
-        R2CORBA::Gem.patch_extlib_rpath
-      end
-    end
-
-    unless defined?(JRUBY_VERSION)
-      task :taogem do
-        # get version of latest ACE release from internet
-        _ace_ver = R2CORBA::Ext.get_latest_ace_version
-        # make sure download target dir exists
-        Rake.mkdir_p('src')
-        # download latest TAO source archive from internet
-        R2CORBA::Ext.download_tao_source(_ace_ver, 'src')
-        # build gem
-        gemspec = R2CORBA::Gem.define_spec('taosource', _ace_ver) do |gem|
-          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.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']
-        end
-        R2CORBA::Gem.build_gem(gemspec)
-      end
-    end
-  end
-end
-
-# source gem file
-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.email = 'mcorino@remedy.nl'
-    gem.homepage = "https://osportal.remedy.nl/projects/r2corba"
-    gem.authors = ['Martin Corino']
-    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.require_paths << 'ext'
-    gem.add_dependency 'ridl', '>= 2.2.2'
-    gem.add_dependency 'rake', '>= 10.0.1'
-    gem.rdoc_options << '--exclude=\\.dll' << '--exclude=\\.so' << '--exclude=\\.pidlc'
-  end
-  R2CORBA::Gem.build_gem(gemspec)
-end
-t_.enhance ['mkrf_conf_srcgem.rb']
-
-# Extension binaries gem file
-t_ = file File.join('pkg', "#{R2CORBA::Gem.gem_name('r2corba', R2CORBA::R2CORBA_VERSION, :extbin)}.gem") => R2CORBA::Gem.manifest(:extbin, true) do
-  unless defined?(JRUBY_VERSION)
-    # prepare required shared libs for ext libs
-    if R2CORBA::Config.is_win32
-      ext_deplibs = R2CORBA::Ext.ace_shlibs + R2CORBA::Ext.sys_dlls
-    elsif R2CORBA::Config.is_linux
-      ext_deplibs = R2CORBA::Ext.ace_shlibs('.so.*').collect {|acelib| Dir.glob(acelib).first }
-    else
-      ext_deplibs = R2CORBA::Ext.ace_shlibs
-    end
-    ext_deplibs.each {|deplib| cp(deplib, File.join('ext', File.basename(deplib)), :verbose => false) }
-  end
-  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.email = 'mcorino@remedy.nl'
-      gem.homepage = "https://osportal.remedy.nl/projects/r2corba"
-      gem.authors = ['Martin Corino']
-      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'
-    end
-    R2CORBA::Gem.build_gem(gemspec)
-  ensure
-    ext_deplibs.each {|deplib| rm_f(File.join('ext', File.basename(deplib)), :verbose => false) } unless defined?(JRUBY_VERSION)
-  end
-end
-
-# binary gem file
-t_ = file File.join('pkg', "#{R2CORBA::Gem.gem_name('r2corba', R2CORBA::R2CORBA_VERSION, :bin)}.gem") => R2CORBA::Gem.manifest(:bin, true) do
-  unless defined?(JRUBY_VERSION)
-    if ENV['FULL_BINGEM']
-      # prepare required shared libs for ext libs
-      if R2CORBA::Config.is_win32
-        ext_deplibs = R2CORBA::Ext.ace_shlibs + R2CORBA::Ext.sys_dlls
-      elsif R2CORBA::Config.is_linux
-        ext_deplibs = R2CORBA::Ext.ace_shlibs('.so.*').collect {|acelib| Dir.glob(acelib).first }
-      else
-        ext_deplibs = R2CORBA::Ext.ace_shlibs
-      end
-      ext_deplibs.each {|deplib| cp(deplib, File.join('ext', File.basename(deplib)), :verbose => false) }
-    else
-      touch(File.join('ext', '.keep'))
-    end
-  end
-  begin
-    # 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.email = 'mcorino@remedy.nl'
-      gem.homepage = "https://osportal.remedy.nl/projects/r2corba"
-      gem.authors = ['Martin Corino']
-      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']
-      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.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'
-    end
-    R2CORBA::Gem.build_gem(gemspec)
-  ensure
-    if ENV['FULL_BINGEM']
-      ext_deplibs.each {|deplib| rm_f(File.join('ext', File.basename(deplib)), :verbose => false) } unless defined?(JRUBY_VERSION)
-    else
-      rm_f(File.join('ext', '.keep')) unless defined?(JRUBY_VERSION)
-    end
-  end
-end
-t_.enhance ['mkrf_conf_bingem.rb']
-
-desc 'Build R2CORBA gem'
-if defined?(JRUBY_VERSION)
-  task :gem => 'r2corba:gem:bingem'
-elsif R2CORBA::Config.is_win32
-  task :gem => 'r2corba:gem:bingem'
-else
-  task :gem => 'r2corba:gem:srcgem'
+#--------------------------------------------------------------------
+# gem.rake - build file
+#
+# Author: Martin Corino
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the R2CORBA LICENSE which is
+# 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')
+
+namespace :r2corba do
+  namespace :gem do
+    task :srcgem => ['r2corba:bin:build', File.join('pkg', "#{R2CORBA::Gem.gem_name('r2corba', R2CORBA::R2CORBA_VERSION)}.gem")]
+
+    task :bingem => ['r2corba:build', File.join('pkg', "#{R2CORBA::Gem.gem_name('r2corba', R2CORBA::R2CORBA_VERSION, :bin)}.gem")]
+
+    task :extbingem => ['r2corba:build', File.join('pkg', "#{R2CORBA::Gem.gem_name('r2corba', R2CORBA::R2CORBA_VERSION, :extbin)}.gem")]
+
+    task :srcbuild => 'r2corba:build' do
+      ext_dir = File.expand_path('ext')
+      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
+          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)
+          # create unversioned symlink
+          ln_s(File.join(ext_dir, File.basename(path)), File.join(ext_dir, File.basename(acelib)), :force => true) if R2CORBA::Config.is_linux
+        end
+        # clean up (uninstall) taosource gem
+        require 'rubygems/uninstaller'
+        Gem::Uninstaller.new('taosource', :all => true).uninstall
+      end
+    end
+
+    task :binbuild => ['r2corba:bin:build', 'r2corba:build_idl'] do
+      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
+    end
+
+    unless defined?(JRUBY_VERSION)
+      task :taogem do
+        # get version of latest ACE release from internet
+        _ace_ver = R2CORBA::Ext.get_latest_ace_version
+        # make sure download target dir exists
+        Rake.mkdir_p('src')
+        # download latest TAO source archive from internet
+        R2CORBA::Ext.download_tao_source(_ace_ver, 'src')
+        # build gem
+        gemspec = R2CORBA::Gem.define_spec('taosource', _ace_ver) do |gem|
+          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.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']
+        end
+        R2CORBA::Gem.build_gem(gemspec)
+      end
+    end
+  end
+end
+
+# source gem file
+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.email = 'mcorino@remedy.nl'
+    gem.homepage = "https://osportal.remedy.nl/projects/r2corba"
+    gem.authors = ['Martin Corino']
+    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.require_paths << 'ext'
+    gem.add_dependency 'ridl', '~> 2.5'
+    gem.add_dependency 'rake', '~> 10.0'
+    gem.rdoc_options << '--exclude=\\.dll' << '--exclude=\\.so' << '--exclude=\\.pidlc'
+  end
+  R2CORBA::Gem.build_gem(gemspec)
+end
+t_.enhance ['mkrf_conf_srcgem.rb']
+
+# Extension binaries gem file
+t_ = file File.join('pkg', "#{R2CORBA::Gem.gem_name('r2corba', R2CORBA::R2CORBA_VERSION, :extbin)}.gem") => R2CORBA::Gem.manifest(:extbin, true) do
+  unless defined?(JRUBY_VERSION)
+    # prepare required shared libs for ext libs
+    if R2CORBA::Config.is_win32
+      ext_deplibs = R2CORBA::Ext.ace_shlibs + R2CORBA::Ext.sys_dlls
+    elsif R2CORBA::Config.is_linux
+      ext_deplibs = R2CORBA::Ext.ace_shlibs('.so.*').collect {|acelib| Dir.glob(acelib).first }
+    else
+      ext_deplibs = R2CORBA::Ext.ace_shlibs
+    end
+    ext_deplibs.each {|deplib| cp(deplib, File.join('ext', File.basename(deplib)), :verbose => false) }
+  end
+  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.email = 'mcorino@remedy.nl'
+      gem.homepage = "https://osportal.remedy.nl/projects/r2corba"
+      gem.authors = ['Martin Corino']
+      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.rdoc_options << '--exclude=\\.dll' << '--exclude=\\.so'
+    end
+    R2CORBA::Gem.build_gem(gemspec)
+  ensure
+    ext_deplibs.each {|deplib| rm_f(File.join('ext', File.basename(deplib)), :verbose => false) } unless defined?(JRUBY_VERSION)
+  end
+end
+
+# binary gem file
+t_ = file File.join('pkg', "#{R2CORBA::Gem.gem_name('r2corba', R2CORBA::R2CORBA_VERSION, :bin)}.gem") => R2CORBA::Gem.manifest(:bin, true) do
+  unless defined?(JRUBY_VERSION)
+    if ENV['FULL_BINGEM']
+      # prepare required shared libs for ext libs
+      if R2CORBA::Config.is_win32
+        ext_deplibs = R2CORBA::Ext.ace_shlibs + R2CORBA::Ext.sys_dlls
+      elsif R2CORBA::Config.is_linux
+        ext_deplibs = R2CORBA::Ext.ace_shlibs('.so.*').collect {|acelib| Dir.glob(acelib).first }
+      else
+        ext_deplibs = R2CORBA::Ext.ace_shlibs
+      end
+      ext_deplibs.each {|deplib| cp(deplib, File.join('ext', File.basename(deplib)), :verbose => false) }
+    else
+      touch(File.join('ext', '.keep'))
+    end
+  end
+  begin
+    # 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.email = 'mcorino@remedy.nl'
+      gem.homepage = "https://osportal.remedy.nl/projects/r2corba"
+      gem.authors = ['Martin Corino']
+      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']
+      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.require_paths << 'ext'
+      end
+      gem.add_dependency 'ridl', '~> 2.5'
+      gem.add_dependency 'rake', '~> 10.0'
+      gem.rdoc_options << '--exclude=\\.dll' << '--exclude=\\.so' << '--exclude=\\.pidlc'
+    end
+    R2CORBA::Gem.build_gem(gemspec)
+  ensure
+    if ENV['FULL_BINGEM']
+      ext_deplibs.each {|deplib| rm_f(File.join('ext', File.basename(deplib)), :verbose => false) } unless defined?(JRUBY_VERSION)
+    else
+      rm_f(File.join('ext', '.keep')) unless defined?(JRUBY_VERSION)
+    end
+  end
+end
+t_.enhance ['mkrf_conf_bingem.rb']
+
+unless defined?(JRUBY_VERSION) || !R2CORBA::Config.is_win32
+  # 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://osportal.remedy.nl/projects/r2corba"
+      gem.authors = ['Martin Corino']
+      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']
+    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'
+elsif R2CORBA::Config.is_win32
+  task :gem => 'r2corba:gem:bingem'
+else
+  task :gem => 'r2corba:gem:srcgem'
 end

data/rakelib/gem.rb

@@ -1,146 +1,146 @@
-#--------------------------------------------------------------------
-# gem.rb - build file
-#
-# Author: Martin Corino
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the R2CORBA LICENSE which is
-# included with this program.
-#
-# Copyright (c) Remedy IT Expertise BV
-# Chamber of commerce Rotterdam nr.276339, The Netherlands
-#--------------------------------------------------------------------
-
-require 'rubygems'
-begin
-  require 'rubygems/builder'
-rescue LoadError
-  require 'rubygems/package'
-end
-
-require File.join(File.dirname(__FILE__), 'config.rb')
-unless defined?(JRUBY_VERSION)
-  require File.join(File.dirname(__FILE__), 'ext.rb')
-end
-
-module R2CORBA
-
-  module Gem
-
-    unless defined?(JRUBY_VERSION)
-
-      @@ace_dlls = nil
-
-      def self.ace_dlls
-        unless @@ace_dlls
-          @@ace_dlls = []
-          # collect required dll paths
-          if R2CORBA::Config.is_win32
-            @@ace_dlls.concat(R2CORBA::Ext.ace_shlibs(R2CORBA::Ext.so_ext, 'ext'))
-            @@ace_dlls.concat(R2CORBA::Ext.sys_dlls.collect {|sysdll| File.join('ext', File.basename(sysdll))})
-          elsif R2CORBA::Config.is_linux
-            @@ace_dlls.concat(R2CORBA::Ext.ace_shlibs('.so.*').collect {|acelib| File.join('ext', File.basename(Dir.glob(acelib).first)) })
-          else
-            @@ace_dlls.concat(R2CORBA::Ext.ace_shlibs(R2CORBA::Ext.so_ext, 'ext'))
-          end
-        end
-        @@ace_dlls
-      end
-    end
-
-    def self.manifest(gemtype = :src, exclude_ace_dll = false)
-      # create MANIFEST list with included files
-      manifest = []
-      if gemtype == :bin
-        manifest.concat %w{bin/ridlc bin/rins bin/r2corba}
-        manifest.concat %w{bin/ridlc.bat bin/rins.bat bin/r2corba.bat} if R2CORBA::Config.is_win32 || defined?(JRUBY_VERSION)
-        if defined?(JRUBY_VERSION)
-          manifest.concat(Dir['jacorb/lib/*.jar'].select do |fnm|
-            !%w{idl jacorb-sources picocontainer wrapper}.any? {|nm| /^#{nm}/ =~ File.basename(fnm) }
-          end)
-        elsif ENV['FULL_BINGEM']
-          manifest.concat(R2CORBA::Gem.ace_dlls) unless exclude_ace_dll
-          manifest.concat(Dir['ext/*.so'])
-        end
-        manifest.concat Dir['lib/corba/**/*']
-        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 << 'LICENSE.jacorb' if defined?(JRUBY_VERSION)
-      elsif gemtype == :extbin
-        unless defined?(JRUBY_VERSION)
-          manifest.concat(R2CORBA::Gem.ace_dlls) unless exclude_ace_dll
-          manifest.concat(Dir['ext/*.so'])
-        end
-      else
-        manifest.concat %w{bin/ridlc bin/rins bin/r2corba}
-        manifest.concat Dir['ext/**/*.{rb,c,cpp,h,mwc}']
-        manifest.concat Dir['lib/corba/**/*[^CS].*'].select {|path| File.basename(path) != 'r2c_orb.rb'}
-        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}
-      end
-      unless gemtype == :extbin
-        if defined?(JRUBY_VERSION)
-          manifest.concat(Dir['rakelib/**/*'].select {|fnm| /install|help|ext/ =~ fnm ? false : true })
-        else
-          manifest.concat(Dir['rakelib/**/*'].select {|fnm| /install|help/ =~ fnm ? false : true })
-        end
-      end
-      manifest
-    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)
-      if gemtype == :bin || gemtype == :extbin
-        gemspec.platform = ::Gem::Platform::CURRENT
-      end
-      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)
-      if gemtype == :bin || gemtype == :extbin
-        gemspec.platform = ::Gem::Platform::CURRENT
-      end
-      gemspec.full_name
-    end
-
-    def self.build_gem(gemspec)
-      if defined?(::Gem::Builder)
-        gem_file_name = ::Gem::Builder.new(gemspec).build
-      else
-        gem_file_name = ::Gem::Package.build(gemspec)
-      end
-
-      FileUtils.mkdir_p('pkg')
-
-      FileUtils.mv(gem_file_name, 'pkg')
-    end
-
-    unless defined?(JRUBY_VERSION) || R2CORBA::Config.is_win32
-      def self.patch_extlib_rpath
-        if R2CORBA::Config.is_osx
-          # TODO
-        else
-          rpath = "#{File.expand_path('ext')}:#{get_config('libdir')}"
-          Dir['ext/*.so'].each do |extlib|
-            unless Rake.sh("#{R2CORBA::Config.rpath_patch} '#{rpath}' #{extlib}")
-              raise 'Failed to patch RPATH for #{extlib}'
-            end
-          end
-        end
-      end
-    end
-
-  end
-
+#--------------------------------------------------------------------
+# gem.rb - build file
+#
+# Author: Martin Corino
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the R2CORBA LICENSE which is
+# included with this program.
+#
+# Copyright (c) Remedy IT Expertise BV
+# Chamber of commerce Rotterdam nr.276339, The Netherlands
+#--------------------------------------------------------------------
+
+require 'rubygems'
+require 'rubygems/package'
+begin
+  require 'rubygems/builder'
+rescue LoadError
+end
+
+require File.join(File.dirname(__FILE__), 'config.rb')
+unless defined?(JRUBY_VERSION)
+  require File.join(File.dirname(__FILE__), 'ext.rb')
+end
+
+module R2CORBA
+
+  module Gem
+
+    unless defined?(JRUBY_VERSION)
+
+      @@ace_dlls = nil
+
+      def self.ace_dlls
+        unless @@ace_dlls
+          @@ace_dlls = []
+          # collect required dll paths
+          if R2CORBA::Config.is_win32
+            @@ace_dlls.concat(R2CORBA::Ext.ace_shlibs(R2CORBA::Ext.so_ext, 'ext'))
+            @@ace_dlls.concat(R2CORBA::Ext.sys_dlls.collect {|sysdll| File.join('ext', File.basename(sysdll))})
+          elsif R2CORBA::Config.is_linux
+            @@ace_dlls.concat(R2CORBA::Ext.ace_shlibs('.so.*').collect {|acelib| File.join('ext', File.basename(Dir.glob(acelib).first)) })
+          else
+            @@ace_dlls.concat(R2CORBA::Ext.ace_shlibs(R2CORBA::Ext.so_ext, 'ext'))
+          end
+        end
+        @@ace_dlls
+      end
+    end
+
+    def self.manifest(gemtype = :src, exclude_ace_dll = false)
+      # create MANIFEST list with included files
+      manifest = []
+      if gemtype == :bin
+        manifest.concat %w{bin/ridlc bin/rins bin/r2corba}
+        manifest.concat %w{bin/ridlc.bat bin/rins.bat bin/r2corba.bat} if R2CORBA::Config.is_win32 || defined?(JRUBY_VERSION)
+        if defined?(JRUBY_VERSION)
+          manifest.concat(Dir['jacorb/lib/*.jar'].select do |fnm|
+            !%w{idl jacorb-sources picocontainer wrapper}.any? {|nm| /^#{nm}/ =~ File.basename(fnm) }
+          end)
+        elsif ENV['FULL_BINGEM']
+          manifest.concat(R2CORBA::Gem.ace_dlls) unless exclude_ace_dll
+          manifest.concat(Dir['ext/*.so'])
+        end
+        manifest.concat Dir['lib/corba/**/*']
+        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 << 'LICENSE.jacorb' if defined?(JRUBY_VERSION)
+      elsif gemtype == :extbin
+        unless defined?(JRUBY_VERSION)
+          manifest.concat(R2CORBA::Gem.ace_dlls) unless exclude_ace_dll
+          manifest.concat(Dir['ext/*.so'])
+        end
+      else
+        manifest.concat %w{bin/ridlc bin/rins bin/r2corba}
+        manifest.concat Dir['ext/**/*.{rb,c,cpp,h,mwc}']
+        manifest.concat Dir['lib/corba/**/*[^CS].*'].select {|path| File.basename(path) != 'r2c_orb.rb'}
+        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}
+      end
+      unless gemtype == :extbin
+        if defined?(JRUBY_VERSION)
+          manifest.concat(Dir['rakelib/**/*'].select {|fnm| /install|help|ext/ =~ fnm ? false : true })
+        else
+          manifest.concat(Dir['rakelib/**/*'].select {|fnm| /install|help/ =~ fnm ? false : true })
+        end
+      end
+      manifest
+    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)
+      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=
+      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)
+      if gemtype == :bin || gemtype == :extbin
+        gemspec.platform = defined?(JRUBY_VERSION) ? ::Gem::Platform.new('universal-java') : ::Gem::Platform::CURRENT
+      end
+      gemspec.full_name
+    end
+
+    def self.build_gem(gemspec)
+      if defined?(::Gem::Package) && ::Gem::Package.respond_to?(:build)
+        gem_file_name = ::Gem::Package.build(gemspec)
+      else
+        gem_file_name = ::Gem::Builder.new(gemspec).build
+      end
+
+      FileUtils.mkdir_p('pkg')
+
+      FileUtils.mv(gem_file_name, 'pkg')
+    end
+
+    unless defined?(JRUBY_VERSION) || R2CORBA::Config.is_win32
+      def self.patch_extlib_rpath
+        if R2CORBA::Config.is_osx
+          # TODO
+        else
+          rpath = "#{File.expand_path('ext')}:#{get_config('libdir')}"
+          Dir['ext/*.so'].each do |extlib|
+            unless Rake.sh("#{R2CORBA::Config.rpath_patch} '#{rpath}' #{extlib}")
+              raise 'Failed to patch RPATH for #{extlib}'
+            end
+          end
+        end
+      end
+    end
+
+  end
+
 end