summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2021-10-30 13:49:21 -0400
committerMike Frysinger <vapier@gentoo.org>2021-10-30 13:49:21 -0400
commit0f9dd9627aa9f5095164a73e84905bb4af4bfc8f (patch)
treef58c8ceac394c2e7ef05c6695596ed4151b2c905
parentb614af3f6fd2831303764966ad8b2be0f08300af (diff)
downloadlibgd-0f9dd9627aa9f5095164a73e84905bb4af4bfc8f.tar.gz
use current macOS naming style consistently
-rw-r--r--.github/workflows/ci_gd3.yml2
-rw-r--r--.github/workflows/ci_macos.yml2
-rw-r--r--CONTRIBUTING.md2
-rw-r--r--README.md4
-rwxr-xr-xbootstrap.sh2
-rwxr-xr-xconfig/getlib.sh2
-rw-r--r--docs/INSTALL2
-rw-r--r--docs/README_CI.md8
8 files changed, 12 insertions, 12 deletions
diff --git a/.github/workflows/ci_gd3.yml b/.github/workflows/ci_gd3.yml
index 92254c7..859b9bc 100644
--- a/.github/workflows/ci_gd3.yml
+++ b/.github/workflows/ci_gd3.yml
@@ -84,7 +84,7 @@ jobs:
echo "LIBRARY_PATH=/usr/local/lib:/usr/local/include/libpng:/usr/local/opt/openssl/include" >> $GITHUB_ENV
echo "LD_PATH"
- - name: Configure CMake MacOS
+ - name: Configure CMake macOS
if: contains(matrix.os, 'macos')
# Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
# See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
diff --git a/.github/workflows/ci_macos.yml b/.github/workflows/ci_macos.yml
index f7e6cbe..b5afb52 100644
--- a/.github/workflows/ci_macos.yml
+++ b/.github/workflows/ci_macos.yml
@@ -1,4 +1,4 @@
-name: CI MacOS
+name: CI macOS
on:
push:
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 6069e46..139c858 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -135,7 +135,7 @@ Some general guidelines:
#### CI
-If we are lucky enough to get pull request (PR) from you, we will do our best to support your efforts to get it in. As part of this, we setup a CI using github actions, which will be executed on new PR. Please check out the results of your PR to see if anything went wrong (it has Linux, MacOS and Windows OSes support). The CI must be green for a PR to be considered.
+If we are lucky enough to get pull request (PR) from you, we will do our best to support your efforts to get it in. As part of this, we setup a CI using github actions, which will be executed on new PR. Please check out the results of your PR to see if anything went wrong (it has Linux, macOS and Windows OSes support). The CI must be green for a PR to be considered.
See [the github PR documentation]{https://docs.github.com/en/github/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request} for more details about how to create a pull request.
diff --git a/README.md b/README.md
index 229eba8..f55d561 100644
--- a/README.md
+++ b/README.md
@@ -70,8 +70,8 @@ CI means whether we have an automatic CI for this platform. If someone has CI fo
| Windows x86 | &#10003; | &#10003; |
| Windows x64 | &#10003; | &#10003; |
| Windows arm64 | &#10003; | x |
-| MacOS x64 | &#10003; | &#10003; |
-| MacOS M1 | &#10003; | x |
+| macOS x64 | &#10003; | &#10003; |
+| macOS M1 | &#10003; | x |
| S390 | &#10003; | x |
It is also known to work on almost all variations of *BSD, Solaris, etc. We don't have CI nor environment to test them. However many progamming languages binding do test libgd on these platforms.
diff --git a/bootstrap.sh b/bootstrap.sh
index 19beb36..bb169a2 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -10,7 +10,7 @@ v() { echo "$@"; "$@"; }
v docs/naturaldocs/run_docs.sh --nonfatal
if uname | grep -qi '^darwin' ; then
- echo "Having trouble on OS X? Try: brew install autoconf libtool automake gettext pkg-config cmake"
+ echo "Having trouble on macOS? Try: brew install autoconf libtool automake gettext pkg-config cmake"
fi
if ! v autoreconf -f -i ; then
diff --git a/config/getlib.sh b/config/getlib.sh
index 5070e30..c4bd4bc 100755
--- a/config/getlib.sh
+++ b/config/getlib.sh
@@ -11,7 +11,7 @@ GDLIB_REVISION=$("${GETVER}" RELEASE)
GDLIB_LT_CURRENT=3
# This is the version where the soname (current above) changes. We use it
# to reset the revision base back to zero. It's a bit of a pain, but some
-# systems restrict the revision range below to [0..255] (like OS X).
+# systems restrict the revision range below to [0..255] (like macOS).
GDLIB_PREV_MAJOR=2
GDLIB_PREV_MINOR=2
# This isn't 100% correct, but it tends to be a close enough approximation
diff --git a/docs/INSTALL b/docs/INSTALL
index 63bf076..607eb18 100644
--- a/docs/INSTALL
+++ b/docs/INSTALL
@@ -124,7 +124,7 @@ architecture at a time in the source code directory. After you have
installed the package for one architecture, use `make distclean' before
reconfiguring for another architecture.
- On MacOS X 10.5 and later systems, you can create libraries and
+ On macOS 10.5 and later systems, you can create libraries and
executables that work on multiple system types--known as "fat" or
"universal" binaries--by specifying multiple `-arch' options to the
compiler but only a single `-arch' option to the preprocessor. Like
diff --git a/docs/README_CI.md b/docs/README_CI.md
index 4d7eecc..da74262 100644
--- a/docs/README_CI.md
+++ b/docs/README_CI.md
@@ -15,10 +15,10 @@ The platforms used are:
- https://github.com/actions/virtual-environments/blob/main/images/win/Windows2019-Readme.md
- Visual Studio Enterprise 2019 (x64, x86 and arm64 cross compiliations)
- MingW GCC (x86, x64 and ucrt64)
-- MacOS 11, Intel
+- macOS 11, Intel
- https://github.com/actions/virtual-environments/blob/main/images/macos/macos-11-Readme.md
- GCC x64
-- MacOS 11, M1 in place but we don't manage to get M1 runners
+- macOS 11, M1 in place but we don't manage to get M1 runners
The CI configurations and script can be found in
@@ -53,11 +53,11 @@ For x64, x86 and arm64.
## ci_macos.yml
-All configs for MacOS. Dependencies are installed using homebrew (for those not available already in the image).
+All configs for macOS. Dependencies are installed using homebrew (for those not available already in the image).
Important note:
-Github actions MacOS images contain Mono. Mono somehow messes up with the various paths and it is not worth figuring out how to work around it. We use a script to simply remove Mono from the system, the script can be found in .github\scripts\removemono.sh
+Github actions macOS images contain Mono. Mono somehow messes up with the various paths and it is not worth figuring out how to work around it. We use a script to simply remove Mono from the system, the script can be found in .github\scripts\removemono.sh
## shellcheck.yml