r2corba 1.5.4 → 1.5.5

data/rakelib/build.rake

@@ -31,50 +31,50 @@ task :build => 'r2corba:build'
 
 ## compile base IDL
 
-r2c_idlc_root = File.join('lib','corba','idl')
+r2c_idlc_root = File.join('lib', 'corba', 'idl')
 stdidl_root = File.join('lib', 'idl')
 
-orb_pidlc = File.join('lib', 'ridlbe','ruby','orb.pidlc')
+orb_pidlc = File.join('lib', 'ridlbe', 'ruby', 'orb.pidlc')
 file orb_pidlc => [R2CORBA::BUILD_CFG] do |t|
   sh("#{R2CORBA::Config.ridlc} --preprocess --output #{t.name} --include=#{stdidl_root} orb.idl")
 end
 Rake::Task['r2corba:build_idl'].enhance [orb_pidlc]
 CLOBBER.include orb_pidlc
 
-file File.join(r2c_idlc_root,'r2c_orb.rb') => [R2CORBA::BUILD_CFG, orb_pidlc] do |t|
+file File.join(r2c_idlc_root, 'r2c_orb.rb') => [R2CORBA::BUILD_CFG, orb_pidlc] do |t|
   cmd = R2CORBA::Config.ridlc
   cmd << " --ignore-pidl --output #{t.name} --namespace=R2CORBA --include=#{stdidl_root}" <<
          " --stubs-only --expand-includes --search-includepath --no-libinit --interface-as-class=TypeCode orb.idl"
   sh(cmd)
 end
-Rake::Task['r2corba:build_idl'].enhance [File.join(r2c_idlc_root,'r2c_orb.rb')]
-CLOBBER.include File.join(r2c_idlc_root,'r2c_orb.rb')
+Rake::Task['r2corba:build_idl'].enhance [File.join(r2c_idlc_root, 'r2c_orb.rb')]
+CLOBBER.include File.join(r2c_idlc_root, 'r2c_orb.rb')
 
 [ ['POA', 'PortableServer.pidl'],
   ['Messaging', 'Messaging.pidl'],
   ['BiDirPolicy', 'BiDirPolicy.pidl'],
 ].each do |stub, pidl|
-  file File.join(r2c_idlc_root,stub+'C.rb') => [R2CORBA::BUILD_CFG, orb_pidlc] do |t|
+  file File.join(r2c_idlc_root, stub + 'C.rb') => [R2CORBA::BUILD_CFG, orb_pidlc] do |t|
     cmd = R2CORBA::Config.ridlc
     cmd << " --output #{t.name} --namespace=R2CORBA --include=#{stdidl_root} --stubs-only --expand-includes --search-includepath --no-libinit #{pidl}"
     sh(cmd)
   end
-  Rake::Task['r2corba:build_idl'].enhance [File.join(r2c_idlc_root,stub+'C.rb')]
-  CLOBBER.include File.join(r2c_idlc_root,stub+'C.rb')
+  Rake::Task['r2corba:build_idl'].enhance [File.join(r2c_idlc_root, stub + 'C.rb')]
+  CLOBBER.include File.join(r2c_idlc_root, stub + 'C.rb')
 end
 
 unless defined?(JRUBY_VERSION)
-  r2tao_root = File.join('lib','corba','cbase')
+  r2tao_root = File.join('lib', 'corba', 'cbase')
   tao_root = get_config('taoroot')
   [ 'TAO_Ext', 'IORTable' ].each do |stub|
-    file File.join(r2c_idlc_root,stub+'C.rb') => [R2CORBA::BUILD_CFG, orb_pidlc] do |t|
+    file File.join(r2c_idlc_root, stub + 'C.rb') => [R2CORBA::BUILD_CFG, orb_pidlc] do |t|
       cmd = R2CORBA::Config.ridlc
       cmd << " --output #{t.name} --namespace=R2CORBA --include=#{stdidl_root} --stubs-only --expand-includes -I#{tao_root}" <<
-          " --search-includepath --no-libinit #{File.join(r2c_idlc_root, stub+'.pidl')}"
+          " --search-includepath --no-libinit #{File.join(r2c_idlc_root, stub + '.pidl')}"
       sh(cmd)
     end
