Change all references from OSX to macOS

2026-06-05 15:58:59 +08:00 · 2018-06-01 13:25:50 -06:00
parent d83355357e
commit d52c63f632
31 changed files with 49 additions and 49 deletions
@@ -34,8 +34,8 @@ choice
 config HOST_LINUX
 	bool "Linux"
-config HOST_OSX
+config HOST_MACOS
-	bool "OSX"
+	bool "macOS"
 config HOST_WINDOWS
 	bool "Windows"
@@ -41,7 +41,7 @@ ENVIRONMENTS
 ^^^^^^^^^^^^
  NuttX requires a POSIX development environment such as you would find under
-  Linux or OSX.  NuttX may also be installed and built on Windows system
+  Linux or macOS.  NuttX may also be installed and built on Windows system
  if you also provide such a POSIX development environment.  Options for a
  POSIX development environment under Windows include:
@@ -10,7 +10,7 @@ choice
 	prompt "Toolchain"
 	default AVR_WINAVR_TOOLCHAIN if TOOLCHAIN_WINDOWS
 	default AVR_BUILDROOT_TOOLCHAIN if HOST_LINUX
-	default AVR_CROSSPACK_TOOLCHAIN if HOST_OSX
+	default AVR_CROSSPACK_TOOLCHAIN if HOST_MACOS
 config AVR_WINAVR_TOOLCHAIN
 	bool "WinAVR"
@@ -41,7 +41,7 @@ config AVR_LINUXGCC_TOOLCHAIN
 config AVR_CROSSPACK_TOOLCHAIN
 	bool "CrossPack-AVR"
-	depends on HOST_OSX
+	depends on HOST_MACOS
 	---help---
 		For OS X, the AVR CrossPack toolchain is supported:
 		http://www.obdev.at/products/crosspack/index.html
@@ -60,7 +60,7 @@ config MIPS32_TOOLCHAIN_PINGUINOW
 config MIPS32_TOOLCHAIN_PINGUINOL
 	bool "Pinguino mips-elf toolchain under OS X or Linux"
-	depends on HOST_LINUX || HOST_OSX
+	depends on HOST_LINUX || HOST_MACOS
 	select ARCH_TOOLCHAIN_GNU
 endchoice
@@ -53,7 +53,7 @@ ifeq ($(COMPILER),sdcc)
    include Makefile.sdccw
  else
-    # SDCC in a POSIX environment (Linux, OSX, or Cygwin/MSYS)
+    # SDCC in a POSIX environment (Linux, macOS, or Cygwin/MSYS)
    include Makefile.sdccl
  endif
@@ -11,7 +11,7 @@ choice
 	default Z180_TOOLCHAIN_SDCCL if !TOOLCHAIN_WINDOWS
 config Z180_TOOLCHAIN_SDCCL
-        bool "SDCC for Linux, MAC OSX, or Cygwin"
+        bool "SDCC for Linux, macOS, or Cygwin"
 	depends on !WINDOWS_NATIVE
 config Z180_TOOLCHAIN_SDCCW
@@ -40,11 +40,11 @@
 # http://sdcc.sourceforge.net/.  Source and pre-built SDCC binaries can be
 # downloaded from the SDCC SourceForge site:
 # http://sourceforge.net/projects/sdcc/files/.  Pre-built binaries are
-# available for Linux, MAC OSX, and for Win32.  In addition, SDCC can be
+# available for Linux, macOS, and for Win32.  In addition, SDCC can be
-# built to run on Windows as a POSIX toolchain.  The various SDCC options are
+# built to run on Windows as a POSIX toolchain.  The various SDCC options
-# selected in the NuttX configuration with:
+# are selected in the NuttX configuration with:
 #
-#  CONFIG_Z180_TOOLCHAIN_SDCCL=y : SDCC for Linux, MAC OSX or Cygwin
+#  CONFIG_Z180_TOOLCHAIN_SDCCL=y : SDCC for Linux, macOS or Cygwin
 #  CONFIG_Z180_TOOLCHAIN_SDCCW=y : SDCC for Win32
 #
