ICE-7483 - Rename OS X to macOS

.gitignore

@@ -67,7 +67,7 @@ cpp/test/IceBox/configuration/build.txt
 /cpp/test/*/*/build.txt
 /csharp/test/*/*/build.txt
 
-# OS X Keychain
+# macOS Keychain
 *.keychain
 .fl????????
 

CHANGELOG-3.3.md

@@ -265,7 +265,7 @@ noted.
   standard Ice installation.
 
 - Improved the way the build system locates the Python framework on
-  Mac OS X.
+  macOS.
 
 ## Ruby Changes
 
@@ -741,7 +741,7 @@ noted.
 
 - The thread stack size specified with the `IceUtil::Thread::start()`
   method parameter is now adjusted to `PTHREAD_STACK_MIN` if it's
-  inferior to it. On Mac OS X, it's also adjusted to the next closest
+  inferior to it. On macOS, it's also adjusted to the next closest
   multiple of the page size (4KB).
 
 - Added a new overloading of the Ice::createInputStream method:

CHANGELOG-3.5.md

@@ -148,7 +148,7 @@ class Compact(1)
 
 - The Slice compilers now define the `ICE_VERSION` preprocessor macro so that you can use the Ice version to conditionally compile your Slice definitions.
 
-- Fixed bug where the UDP client endpoint `--interface` option would be ignored on some platforms (Windows and OS X).
+- Fixed bug where the UDP client endpoint `--interface` option would be ignored on some platforms (Windows and macOS).
 IceGrid now enables active connection management for its object adapters to allow client connections to be closed automatically when inactive.
 
 - Improved `Ice.Trace.Network` tracing for transport acceptors. The tracing now shows when the object adapter starts listening for incoming connections and when it starts accepting them.
