zeroc-ice 3.6.3 → 3.6.4

data/ext/ice/mcpp/README.md

@@ -2,24 +2,21 @@
 
 This is a fork of [mcpp](http://mcpp.sourceforge.net/). mcpp is a C/C++ preprocessor used by the [Ice](https://github.com/zeroc-ice/ice) Slice compilers.
 
-This fork consists of a simplified version of mcpp 2.7.2 plus various fixes, tailored to the Slice compilers requirements. Its build system creates only a static library and no command-line preprocessor. The configure script was replaced by a custom `config.h` suitable for Windows, OS X and Linux builds. Tests and other optional files were removed.
+This fork consists of a simplified version of mcpp 2.7.2 plus various fixes, tailored to the Slice compilers requirements. Its build system creates only a static library and no command-line preprocessor. The configure script was replaced by a custom `config.h` suitable for Windows, macOS and Linux builds. Tests and other optional files were removed.
 
 The resulting static library is later used when creating the [Ice](https://github.com/zeroc-ice/ice) Slice shared library or statically-linked Slice compilers such as `slice2js`.
 
 ## Build Instructions
 
-### Linux, OS X and Windows with MinGW
+### Linux and macOS
 Simply type:
 ```
   make
 ```  
-
 This creates a static library `libmcpp.a`. Depending on your platform, the library is created in the following directory:
 
-* `lib/i386-linux-gnu` - Ubuntu 32-bit
-* `lib/x86_64-linux-gnu` - Ubuntu 64-bit
-* `lib64` - Any Linux system with a `/usr/lib64` directory
-* `lib` - OS X, Windows with MinGW, and other platforms
+* `lib64` - Linux system with a `/usr/lib64` directory
+* `lib` - Linux system without a `/usr/lib64` directory, macOS
 
 ### Windows with Visual Studio
 
@@ -27,10 +24,9 @@ Open a Visual Studio Command Prompt, and type:
 ```
   MSbuild msbuild\mcpp.vcxproj
 ```
-This will create a static library `mcpp.lib` for Release configurations and `mcppd.lib` for Debug configurations,
-to build a different platform set the MSbuild Platform property likewise to build a different configuration set
-the MSbuild Configuration property.
+This creates a static library `mcpp.lib` for Release configurations and `mcppd.lib` for Debug configurations.
+You can select a specific Configuration (`Debug` or `Release`) and Platform (`Win32` or `x64`) as shown below:
 
 ```
-  MSbuild msbuild\mcpp.vcxproj /p:Configuration=Release /p:Platform=X64
+  MSbuild msbuild\mcpp.vcxproj /p:Configuration=Release /p:Platform=x64
 ```

data/ext/ice/mcpp/mcpp.gyp

@@ -13,6 +13,7 @@
         'support.c',
         'system.c',
       ],
+      'win_delay_load_hook' : 'false',
       'include_dirs' : ['.'],
       'defines' : [
         'HAVE_CONFIG_H',
@@ -22,7 +23,26 @@
         'Release': {
           'msvs_settings': {
             'VCCLCompilerTool': {
-                'RuntimeLibrary': '2',
+                'RuntimeLibrary': '0',
+                'ExceptionHandling': '1',
+                'RuntimeTypeInfo' : 'true'
+              },
+          },
+          'msvs_disabled_warnings': [
+            4018,
+            4090,
+            4101,
+            4102,
+            4133,
+            4146,
+            4244,
+            4267
+          ]
+        },
+        'Debug': {
+          'msvs_settings': {
+            'VCCLCompilerTool': {
+                'RuntimeLibrary': '1',
                 'ExceptionHandling': '1',
                 'RuntimeTypeInfo' : 'true'
               },

data/ice.gemspec

@@ -1,6 +1,6 @@
 # **********************************************************************
 #
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
 #
 # This copy of Ice is licensed to you under the terms described in the
 # ICE_LICENSE file included in this distribution.
@@ -9,7 +9,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'zeroc-ice'
-  s.version     = '3.6.3'
+  s.version     = '3.6.4'
   s.summary     = "ZeroC Ice for Ruby"
   s.description = <<-eos
 The Internet Communications Engine (Ice) provides a robust, proven
@@ -30,10 +30,12 @@ Join us on our user forums if you have questions about Ice.
 eos
   s.authors     = ["ZeroC, Inc."]
   s.email       = 'info@zeroc.com'
-  s.files       = %w[ICE_LICENSE LICENSE MCPP_LICENSE BZIP2_LICENSE ice.gemspec] + Dir.glob('lib/**/*.rb') + Dir.glob("ext/*") + Dir.glob("ext/**/*") + Dir.glob("slice/**/*.ice")
+  s.files       = %w[ICE_LICENSE LICENSE MCPP_LICENSE ice.gemspec] + Dir.glob('lib/**/*.rb') + Dir.glob("ext/*") + Dir.glob("ext/**/*") + Dir.glob("slice/**/*.ice")
   s.homepage    = 'https://zeroc.com'
-  s.license     = 'GPL v2 with exceptions'
+  s.license     = 'GPL-2.0'
   s.extensions = %w[ext/extconf.rb]
   s.rdoc_options = %w[--exclude=ext/IceRuby/.*\.o$ --exclude=IceRuby\.(bundle|so)$ --exclude=lib/slice2rb$]
   s.executables << 'slice2rb'
+  s.metadata['msys2_dependencies'] = 'make'
+  s.metadata['msys2_mingw_dependencies'] = 'gcc'
 end

data/lib/Glacier2.rb

@@ -1,6 +1,6 @@
 # **********************************************************************
 #
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
 #
 # This copy of Ice is licensed to you under the terms described in the
 # ICE_LICENSE file included in this distribution.

data/lib/Glacier2/Metrics.rb

@@ -1,14 +1,14 @@
 # encoding: utf-8
 # **********************************************************************
 #
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
 #
 # This copy of Ice is licensed to you under the terms described in the
 # ICE_LICENSE file included in this distribution.
 #
 # **********************************************************************
 #
-# Ice version 3.6.3
+# Ice version 3.6.4
 #
 # <auto-generated>
 #

data/lib/Glacier2/PermissionsVerifier.rb

@@ -1,14 +1,14 @@
 # encoding: utf-8
 # **********************************************************************
 #
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
 #
 # This copy of Ice is licensed to you under the terms described in the
 # ICE_LICENSE file included in this distribution.
 #
 # **********************************************************************
 #
-# Ice version 3.6.3
+# Ice version 3.6.4
 #
 # <auto-generated>
 #

data/lib/Glacier2/PermissionsVerifierF.rb

@@ -1,14 +1,14 @@
 # encoding: utf-8
 # **********************************************************************
 #
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
 #
 # This copy of Ice is licensed to you under the terms described in the
 # ICE_LICENSE file included in this distribution.
 #
 # **********************************************************************
 #
-# Ice version 3.6.3
+# Ice version 3.6.4
 #
 # <auto-generated>
 #

data/lib/Glacier2/Router.rb

@@ -1,14 +1,14 @@
 # encoding: utf-8
 # **********************************************************************
 #
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
 #
 # This copy of Ice is licensed to you under the terms described in the
 # ICE_LICENSE file included in this distribution.
 #
 # **********************************************************************
 #
-# Ice version 3.6.3
+# Ice version 3.6.4
 #
 # <auto-generated>
 #

data/lib/Glacier2/RouterF.rb

@@ -1,14 +1,14 @@
 # encoding: utf-8
 # **********************************************************************
 #
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
 #
 # This copy of Ice is licensed to you under the terms described in the
 # ICE_LICENSE file included in this distribution.
 #
 # **********************************************************************
 #
-# Ice version 3.6.3
+# Ice version 3.6.4
 #
 # <auto-generated>
 #

data/lib/Glacier2/SSLInfo.rb

@@ -1,14 +1,14 @@
 # encoding: utf-8
 # **********************************************************************
 #
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
 #
 # This copy of Ice is licensed to you under the terms described in the
 # ICE_LICENSE file included in this distribution.
 #
 # **********************************************************************
 #
-# Ice version 3.6.3
+# Ice version 3.6.4
 #
 # <auto-generated>
 #
@@ -47,7 +47,7 @@ module Glacier2
             end
 
             def ==(other)
-                return false if
+                return false if !other.is_a? ::Glacier2::SSLInfo or
                     @remoteHost != other.remoteHost or
                     @remotePort != other.remotePort or
                     @localHost != other.localHost or

data/lib/Glacier2/Session.rb

@@ -1,14 +1,14 @@
 # encoding: utf-8
 # **********************************************************************
 #
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
 #
 # This copy of Ice is licensed to you under the terms described in the
 # ICE_LICENSE file included in this distribution.
 #
 # **********************************************************************
 #
-# Ice version 3.6.3
+# Ice version 3.6.4
 #
 # <auto-generated>
 #

data/lib/Ice.rb

@@ -1,6 +1,6 @@
 # **********************************************************************
 #
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
 #
 # This copy of Ice is licensed to you under the terms described in the
 # ICE_LICENSE file included in this distribution.
@@ -252,35 +252,33 @@ module Ice
             @condVar = ConditionVariable.new
             @mutex = Mutex.new
             @queue = Array.new
-            @done = false
             @callback = nil
+            
+            @read, @write = IO.pipe
 
             #
             # Setup and install signal handlers
             #
             if Signal.list.has_key?('HUP')
-                Signal.trap('HUP') { signalHandler('HUP') }
+                Signal.trap('HUP') { @write.puts 'HUP' }
             end
-            Signal.trap('INT') { signalHandler('INT') }
-            Signal.trap('TERM') { signalHandler('TERM') }
+            Signal.trap('INT') { @write.puts 'INT' }
+            Signal.trap('TERM') { @write.puts 'TERM' }
 
             @thr = Thread.new { main }
         end
 
-        # Dequeue and dispatch signals.
+        # Read and dispatch signals.
         def main
-            while true
-                sig, callback = @mutex.synchronize {
-                    while @queue.empty? and not @done
-                        @condVar.wait(@mutex)
-                    end
-                    if @done
-                        return
-                    end
-                    @queue.shift
-                }
+            while rs = IO.select([@read])
+                signal = rs.first[0].gets.strip
+                if signal == 'DONE'
+                    @read.close()
+                    break
+                end
+                callback = @callback
                 if callback
-                    callback.call(sig)
+                    callback.call(signal)
                 end
             end
         end
@@ -288,10 +286,8 @@ module Ice
         # Destroy the object. Wait for the thread to terminate and cleanup
         # the internal state.
         def destroy
-            @mutex.synchronize {
-                @done = true
-                @condVar.signal
-            }
+            @write.puts 'DONE'
+            @write.close()
 
             # Wait for the thread to terminate
             @thr.join
@@ -319,16 +315,7 @@ module Ice
             }
         end
 
-        # Private. Only called by the signal handling mechanism.
-        def signalHandler(sig)
-            @mutex.synchronize {
-                #
-                # The signal AND the current callback are queued together.
-                #
-                @queue = @queue.push([sig, @callback])
-                @condVar.signal
-            }
-        end
+ 
         @@_self = nil
     end
 

data/lib/Ice/BuiltinSequences.rb

@@ -1,14 +1,14 @@
 # encoding: utf-8
 # **********************************************************************
 #
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
 #
 # This copy of Ice is licensed to you under the terms described in the
 # ICE_LICENSE file included in this distribution.
 #
 # **********************************************************************
 #
-# Ice version 3.6.3
+# Ice version 3.6.4
 #
 # <auto-generated>
 #

data/lib/Ice/Communicator.rb

@@ -1,14 +1,14 @@
 # encoding: utf-8
 # **********************************************************************
 #
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
 #
 # This copy of Ice is licensed to you under the terms described in the
 # ICE_LICENSE file included in this distribution.
 #
 # **********************************************************************
 #
-# Ice version 3.6.3
+# Ice version 3.6.4
 #
 # <auto-generated>
 #

data/lib/Ice/CommunicatorF.rb

@@ -1,14 +1,14 @@
 # encoding: utf-8
 # **********************************************************************
 #
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
 #
 # This copy of Ice is licensed to you under the terms described in the
 # ICE_LICENSE file included in this distribution.
 #
 # **********************************************************************
 #
-# Ice version 3.6.3
+# Ice version 3.6.4
 #
 # <auto-generated>
 #

data/lib/Ice/Connection.rb

@@ -1,14 +1,14 @@
 # encoding: utf-8
 # **********************************************************************
 #
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
 #
 # This copy of Ice is licensed to you under the terms described in the
 # ICE_LICENSE file included in this distribution.
 #
 # **********************************************************************
 #
-# Ice version 3.6.3
+# Ice version 3.6.4
 #
 # <auto-generated>
 #
@@ -226,7 +226,7 @@ module Ice
             end
 
             def ==(other)
-                return false if
+                return false if !other.is_a? ::Ice::ACM or
                     @timeout != other.timeout or
                     @close != other.close or
                     @heartbeat != other.heartbeat

data/lib/Ice/ConnectionF.rb

@@ -1,14 +1,14 @@
 # encoding: utf-8
 # **********************************************************************
 #
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
 #
 # This copy of Ice is licensed to you under the terms described in the
 # ICE_LICENSE file included in this distribution.
 #
 # **********************************************************************
 #
-# Ice version 3.6.3
+# Ice version 3.6.4
 #
 # <auto-generated>
 #

data/lib/Ice/Current.rb

@@ -1,14 +1,14 @@
 # encoding: utf-8
 # **********************************************************************
 #
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+# Copyright (c) 2003-2017 ZeroC, Inc. All rights reserved.
 #
 # This copy of Ice is licensed to you under the terms described in the
 # ICE_LICENSE file included in this distribution.
 #
 # **********************************************************************
 #
-# Ice version 3.6.3
+# Ice version 3.6.4
 #
 # <auto-generated>
 #
@@ -114,7 +114,7 @@ module Ice
             end
 
             def ==(other)
-                return false if
+                return false if !other.is_a? ::Ice::Current or
                     @adapter != other.adapter or
                     @con != other.con or
                     @id != other.id or