ICU-22881 Switch to using macOS instead of MacOSX in runConfigureICU.

The old names are kept as aliases, but not listed in the help messsage.
rp9-next · Sep 5, 2024 · 964bdc5 · 964bdc5
1 parent 5faea99
commit 964bdc5
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/docs/processes/cldr-icu.md b/docs/processes/cldr-icu.md
@@ -168,7 +168,7 @@ export ICU_DATA_VER=icudt(version)b
 2a. Configure ICU4C, build and test without new data first, to verify that
 there are no pre-existing errors, and to build some tools needed for later
 steps. Here `<platform>` is the runConfigureICU code for the platform you
-are building on, e.g. Linux, MacOSX, Cygwin.
+are building on, e.g. Linux, macOS, Cygwin.
 (optionally build with debug enabled)
 ```
 cd $ICU4C_DIR/source

diff --git a/docs/userguide/icu4c/build.md b/docs/userguide/icu4c/build.md
@@ -524,14 +524,14 @@ The autoconf docs use the term "build" for A, and "host" for B. More details at:
 Three initially-empty directories will be used in this example:
 
 | **/icu**    | a copy of the ICU source                                                    |
-| **/buildA** | an empty directory, it will contain ICU built for A  (MacOSX in this case)  |
+| **/buildA** | an empty directory, it will contain ICU built for A  (macOS in this case)  |
 | **/buildB** | an empty directory, it will contain ICU built for B  (HaikuOS in this case) |
 
 1.  Check out or unpack the ICU source code into the `/icu` directory.You will have the directories `/icu/source`, etc.
 2.  Build ICU in `/buildA` normally (using `runConfigureICU` or `configure`):
 ```
 cd /buildA
-sh /icu/source/runConfigureICU MacOSX
+sh /icu/source/runConfigureICU macOS
 gnumake
 ```
 3.  Set `PATH` or other variables as needed, such as `CPPFLAGS`.

diff --git a/docs/userguide/icu4c/faq.md b/docs/userguide/icu4c/faq.md
@@ -153,7 +153,7 @@ See the [Building ICU4C](./icu4c/build) section.
 From ICU version 4.2 on, the configure script will build with the default bit
 width of your platform. You can request 64 or 32 bits with the
 **--with-library-bits=** option, (e.g. `runConfigureICU Linux
-**--with-library-bits=64**` or `runConfigureICU MacOSX
+**--with-library-bits=64**` or `runConfigureICU macOS
 **--with-library-bits=32**`).
 (For the behavior of attempting 64 bits if possible, use
 **--with-library-bits=64else32**).

diff --git a/icu4c/source/runConfigureICU b/icu4c/source/runConfigureICU
@@ -52,8 +52,8 @@ The following names can be supplied as the argument for platform:
     Linux/ECC           Use the Intel ECC compiler on Linux
     Linux/ICC           Use the Intel ICC compiler on Linux
     Linux/VA            Use the IBM XL compiler on Power PC Linux
-    MacOSX              Use the default compilers on MacOS X (Darwin)
-    MacOSX/GCC          Use the GNU gcc/g++ compilers on MacOSX (Darwin)
+    macOS               Use the default compilers on macOS (Darwin)
+    macOS/gcc           Use the GNU gcc/g++ compilers on macOS (Darwin)
     MinGW               Use the GNU gcc/g++ compilers on MinGW
     MSYS/MSVC           Use the Microsoft Visual C++ compiler on MSYS
     QNX                 Use the QNX QCC compiler on QNX/Neutrino
@@ -318,15 +318,15 @@ case $platform in
         DEBUG_CXXFLAGS='/Zi'
         DEBUG_LDFLAGS='/DEBUG'
         ;;
-    MacOSX)
+    macOS|MacOSX)
         THE_OS="MacOS X (Darwin)"
         THE_COMP="the default"
         RELEASE_CFLAGS='-O2'
         RELEASE_CXXFLAGS='-O2'
         DEBUG_CFLAGS='-g -O0'
         DEBUG_CXXFLAGS='-g -O0'
         ;;
-    MacOSX/GCC)
+    macOS/gcc|MacOSX/GCC)
         THE_OS="MacOS X (Darwin)"
         THE_COMP="the GNU C++"
         RELEASE_CFLAGS='-O2'