@@ -221,7 +221,7 @@ struct MyStruct {
 
 - Fixed a bug that could cause an assertion failure when flushing batch requests.
 
-- Added support for clang compiler on OS X.
+- Added support for clang compiler on macOS.
 
 - Fixed issue where a connection to a remote address would always fail with an assertion on Windows 8.
 

CHANGELOG-3.6.md

@@ -83,7 +83,7 @@ These are the changes since Ice 3.6.4.
 with a element of type Object* items where unmarshal in reverse order.
 
 - Fixed a bug where metadata was not correctly ignored and can result in bogus
-code being generated if applying invalid metadata directives. 
+code being generated if applying invalid metadata directives.
 
 # Changes in Ice 3.6.3
 
@@ -193,7 +193,7 @@ These are the changes since Ice 3.6.1.
 - Fixed potential deadlock that could occur when using collocation optimization
   and serialized server thread pools.
 
-- Fixed IceSSL bug that would only show up with WSS servers running on OS X
+- Fixed IceSSL bug that would only show up with WSS servers running on macOS
   and Linux. The WSS server could stop reading requests if the client sent
   multiple requests within the same SSL record.
 
@@ -211,7 +211,7 @@ These are the changes since Ice 3.6.1.
 - Fixed an IceGridGUI bug where metrics attributes for Glacier2 and IceStorm
   were not displayed.
 
-- Fixed an IceGridGUI bug where the GUI started minimized in OS X.
+- Fixed an IceGridGUI bug where the GUI started minimized in macOS.
 
 ## Python Changes
 
@@ -294,7 +294,7 @@ These are the changes since Ice 3.6.0.
 
 ## PHP Changes
 
-- Update PHP builds for Linux and OS X to use php-config from PATH. It is no
+- Update PHP builds for Linux and macOS to use php-config from PATH. It is no
   longer necessary to set PHP_HOME.
 
 # Changes in Ice 3.6.0
@@ -359,7 +359,7 @@ These are the changes since Ice 3.5.1.
   member should always be `true` since servers always reject invalid client
   certificates.
 
-- The Ice distribution now supports the Objective-C mapping on OS X.
+- The Ice distribution now supports the Objective-C mapping on macOS.
 
 - The Glacier2 `SessionHelper` class now creates the callback object adapter
   automatically unless the application calls
@@ -663,11 +663,11 @@ These are the changes since Ice 3.5.1.
 
 - Significant changes to the IceSSL plug-in:
 
-    - Now uses the native SecureTransport API on OS X
+    - Now uses the native SecureTransport API on macOS
     - Now uses the native SChannel API on Windows
     - OpenSSL is only used in IceSSL on Linux
 
-- Added support for the `IceSSL.FindCert` property on Windows and OS X.
+- Added support for the `IceSSL.FindCert` property on Windows and macOS.
 
 - Added the new metadata tag `cpp:view-type:Type`, where `Type` is a type that
   can safely provide a "view" into the Ice unmarshaling buffer and thereby avoid

README.md

@@ -27,7 +27,7 @@ Ice runs on a wide range of platforms:
 - iOS ([Ice Touch](https://github.com/zeroc-ice/icetouch))
 - Linux
 - Node.js
-- OS X
+- macOS
 - Web Browser
 - Windows
 - WinRT

cpp/BuildInstructionsOSX.md

@@ -1,4 +1,4 @@
-# Building Ice for C++ on OS X
+# Building Ice for C++ on macOS
 
 This file describes the Ice source distribution, including information about
 compiler requirements, third-party dependencies, and instructions for building

cpp/config/Make.rules

@@ -22,7 +22,7 @@ prefix			?= /opt/Ice-$(VERSION)
 #
 # The "root directory" for runpath embedded in executables. Can be set
 # to change the runpath added to Ice executables. The default is
-# platform dependent (Linux only, on OS X the embedded runpath is
+# platform dependent (Linux only, on macOS the embedded runpath is
 # always @loader_path/../lib).
 #
 #embedded_runpath_prefix ?= /opt/Ice-$(VERSION_MAJOR).$(VERSION_MINOR)
@@ -36,7 +36,7 @@ create_runpath_symlink  ?= no
 
 #
 # Define embedded_runpath as no if you don't want any RPATH added to
-# the executables (Linux only, on OS X we always add a runpath).
+# the executables (Linux only, on macOS we always add a runpath).
 #
 embedded_runpath 	?= yes
 
@@ -50,14 +50,14 @@ new_dtags 		?= no
 #
 # Define LP64 as yes or no if you want force a 32 or 64 bit. The
 # default is platform-dependent. This property has no effect on
-# OS X. On OS X, use CXXARCHFLAGS bellow to establish the build
+# macOS. On macOS, use CXXARCHFLAGS bellow to establish the build
 # architectures.
 #
 #LP64			?= yes
 
 #
 # The build architectures for gcc/llvm based builds. The format of
-# these build flags are OS dependent. For example, under OS X to
+# these build flags are OS dependent. For example, under macOS to
 # build binaries which support both i386 and x86_64 you would use
 # "-arch i386 -arch x86_64".  The default is OS version dependent. Be
 # aware that this value may conflict with the setting of LP64 above.

cpp/config/Make.rules.Darwin

@@ -40,7 +40,7 @@ else
 endif
 
 #
-# On OS X, always build with C++11 support enabled unless we
+# On macOS, always build with C++11 support enabled unless we
 # explicitly set it to no (possibly to test binary compatibility).
 #
 ifneq ($(CPP11), no)

cpp/src/Ice/DynamicLibrary.cpp

@@ -26,7 +26,7 @@ using namespace std;
 IceUtil::Shared* IceInternal::upCast(DynamicLibrary* p) { return p; }
 IceUtil::Shared* IceInternal::upCast(DynamicLibraryList* p) { return p; }
 
-IceInternal::DynamicLibrary::DynamicLibrary() : 
+IceInternal::DynamicLibrary::DynamicLibrary() :
     _hnd(0)
 {
 }
@@ -177,7 +177,7 @@ IceInternal::DynamicLibrary::loadEntryPoint(const string& entryPoint, bool useIc
 
 #ifdef __APPLE__
     //
-    // On OS X fallback to .so and .bundle extensions, if the default
+    // On macOS fallback to .so and .bundle extensions, if the default
     // .dylib fails.
     //
     if(!load(lib + ".dylib"))

cpp/src/Ice/Network.cpp

@@ -933,7 +933,7 @@ IceInternal::getAddresses(const string& host, int port, ProtocolSupport protocol
 
     // In theory, getaddrinfo should only return EAI_NONAME if
     // AI_NUMERICHOST is specified and the host name is not a IP
-    // address. However on some platforms (e.g. OS X 10.4.x)
+    // address. However on some platforms (e.g. macOS 10.4.x)
     // EAI_NODATA is also returned so we also check for it.
 #  ifdef EAI_NODATA
     if(!blocking && (rs == EAI_NONAME || rs == EAI_NODATA))
@@ -1238,10 +1238,10 @@ IceInternal::closeSocket(SOCKET fd)
     WSASetLastError(error);
 #else
     int error = errno;
-    
+
 #  if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
     //
-    // FreeBSD returns ECONNRESET if the underlying object was 
+    // FreeBSD returns ECONNRESET if the underlying object was
     // a stream socket that was shut down by the peer before all
     // pending data was delivered.
     //

cpp/src/Ice/UdpTransceiver.cpp

@@ -929,7 +929,7 @@ IceInternal::UdpTransceiver::UdpTransceiver(const ProtocolInstancePtr& instance,
 
     //
     // NOTE: setting the multicast interface before performing the
-    // connect is important for some OS such as OS X.
+    // connect is important for some OS such as macOS.
     //
     if(isMulticast(_addr))
     {

cpp/src/IcePatch2Lib/Util.cpp

@@ -36,7 +36,7 @@
 
 #include <iterator>
 
-// Ignore OS X OpenSSL deprecation warnings
+// Ignore macOS OpenSSL deprecation warnings
 #ifdef __APPLE__
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #endif

cpp/src/IceSSL/SecureTransportTransceiverI.cpp

@@ -136,7 +136,7 @@ checkTrustResult(SecTrustRef trust, const SecureTransportEnginePtr& engine, cons
     }
     default:
     // case kSecTrustResultInvalid:
-    // case kSecTrustResultConfirm: // Used in old OS X versions
+    // case kSecTrustResultConfirm: // Used in old macOS versions
     // case kSecTrustResultDeny:
     // case kSecTrustResultRecoverableTrustFailure:
     // case kSecTrustResultFatalTrustFailure:

cpp/src/IceUtil/CountDownLatch.cpp

@@ -34,12 +34,12 @@ IceUtilInternal::CountDownLatch::CountDownLatch(int count) :
     {
         throw IceUtil::ThreadSyscallException(__FILE__, __LINE__, rc);
     }
-    
+
     rc = pthread_cond_init(&_cond, 0);
     if(rc != 0)
     {
         throw IceUtil::ThreadSyscallException(__FILE__, __LINE__, rc);
-    }   
+    }
 #endif
 }
 
@@ -60,7 +60,7 @@ IceUtilInternal::CountDownLatch::~CountDownLatch()
 #endif
 }
 
-void 
+void
 IceUtilInternal::CountDownLatch::await() const
 {
 #ifdef _WIN32
@@ -72,7 +72,7 @@ IceUtilInternal::CountDownLatch::await() const
         DWORD rc = WaitForSingleObjectEx(_event, INFINITE, false);
 #   endif
         assert(rc == WAIT_OBJECT_0 || rc == WAIT_FAILED);
-        
+
         if(rc == WAIT_FAILED)
         {
             throw IceUtil::ThreadSyscallException(__FILE__, __LINE__, GetLastError());
@@ -90,11 +90,11 @@ IceUtilInternal::CountDownLatch::await() const
         }
     }
     unlock();
-    
+
 #endif
 }
 
-void 
+void
 IceUtilInternal::CountDownLatch::countDown()
 {
 #ifdef _WIN32
@@ -115,7 +115,7 @@ IceUtilInternal::CountDownLatch::countDown()
     }
 #if defined(__APPLE__)
     //
-    // On OS X we do the broadcast with the mutex held. This seems to
+    // On macOS we do the broadcast with the mutex held. This seems to
     // be necessary to prevent the broadcast call to hang (spinning in
     // an infinite loop).
     //
@@ -129,10 +129,10 @@ IceUtilInternal::CountDownLatch::countDown()
         }
     }
     unlock();
-    
+
 #else
     unlock();
-    
+
     if(broadcast)
     {
         int rc = pthread_cond_broadcast(&_cond);
@@ -146,7 +146,7 @@ IceUtilInternal::CountDownLatch::countDown()
 #endif
 }
 
-int 
+int
 IceUtilInternal::CountDownLatch::getCount() const
 {
 #ifdef _WIN32

cpp/test/Ice/logger/run.py

@@ -44,7 +44,7 @@ def test(cmd, match, enc):
 sys.stdout.write("testing logger UTF8 output with ISO-8859-15 narrow string converter... ")
 #
 # In Windows expected output is UTF8, because the console output code page is set to UTF-8
-# in Linux and OS X, the expected output is ISO-8859-15 because that is the narrow string
+# in Linux and macOS, the expected output is ISO-8859-15 because that is the narrow string
 # encoding used by the application.
 #
 if TestUtil.isWin32():

cpp/test/Ice/udp/AllTests.cpp

@@ -88,7 +88,7 @@ allTests(const CommunicatorPtr& communicator)
         }
 
         // If the 3 datagrams were not received within the 2 seconds, we try again to
-        // receive 3 new datagrams using a new object. We give up after 5 retries. 
+        // receive 3 new datagrams using a new object. We give up after 5 retries.
         replyI = new PingReplyI;
         reply = PingReplyPrx::uncheckedCast(adapter->addWithUUID(replyI))->ice_datagram();
     }