-    Rake::Task['r2corba:build_idl'].enhance [File.join(r2c_idlc_root,stub+'C.rb')]
-    CLOBBER.include File.join(r2c_idlc_root,stub+'C.rb')
+    Rake::Task['r2corba:build_idl'].enhance [File.join(r2c_idlc_root, stub + 'C.rb')]
+    CLOBBER.include File.join(r2c_idlc_root, stub + 'C.rb')
   end
 end
 
@@ -83,5 +83,5 @@ file File.join(r2c_idlc_root, 'CosNamingC.rb') => [R2CORBA::BUILD_CFG, orb_pidlc
   cmd << " -o #{r2c_idlc_root} --include=#{stdidl_root} --expand-includes --search-includepath CosNaming.idl"
   sh(cmd)
 end
-Rake::Task['r2corba:build_idl'].enhance [File.join(r2c_idlc_root,'CosNamingC.rb')]
-CLOBBER.include File.join(r2c_idlc_root,'CosNamingC.rb')
+Rake::Task['r2corba:build_idl'].enhance [File.join(r2c_idlc_root, 'CosNamingC.rb')]
+CLOBBER.include File.join(r2c_idlc_root, 'CosNamingC.rb')

data/rakelib/config.rb

@@ -309,14 +309,14 @@ module R2CORBA
           ENV['MPC_ROOT'] = get_config('mpcroot')
 
           if is_win32
-            ENV['PATH'] = "#{File.join(ENV['ACE_ROOT'],'lib')}#{';'}#{ENV['PATH']}"
+            ENV['PATH'] = "#{File.join(ENV['ACE_ROOT'], 'lib')}#{';'}#{ENV['PATH']}"
             ENV['SSL_ROOT'] = get_config('sslroot') if get_config('with-ssl')
           elsif RUBY_PLATFORM =~ /darwin/
-            ENV['DYLD_LIBRARY_PATH'] = "#{File.join(ENV['ACE_ROOT'],'lib')}#{File::PATH_SEPARATOR}#{ENV['DYLD_LIBRARY_PATH'] || ""}"
-            ENV['SSL_ROOT'] = get_config('sslroot') if get_config('with-ssl') && get_config('sslroot')!='/usr'
+            ENV['DYLD_LIBRARY_PATH'] = "#{File.join(ENV['ACE_ROOT'], 'lib')}#{File::PATH_SEPARATOR}#{ENV['DYLD_LIBRARY_PATH'] || ""}"
+            ENV['SSL_ROOT'] = get_config('sslroot') if get_config('with-ssl') && get_config('sslroot') != '/usr'
           else
-            ENV['LD_LIBRARY_PATH'] = "#{File.join(ENV['ACE_ROOT'],'lib')}#{File::PATH_SEPARATOR}#{ENV['LD_LIBRARY_PATH'] || ""}"
-            ENV['SSL_ROOT'] = get_config('sslroot') if get_config('with-ssl') && get_config('sslroot')!='/usr'
+            ENV['LD_LIBRARY_PATH'] = "#{File.join(ENV['ACE_ROOT'], 'lib')}#{File::PATH_SEPARATOR}#{ENV['LD_LIBRARY_PATH'] || ""}"
+            ENV['SSL_ROOT'] = get_config('sslroot') if get_config('with-ssl') && get_config('sslroot') != '/usr'
           end
 
         else
@@ -438,14 +438,14 @@ module R2CORBA
     def self.check
       if defined?(JRUBY_VERSION)
         # check availability of JacORB
-        if get_config('jacorb_home')=='' && File.directory?('jacorb')
+        if get_config('jacorb_home') == '' && File.directory?('jacorb')
           set_config('jacorb_home', File.expand_path('jacorb'))
         end
         raise "Cannot find JacORB. Missing JACORB_HOME configuration!" if get_config('jacorb_home').empty?
       else
         if Dir[File.join('ext', 'libACE.*')].empty? # Don't check for ACE/TAO installation when executed for binary gem install
 
-          if get_config('without-tao') && !(File.directory?(File.join('ACE','ACE_wrappers')) || File.directory?(File.join('ACE','ACE')))
+          if get_config('without-tao') && !(File.directory?(File.join('ACE', 'ACE_wrappers')) || File.directory?(File.join('ACE', 'ACE')))
 
             # check if a user defined ACE/TAO location is specified or we're using a system standard install
             if get_config('aceroot').empty?
@@ -460,14 +460,14 @@ module R2CORBA
 
           else
             # check availability of ACE/TAO
-            if get_config('aceroot').empty? && (File.directory?(File.join('ACE','ACE_wrappers')) || File.directory?(File.join('ACE','ACE')))
-              set_config('aceroot', File.directory?(File.join('ACE','ACE_wrappers')) ? File.expand_path(File.join('ACE','ACE_wrappers')) : File.expand_path(File.join('ACE','ACE')))
+            if get_config('aceroot').empty? && (File.directory?(File.join('ACE', 'ACE_wrappers')) || File.directory?(File.join('ACE', 'ACE')))
+              set_config('aceroot', File.directory?(File.join('ACE', 'ACE_wrappers')) ? File.expand_path(File.join('ACE', 'ACE_wrappers')) : File.expand_path(File.join('ACE', 'ACE')))
             end
-            if get_config('taoroot').empty? && (File.directory?(File.join(get_config('aceroot'),'TAO')) || File.directory?(File.join('ACE','TAO')))
-              set_config('taoroot', File.directory?(File.join(get_config('aceroot'),'TAO')) ? File.expand_path(File.join(get_config('aceroot'),'TAO')) : File.expand_path(File.join('ACE','TAO')))
+            if get_config('taoroot').empty? && (File.directory?(File.join(get_config('aceroot'), 'TAO')) || File.directory?(File.join('ACE', 'TAO')))
+              set_config('taoroot', File.directory?(File.join(get_config('aceroot'), 'TAO')) ? File.expand_path(File.join(get_config('aceroot'), 'TAO')) : File.expand_path(File.join('ACE', 'TAO')))
             end
-            if get_config('mpcroot').empty? && (File.directory?(File.join(get_config('aceroot'),'MPC')) || File.directory?(File.join('ACE','MPC')))
-              set_config('mpcroot', File.directory?(File.join(get_config('aceroot'),'MPC')) ? File.expand_path(File.join(get_config('aceroot'),'MPC')) : File.expand_path(File.join('ACE','MPC')))
+            if get_config('mpcroot').empty? && (File.directory?(File.join(get_config('aceroot'), 'MPC')) || File.directory?(File.join('ACE', 'MPC')))
+              set_config('mpcroot', File.directory?(File.join(get_config('aceroot'), 'MPC')) ? File.expand_path(File.join(get_config('aceroot'), 'MPC')) : File.expand_path(File.join('ACE', 'MPC')))
             end
 
             set_config('aceinstdir', get_config('sodir')) if get_config('aceinstdir').empty?

data/rakelib/ext.rake

@@ -119,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
@@ -205,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::linux_distro != :ubuntu && R2CORBA::Config.cpu_cores > 2
-                sh("#{get_config('makeprog')} -j#{R2CORBA::Config.cpu_cores} #{get_config('with-debug') ? ' debug=1' : ''}")
-              else
-                sh("#{get_config('makeprog')}#{get_config('with-debug') ? ' debug=1' : ''}")
-              end
+              sh("#{get_config('makeprog')} -j#{R2CORBA::Config.cpu_cores} #{get_config('with-debug') ? ' debug=1' : ''}")
             ensure
               Dir.chdir cur_dir
             end

data/rakelib/ext.rb

@@ -16,7 +16,7 @@ require File.join(File.dirname(__FILE__), 'ext_r2tao.rb')
 module R2CORBA
 
   module Ext
-    ACE_FILES  = [
+    ACE_FILES = [
         'ACE',
         'TAO',
         'TAO_TypeCodeFactory',
@@ -122,6 +122,7 @@ debug=#{get_config('with-debug') ? 1 : 0}
 fl_reactor=0
 tk_reactor=0
 boost=0
+inline=0
 include $(ACE_ROOT)/include/makeinclude/platform_mingw32.GNU
       }
         when /linux/
@@ -143,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/
@@ -207,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
@@ -238,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
@@ -253,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")
@@ -264,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.exist?(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
@@ -274,4 +275,3 @@ ipv6=#{get_config('with-ipv6') ? 1 : 0}
   end # Ext
 
 end # R2CORBA
-

data/rakelib/ext_r2tao.rb

@@ -19,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) {
@@ -73,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
@@ -91,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
 
@@ -113,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')} \\
                .
@@ -121,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
 
@@ -147,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) {
@@ -207,7 +201,7 @@ THE_END__
     end
 
     def self.download_tao_source(version, targetdir)
-      version_dir = version.gsub('.','_')
+      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")
@@ -240,10 +234,10 @@ THE_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

data/rakelib/gem.rake

@@ -25,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)
@@ -43,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
@@ -104,7 +104,7 @@ t_ = file File.join('pkg', "#{R2CORBA::Gem.gem_name('r2corba', R2CORBA::R2CORBA_
     gem.licenses = ['Nonstandard', 'DOC', 'GPL-2.0']
     gem.require_paths << 'ext'
     gem.add_dependency 'ridl', '~> 2.8'
-    gem.add_dependency 'rake', '~> 12.3.3'
+    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",
@@ -193,7 +193,7 @@ t_ = file File.join('pkg', "#{R2CORBA::Gem.gem_name('r2corba', R2CORBA::R2CORBA_
         gem.require_paths << 'ext'
       end
       gem.add_dependency 'ridl', '~> 2.8'
-      gem.add_dependency 'rake', '~> 12.3.3'
+      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",
@@ -211,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

data/rakelib/gem.rb

@@ -92,9 +92,9 @@ 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
@@ -105,8 +105,8 @@ module R2CORBA
 
     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

data/test/BiDirectional/client.rb

@@ -25,13 +25,13 @@ ARGV.options do |opts|
 
     opts.on("--k IORFILE",
             "Set IOR.",
-            "Default: 'file://server.ior'") { |v| OPTIONS[:iorfile]=v }
+            "Default: 'file://server.ior'") { |v| OPTIONS[:iorfile] = v }
     opts.on("--d LVL",
             "Set ORBDebugLevel value.",
-            "Default: 0", Integer) { |v| OPTIONS[:orb_debuglevel]=v }
+            "Default: 0", Integer) { |v| OPTIONS[:orb_debuglevel] = v }
     opts.on("--use-implement",
             "Load IDL through CORBA.implement() instead of precompiled code.",
-            "Default: off") { |v| OPTIONS[:use_implement]=v }
+            "Default: off") { |v| OPTIONS[:use_implement] = v }
 
     opts.separator ""
 

data/test/BiDirectional/run_test.rb

@@ -58,7 +58,7 @@ end
 
 exrc = clt.wait(400)
 
-if exrc ==0
+if exrc == 0
   srv.wait(400)
 else
   srv.wait_term(400)

data/test/BiDirectional/server.rb

@@ -26,16 +26,16 @@ ARGV.options do |opts|
 
     opts.on("--o IORFILE",
             "Set IOR filename.",
-            "Default: 'server.ior'") { |v| OPTIONS[:iorfile]=v }
+            "Default: 'server.ior'") { |v| OPTIONS[:iorfile] = v }
     opts.on("--d LVL",
             "Set ORBDebugLevel value.",
-            "Default: 0") { |v| OPTIONS[:orb_debuglevel]=v }
+            "Default: 0") { |v| OPTIONS[:orb_debuglevel] = v }
     opts.on("--use-implement",
             "Load IDL through CORBA.implement() instead of precompiled code.",
-            "Default: off") { |v| OPTIONS[:use_implement]=v }
+            "Default: off") { |v| OPTIONS[:use_implement] = v }
     opts.on("--i ITERATIONS",
             "Set number of iterations.",
-            "Default: 10", Integer) { |v| OPTIONS[:iter_num]=v }
+            "Default: 10", Integer) { |v| OPTIONS[:iter_num] = v }
 
     opts.separator ""
 
@@ -165,4 +165,3 @@ end
 puts 'event loop finished'
 
 root_poa.destroy(true, true)
-