Skip to content

Commit

Permalink
Correct casing for macOS (#2538)
Browse files Browse the repository at this point in the history
  • Loading branch information
novialriptide authored Oct 31, 2023
1 parent dde0d31 commit 89f9fd3
Show file tree
Hide file tree
Showing 17 changed files with 22 additions and 22 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-macos.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: MacOS
name: macOS

# Run CI only when a release is created, on changes to main branch, or any PR
# to main. Do not run CI on any other branch. Also, skip any non-source changes
Expand Down Expand Up @@ -139,7 +139,7 @@ jobs:
# Note that the arm64 wheels cannot be tested on CI in this configuration
CIBW_ARCHS: ${{ matrix.macarch }}

# Setup MacOS dependencies
# Setup macOS dependencies
CIBW_BEFORE_ALL: |
brew install pkg-config
cd buildconfig/macdependencies
Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ Special thanks are also in order.
* David Clark for filling the right-hand-man position
* Ed Boraas and Francis Irving: Debian packages
* Maxim Sobolev: FreeBSD packaging
* Bob Ippolito: MacOS and OS X porting (much work!)
* Bob Ippolito: macOS and OS X porting (much work!)
* Jan Ekhol, Ray Kelm, and Peter Nicolai: putting up with early design ideas
* Nat Pryce for starting our unit tests
* Dan Richter for documentation work
Expand Down
4 changes: 2 additions & 2 deletions buildconfig/macdependencies/README.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Mac dependencies using manylinux build scripts

This uses manylinux build scripts to build dependencies on MacOS.
This uses manylinux build scripts to build dependencies on macOS.

Designed to be run on a Virtual Machine that can be destroyed.
It deletes some homebrew files, and messes with /usr/local/.
Expand Down Expand Up @@ -28,7 +28,7 @@ fi

## Future work

### MacOS doesn't come with gnu compatible readlink
### macOS doesn't come with gnu compatible readlink

It currently relies on GNU `readlink` to build, which is provided
by the coreutils homebrew package. However, this could be fixed to be
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ cd $(dirname `readlink -f "$0"`)
# manylinux2014 i686/x86_64/aarch64 wheels)

# this file is only intended to work in our manylinux build system and not on
# MacOS, which has a modern enough cmake already
# macOS, which has a modern enough cmake already

# any cpython version can be used here
# (this must be updated when we drop 3.10 support after a few years)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ cd $TIFF
if [[ "$OSTYPE" == "linux-gnu"* ]]; then
./configure --disable-lzma --disable-webp --disable-zstd
elif [[ "$OSTYPE" == "darwin"* ]]; then
# Use CMake on MacOS because arm64 builds fail with weird errors in ./configure
# Use CMake on macOS because arm64 builds fail with weird errors in ./configure
cmake . $PG_BASE_CMAKE_FLAGS -Dlzma=OFF -Dwebp=OFF -Dzstd=OFF
fi

Expand Down
4 changes: 2 additions & 2 deletions buildconfig/manylinux-build/docker_base/ogg/build-ogg.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ cd $OGG
if [[ "$OSTYPE" == "linux-gnu"* ]]; then
./configure $ARCHS_CONFIG_FLAG
elif [[ "$OSTYPE" == "darwin"* ]]; then
# Use CMake on MacOS because ./configure doesn't generate dylib
# Use CMake on macOS because ./configure doesn't generate dylib
cmake . $PG_BASE_CMAKE_FLAGS
fi

Expand All @@ -35,7 +35,7 @@ cd $VORBIS
if [[ "$OSTYPE" == "linux-gnu"* ]]; then
./configure $ARCHS_CONFIG_FLAG
elif [[ "$OSTYPE" == "darwin"* ]]; then
# Use CMake on MacOS because ./configure doesn't generate dylib
# Use CMake on macOS because ./configure doesn't generate dylib
cmake . $PG_BASE_CMAKE_FLAGS
fi
make
Expand Down
2 changes: 1 addition & 1 deletion docs/reST/ref/cursors.rst
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ The following strings can be converted into cursor bitmaps with

Choose a constant from this list, pass it into ``pygame.cursors.Cursor(constant)``,
and you're good to go. Be advised that not all systems support every system
cursor, and you may get a substitution instead. For example, on MacOS,
cursor, and you may get a substitution instead. For example, on macOS,
WAIT/WAITARROW should show up as an arrow, and SIZENWSE/SIZENESW/SIZEALL
should show up as a closed hand. And on Wayland, every SIZE cursor should
show up as a hand.
Expand Down
4 changes: 2 additions & 2 deletions docs/reST/ref/sdl2_video.rst
Original file line number Diff line number Diff line change
Expand Up @@ -654,8 +654,8 @@


:class:`Renderer` objects provide a cross-platform API for rendering 2D
graphics onto a :class:`Window`, by using either Metal (MacOS), OpenGL
(MacOS, Windows, Linux) or Direct3D (Windows) rendering drivers, depending
graphics onto a :class:`Window`, by using either Metal (macOS), OpenGL
(macOS, Windows, Linux) or Direct3D (Windows) rendering drivers, depending
on what is set or is available on a system during their creation.

They can be used to draw both :class:`Texture` objects and simple points,
Expand Down
2 changes: 1 addition & 1 deletion docs/readmes/README.es.rst
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ Un agradecimiento especial también está en orden.
* David Clark for filling the right-hand-man position
* Ed Boraas and Francis Irving: Debian packages
* Maxim Sobolev: FreeBSD packaging
* Bob Ippolito: MacOS and OS X porting (much work!)
* Bob Ippolito: macOS and OS X porting (much work!)
* Jan Ekhol, Ray Kelm, and Peter Nicolai: putting up with early design ideas
* Nat Pryce for starting our unit tests
* Dan Richter for documentation work
Expand Down
2 changes: 1 addition & 1 deletion docs/readmes/README.fa.rst
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ Credits
* David Clark for filling the right-hand-man position
* Ed Boraas and Francis Irving: Debian packages
* Maxim Sobolev: FreeBSD packaging
* Bob Ippolito: MacOS and OS X porting (much work!)
* Bob Ippolito: macOS and OS X porting (much work!)
* Jan Ekhol, Ray Kelm, and Peter Nicolai: putting up with early design ideas
* Nat Pryce for starting our unit tests
* Dan Richter for documentation work
Expand Down
2 changes: 1 addition & 1 deletion docs/readmes/README.fr.rst
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ Des remerciements particuliers s'imposent également.
* David Clark for filling the right-hand-man position
* Ed Boraas and Francis Irving: Debian packages
* Maxim Sobolev: FreeBSD packaging
* Bob Ippolito: MacOS and OS X porting (much work!)
* Bob Ippolito: macOS and OS X porting (much work!)
* Jan Ekhol, Ray Kelm, and Peter Nicolai: putting up with early design ideas
* Nat Pryce for starting our unit tests
* Dan Richter for documentation work
Expand Down
2 changes: 1 addition & 1 deletion docs/readmes/README.zh-cn.rst
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ pygame-ce是上游pygame项目的分支,由此前pygame项目的核心开发
* David Clark for filling the right-hand-man position
* Ed Boraas and Francis Irving: Debian packages
* Maxim Sobolev: FreeBSD packaging
* Bob Ippolito: MacOS and OS X porting (much work!)
* Bob Ippolito: macOS and OS X porting (much work!)
* Jan Ekhol, Ray Kelm, and Peter Nicolai: putting up with early design ideas
* Nat Pryce for starting our unit tests
* Dan Richter for documentation work
Expand Down
2 changes: 1 addition & 1 deletion src_c/_sdl2/video.c

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions src_c/cython/pygame/_sdl2/video.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -808,8 +808,8 @@ cdef class Renderer:
:class:`Renderer` objects provide a cross-platform API for rendering 2D
graphics onto a :class:`Window`, by using either Metal (MacOS), OpenGL
(MacOS, Windows, Linux) or Direct3D (Windows) rendering drivers, depending
graphics onto a :class:`Window`, by using either Metal (macOS), OpenGL
(macOS, Windows, Linux) or Direct3D (Windows) rendering drivers, depending
on what is set or is available on a system during their creation.
They can be used to draw both :class:`Texture` objects and simple points,
Expand Down
2 changes: 1 addition & 1 deletion src_c/scrap.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
* The supported scrap clipboard types.
*
* This is only relevant in a X11 environment, which supports mouse
* selections as well. For Win32 and MacOS environments the default
* selections as well. For Win32 and macOS environments the default
* clipboard is used, no matter what value is passed.
*/
typedef enum {
Expand Down
2 changes: 1 addition & 1 deletion src_c/surface.c
Original file line number Diff line number Diff line change
Expand Up @@ -732,7 +732,7 @@ surface_init(pgSurfaceObject *self, PyObject *args, PyObject *kwds)
/* We ignore the error if any. */
SDL_SetSurfaceBlendMode(surface, SDL_BLENDMODE_NONE);

/* When the display format has a full alpha channel (MacOS right now),
/* When the display format has a full alpha channel (macOS right now),
* Surfaces may be created with an unreqested alpha channel, which
* could cause issues.
* pygame Surfaces are supposed to be (0, 0, 0, 255) by default.
Expand Down
2 changes: 1 addition & 1 deletion src_py/sysfont.py
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ def _font_finder_darwin():
def initsysfonts_darwin():
"""Read the fonts on macOS, and OS X."""
# if the X11 binary exists... try and use that.
# Not likely to be there on pre 10.4.x ... or MacOS 10.10+
# Not likely to be there on pre 10.4.x ... or macOS 10.10+
if exists("/usr/X11/bin/fc-list"):
fonts = initsysfonts_unix("/usr/X11/bin/fc-list")
# This fc-list path will work with the X11 from the OS X 10.3 installation
Expand Down

0 comments on commit 89f9fd3

Please sign in to comment.