@@ -176,7 +176,7 @@ allTests(const CommunicatorPtr& communicator)
     }
 #endif
 
-    cout << "testing udp bi-dir connection... " << flush;    
+    cout << "testing udp bi-dir connection... " << flush;
     obj->ice_getConnection()->setAdapter(adapter);
     objMcast->ice_getConnection()->setAdapter(adapter);
     nRetry = 5;
@@ -193,7 +193,7 @@ allTests(const CommunicatorPtr& communicator)
         }
 
         // If the 3 datagrams were not received within the 2 seconds, we try again to
-        // receive 3 new datagrams using a new object. We give up after 5 retries. 
+        // receive 3 new datagrams using a new object. We give up after 5 retries.
         replyI = new PingReplyI;
         reply = PingReplyPrx::uncheckedCast(adapter->addWithUUID(replyI))->ice_datagram();
     }
@@ -202,11 +202,11 @@ allTests(const CommunicatorPtr& communicator)
 
     //
     // Sending the replies back on the multicast UDP connection doesn't work for most
-    // platform (it works for OS X Leopard but not Snow Leopard, doesn't work on SLES,
+    // platform (it works for macOS Leopard but not Snow Leopard, doesn't work on SLES,
     // Windows...). For Windows, see UdpTransceiver constructor for the details. So
     // we don't run this test.
-    // 
-//     cout << "testing udp bi-dir connection... " << flush;    
+    //
+//     cout << "testing udp bi-dir connection... " << flush;
 //     nRetry = 5;
 //     while(nRetry-- > 0)
 //     {
@@ -216,7 +216,7 @@ allTests(const CommunicatorPtr& communicator)
 //         if(ret)
 //         {
 //             break; // Success
-//         }        
+//         }
 //         replyI = new PingReplyI;
 //         reply = PingReplyPrx::uncheckedCast(adapter->addWithUUID(replyI))->ice_datagram();
 //     }

cpp/test/IceSSL/certs/makecerts.py

@@ -154,7 +154,7 @@ def usage():
         cert.save(path + ".p12", **args)
 
 #
-# Create DH parameters to use with OS X Secure Transport.
+# Create DH parameters to use with macOS Secure Transport.
 #
 if clean or not os.path.exists("dh_params512.der"):
     ca1.run("openssl", "dhparam", 512, outform="DER", out="dh_params512.der")