@@ -59,7 +59,7 @@ ifeq ($(filter y, \
  CONFIG_Z180_TOOLCHAIN ?= SDCCWIN32
 endif
-# SDCC toolchain under Linux, MAC OSX or Cygwin
+# SDCC toolchain under Linux, macOS or Cygwin
 ifeq ($(CONFIG_Z180_TOOLCHAIN),POSIX)
 endif
@@ -11,7 +11,7 @@ choice
 	default Z80_TOOLCHAIN_SDCCL if !TOOLCHAIN_WINDOWS
 config Z80_TOOLCHAIN_SDCCL
-        bool "SDCC for Linux, MAC OSX, or Cygwin"
+        bool "SDCC for Linux, macOS, or Cygwin"
 	depends on !WINDOWS_NATIVE
 config Z80_TOOLCHAIN_SDCCW
@@ -40,11 +40,11 @@
 # http://sdcc.sourceforge.net/.  Source and pre-built SDCC binaries can be
 # downloaded from the SDCC SourceForge site:
 # http://sourceforge.net/projects/sdcc/files/.  Pre-built binaries are
-# available for Linux, MAC OSX, and for Win32.  In addition, SDCC can be
+# available for Linux, macOS, and for Win32.  In addition, SDCC can be
 # built to run on Windows as a POSIX toolchain.  The various SDCC options are
 # selected in the NuttX configuration with:
 #
-#  CONFIG_Z80_TOOLCHAIN_SDCCL=y : SDCC for Linux, MAC OSX or Cygwin
+#  CONFIG_Z80_TOOLCHAIN_SDCCL=y : SDCC for Linux, macOS or Cygwin
 #  CONFIG_Z80_TOOLCHAIN_SDCCW=y : SDCC for Win32
 #
@@ -59,7 +59,7 @@ ifeq ($(filter y, \
  CONFIG_Z80_TOOLCHAIN ?= SDCCWIN32
 endif
-# SDCC toolchain under Linux, MAC OSX or Cygwin
+# SDCC toolchain under Linux, macOS or Cygwin
 ifeq ($(CONFIG_Z80_TOOLCHAIN),POSIX)
 endif
@@ -56,7 +56,7 @@ ifeq ($(CONFIG_LPC43_BOOT_CS0FLASH),y)
  LDSCRIPT = cs0flash.ld
 endif
-# Setup for Windows vs Linux/Cygwin/OSX environments
+# Setup for Windows vs Linux/Cygwin/macOS environments
 ifeq ($(WINTOOL),y)
  # Windows-native toolchains
@@ -56,7 +56,7 @@ ifeq ($(CONFIG_LPC43_BOOT_CS0FLASH),y)
  LDSCRIPT = cs0flash.ld
 endif
-# Setup for Windows vs Linux/Cygwin/OSX environments
+# Setup for Windows vs Linux/Cygwin/macOS environments
 ifeq ($(WINTOOL),y)
  # Windows-native toolchains
@@ -280,7 +280,7 @@ OpenOCD for the ESP32
  Then look at the README and the docs/INSTALL.txt files in the
  openocd-esp32 directory for further instructions.  There area
-  separate README files for Linux/Cygwin, OSX, and Windows.  Here
+  separate README files for Linux/Cygwin, macOS, and Windows.  Here
  is what I ended up doing (under Linux):
    cd openocd-esp32
@@ -55,7 +55,7 @@ ifeq ($(CONFIG_LPC43_BOOT_CS0FLASH),y)
  LDSCRIPT = cs0flash.ld
 endif
-# Setup for Windows vs Linux/Cygwin/OSX environments
+# Setup for Windows vs Linux/Cygwin/macOS environments
 ifeq ($(WINTOOL),y)
  # Windows-native toolchains
@@ -55,7 +55,7 @@ ifeq ($(CONFIG_LPC43_BOOT_CS0FLASH),y)
  LDSCRIPT = cs0flash.ld
 endif
-# Setup for Windows vs Linux/Cygwin/OSX environments
+# Setup for Windows vs Linux/Cygwin/macOS environments
 ifeq ($(WINTOOL),y)
  # Windows-native toolchains
@@ -55,7 +55,7 @@ ifeq ($(CONFIG_LPC43_BOOT_CS0FLASH),y)
  LDSCRIPT = cs0flash.ld
 endif
-# Setup for Windows vs Linux/Cygwin/OSX environments
+# Setup for Windows vs Linux/Cygwin/macOS environments
 ifeq ($(WINTOOL),y)
  # Windows-native toolchains
@@ -55,7 +55,7 @@ ifeq ($(CONFIG_LPC43_BOOT_CS0FLASH),y)
  LDSCRIPT = cs0flash.ld
 endif
-# Setup for Windows vs Linux/Cygwin/OSX environments
+# Setup for Windows vs Linux/Cygwin/macOS environments
 ifeq ($(WINTOOL),y)
  # Windows-native toolchains
@@ -41,7 +41,7 @@ include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
 LDSCRIPT = flash.ld
-# Setup for Windows vs Linux/Cygwin/OSX environments
+# Setup for Windows vs Linux/Cygwin/macOS environments
 ifeq ($(WINTOOL),y)
  # Windows-native toolchains
@@ -15,7 +15,7 @@ CONFIG_DISABLE_POLL=y
 CONFIG_DISABLE_PTHREAD=y
 CONFIG_DISABLE_SIGNALS=y
 CONFIG_EXAMPLES_HELLO=y
-CONFIG_HOST_OSX=y
+CONFIG_HOST_MACOS=y
 CONFIG_IDLETHREAD_STACKSIZE=512
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=4
@@ -17,7 +17,7 @@ CONFIG_DISABLE_MQUEUE=y
 CONFIG_DISABLE_POLL=y
 CONFIG_DISABLE_PTHREAD=y
 CONFIG_EXAMPLES_NSH=y
-CONFIG_HOST_OSX=y
+CONFIG_HOST_MACOS=y
 CONFIG_IDLETHREAD_STACKSIZE=512
 CONFIG_INTELHEX_BINARY=y
 CONFIG_MAX_TASKS=8
@@ -39,7 +39,7 @@ include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
 LDSCRIPT = flash_config.ld
-# Setup for Windows vs Linux/Cygwin/OSX environments
+# Setup for Windows vs Linux/Cygwin/macOS environments
 ifeq ($(WINTOOL),y)
  # Windows-native toolchains
@@ -157,7 +157,7 @@ else
  MKDEP = $(TOPDIR)$(DELIM)tools$(DELIM)mkwindeps.sh
-  # SDCC for Linux, OSX, or Cygwin understands symbolic links.  Windows SDCC
+  # SDCC for Linux, macOS, or Cygwin understands symbolic links.  Windows SDCC
  # running under Cygwin does not
 ifeq ($(WINTOOL),y)
@@ -89,7 +89,7 @@ Development Environment
  Several possible development environments may be used:
-  - Linux or OSX native
+  - Linux or macOS native
  - Cygwin unders Windows
  - MinGW + MSYS under Windows
  - Windows native (with GNUMake from GNUWin32).
@@ -111,7 +111,7 @@ Development Environment
  Several possible development environments may be used:
-  - Linux or OSX native
+  - Linux or macOS native
  - Cygwin unders Windows
  - MinGW + MSYS under Windows
  - Windows native (with GNUMake from GNUWin32).
@@ -105,7 +105,7 @@ Development Environment
  Several possible development environments may be used:
-  - Linux or OSX native
+  - Linux or macOS native
  - Cygwin unders Windows
  - MinGW + MSYS under Windows
  - Windows native (with GNUMake from GNUWin32).
@@ -12,7 +12,7 @@ Contents
  o Configuring NuttX
  o Reconfiguring NuttX
-  o Reconfiguring for Windows Native, Cygwin, or OSX
+  o Reconfiguring for Windows Native, Cygwin, or macOS
  o SDCC
  o Building the SDCC toolchain
@@ -51,7 +51,7 @@ Configuring NuttX
    2. The default setup for this configuration builds under Linux.
       See the section entitled "Reconfiguring for Windows Native, Cygwin,
-       or OSX" which will give you the steps you would need to do to convert
+       or macOS" which will give you the steps you would need to do to convert
       this configuration to build in other environments.
    3. This configuration was last verified sucessfully prior to the
@@ -93,7 +93,7 @@ Configuring NuttX
    2. The default setup for this configuration uses a windows native build.
       See the section entitled "Reconfiguring for Windows Native, Cygwin,
-       or OSX" which will give you the steps you would need to do to convert
+       or macOS" which will give you the steps you would need to do to convert
       this configuration to build in other environments.
    3. This configuration was last verified sucessfully prior to the
@@ -136,7 +136,7 @@ Configuring NuttX
    2. The default setup for this configuration uses a windows native build.
       See the section entitled "Reconfiguring for Windows Native, Cygwin,
-       or OSX" which will give you the steps you would need to do to convert
+       or macOS" which will give you the steps you would need to do to convert
       this configuration to build in other environments.
    3. This configuration was last verified sucessfully prior to the
@@ -155,7 +155,7 @@ tool.  To change this configuration using that tool, you should:
  b. Execute 'make menuconfig' in nuttx/ in order to start the reconfiguration
     process.
-Reconfiguring for Windows Native, Cygwin, or OSX
+Reconfiguring for Windows Native, Cygwin, or macOS
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 All of the z80 configurations in this this directory are set up to build
@@ -184,10 +184,10 @@ SDCC
 These z80 configurations all use the SDCC toolchain (http://sdcc.sourceforge.net/).
 Source and pre-built SDCC binaries can be downloaded from the SDCC SourceForge
 site: http://sourceforge.net/projects/sdcc/files/ .  Pre-built binaries are
-available for Linux, MAC OSX, and for Win32.  Various SDCC options can be
+available for Linux, macOS, and for Win32.  Various SDCC options can be
 selected with:
-  CONFIG_Z80_TOOLCHAIN_SDCCL=y : SDCC for Linux, MAC OSX or Cygwin (see below)
+  CONFIG_Z80_TOOLCHAIN_SDCCL=y : SDCC for Linux, macOS or Cygwin (see below)
  CONFIG_Z80_TOOLCHAIN_SDCCW=y : SDCC for Win32
 SDCC versions 3.2.0 or higher are recommended.
@@ -158,7 +158,7 @@ else
    MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT)
  endif
-  # SDCC for Linux, OSX, or Cygwin understands symbolic links.  Windows SDCC
+  # SDCC for Linux, macOS, or Cygwin understands symbolic links.  Windows SDCC
  # running under Cygwin does not
 ifeq ($(WINTOOL),y)
@@ -46,7 +46,7 @@ configure.c, cfgparser.c, and cfgparser.h
  configure.sh is a bash script that is used to configure NuttX for a given
  target board in a environment that supports POSIX paths (Linux, Cygwin,
-  OSX, or similar).  See configs/README.txt or Documentation/NuttxPortingGuide.html
+  macOS, or similar).  See configs/README.txt or Documentation/NuttxPortingGuide.html
  for a description of how to configure NuttX with this script.
  configure.c, cfgparser.c, and cfgparser.h can be used to build a work-alike
@@ -996,7 +996,7 @@ static void set_host(const char *destconfig)
          enable_feature(destconfig, "CONFIG_HOST_LINUX");
          disable_feature(destconfig, "CONFIG_HOST_WINDOWS");
-          disable_feature(destconfig, "CONFIG_HOST_OSX");
+          disable_feature(destconfig, "CONFIG_HOST_MACOS");
          disable_feature(destconfig, "CONFIG_WINDOWS_NATIVE");
          disable_feature(destconfig, "CONFIG_WINDOWS_CYGWIN");
@@ -1016,7 +1016,7 @@ static void set_host(const char *destconfig)
          disable_feature(destconfig, "CONFIG_HOST_LINUX");
          disable_feature(destconfig, "CONFIG_HOST_WINDOWS");
-          enable_feature(destconfig, "CONFIG_HOST_OSX");
+          enable_feature(destconfig, "CONFIG_HOST_MACOS");
          disable_feature(destconfig, "CONFIG_WINDOWS_NATIVE");
          disable_feature(destconfig, "CONFIG_WINDOWS_CYGWIN");
@@ -1034,7 +1034,7 @@ static void set_host(const char *destconfig)
        {
          enable_feature(destconfig, "CONFIG_HOST_WINDOWS");
          disable_feature(destconfig, "CONFIG_HOST_LINUX");
-          disable_feature(destconfig, "CONFIG_HOST_OSX");
+          disable_feature(destconfig, "CONFIG_HOST_MACOS");
          disable_feature(destconfig, "CONFIG_WINDOWS_MSYS");
          disable_feature(destconfig, "CONFIG_WINDOWS_OTHER");
@@ -279,7 +279,7 @@ fi
 if [ ! -z "$host" ]; then
  sed -i -e "/CONFIG_HOST_LINUX/d" ${dest_config}
  sed -i -e "/CONFIG_HOST_WINDOWS/d" ${dest_config}
-  sed -i -e "/CONFIG_HOST_OSX/d" ${dest_config}
+  sed -i -e "/CONFIG_HOST_MACOS/d" ${dest_config}
  sed -i -e "/CONFIG_HOST_OTHER/d" ${dest_config}
  sed -i -e "/CONFIG_WINDOWS_NATIVE/d" ${dest_config}
  sed -i -e "/CONFIG_WINDOWS_CYGWIN/d" ${dest_config}
@@ -298,8 +298,8 @@ if [ ! -z "$host" ]; then
      ;;
    "macos")
-      echo "  Select CONFIG_HOST_OSX=y"
+      echo "  Select CONFIG_HOST_MACOS=y"
-      echo "CONFIG_HOST_OSX=y" >> "${dest_config}"
+      echo "CONFIG_HOST_MACOS=y" >> "${dest_config}"
      ;;
    "windows")
@@ -233,7 +233,7 @@ else
    fi
 fi
-kconfig-tweak --file $nuttx/.config --disable CONFIG_HOST_OSX
+kconfig-tweak --file $nuttx/.config --disable CONFIG_HOST_MACOS
 kconfig-tweak --file $nuttx/.config --disable CONFIG_HOST_OTHER
 echo "  Refreshing..."
@@ -207,7 +207,7 @@ function configure {
        kconfig-tweak --file $nuttx/.config --disable CONFIG_SIM_M32
    fi
-    kconfig-tweak --file $nuttx/.config --disable CONFIG_HOST_OSX
+    kconfig-tweak --file $nuttx/.config --disable CONFIG_HOST_MACOS
    kconfig-tweak --file $nuttx/.config --disable CONFIG_HOST_OTHER
    if [ "X$sizet" == "Xlong" ]; then