Commit b17d8b42 authored by Andrew Murray's avatar Andrew Murray
Browse files

Corrected capitalisation of Python, CPython and PyPy

parent 738ba76c
...@@ -64,9 +64,9 @@ shell scripts listed above are available for your build and test. ...@@ -64,9 +64,9 @@ shell scripts listed above are available for your build and test.
OS X builds may be targetted either at macOS 10.6+ OS X builds may be targetted either at macOS 10.6+
(dual arch 64 / 32 bit) or macOS 10.9+ (64b only). These depend on the (dual arch 64 / 32 bit) or macOS 10.9+ (64b only). These depend on the
corresponding build of python from https://www.python.org/downloads/mac-osx/. corresponding build of python from https://www.python.org/downloads/mac-osx/.
At the time of writing, 10.9+ / 64 bit builds are supported for python At the time of writing, 10.9+ / 64 bit builds are supported for Python
versions 3.6.5 / 2.7.15 and above. If you want to build for an older version versions 3.6.5 / 2.7.15 and above. If you want to build for an older version
of python, you'll have to target 10.6+ / dual arch. of Python, you'll have to target 10.6+ / dual arch.
The ``build_wheel`` function builds the wheel, and the ``install_run`` The ``build_wheel`` function builds the wheel, and the ``install_run``
function installs the wheel and tests it. Look in ``common_utils.sh`` for function installs the wheel and tests it. Look in ``common_utils.sh`` for
......
...@@ -120,9 +120,9 @@ function pyinst_fname_for_version { ...@@ -120,9 +120,9 @@ function pyinst_fname_for_version {
# echo filename for OSX installer file given Python and minimum # echo filename for OSX installer file given Python and minimum
# macOS versions # macOS versions
# Parameters # Parameters
# $py_version (python version in major.minor.extra format) # $py_version (Python version in major.minor.extra format)
# $py_osx_ver: {major.minor | not defined} # $py_osx_ver: {major.minor | not defined}
# if defined, the macOS version that python is built for, e.g. # if defined, the macOS version that Python is built for, e.g.
# "10.6" or "10.9", if not defined, uses the default # "10.6" or "10.9", if not defined, uses the default
# MACPYTHON_DEFAULT_OSX # MACPYTHON_DEFAULT_OSX
# Note: this is the version the Python is built for, and hence # Note: this is the version the Python is built for, and hence
...@@ -135,11 +135,11 @@ function pyinst_fname_for_version { ...@@ -135,11 +135,11 @@ function pyinst_fname_for_version {
function mac_arch_for_pyosx_version { function mac_arch_for_pyosx_version {
# echo arch (intel or x86_64) that cpython builds targetted for the # echo arch (intel or x86_64) that CPython builds targetted for the
# given minimum macOS are targetted for # given minimum macOS are targetted for
# Parameters # Parameters
# $py_osx_ver (major.minor | not defined} # $py_osx_ver (major.minor | not defined}
# if defined, the macOS version that python is built for, e.g. # if defined, the macOS version that Python is built for, e.g.
# "10.6" or "10.9", if not defined, uses the default # "10.6" or "10.9", if not defined, uses the default
# MACPYTHON_DEFAULT_OSX # MACPYTHON_DEFAULT_OSX
py_osx_ver=${1:-$MACPYTHON_DEFAULT_OSX} py_osx_ver=${1:-$MACPYTHON_DEFAULT_OSX}
...@@ -161,8 +161,8 @@ function install_macpython { ...@@ -161,8 +161,8 @@ function install_macpython {
# $version : [implementation-]major[.minor[.patch]] # $version : [implementation-]major[.minor[.patch]]
# The Python implementation to install, e.g. "3.6" or "pypy-5.4" # The Python implementation to install, e.g. "3.6" or "pypy-5.4"
# $py_osx_ver: {major.minor | not defined} # $py_osx_ver: {major.minor | not defined}
# if defined, the macOS version that cpython is built for, e.g. # if defined, the macOS version that CPython is built for, e.g.
# "10.6" or "10.9". Ignored for pypy # "10.6" or "10.9". Ignored for PyPy
local version=$1 local version=$1
local py_osx_ver=$2 local py_osx_ver=$2
if [[ "$version" =~ pypy-([0-9\.]+) ]]; then if [[ "$version" =~ pypy-([0-9\.]+) ]]; then
...@@ -184,9 +184,9 @@ function install_mac_cpython { ...@@ -184,9 +184,9 @@ function install_mac_cpython {
# "3" or "3.4" or "3.4.1". # "3" or "3.4" or "3.4.1".
# $py_osx_ver # $py_osx_ver
# {major.minor | not defined} # {major.minor | not defined}
# if defined, the macOS version that python is built for, e.g. # if defined, the macOS version that Python is built for, e.g.
# "10.6" or "10.9" # "10.6" or "10.9"
# sets $PYTHON_EXE variable to python executable # sets $PYTHON_EXE variable to Python executable
local py_version=$(fill_pyver $1) local py_version=$(fill_pyver $1)
local py_osx_ver=$2 local py_osx_ver=$2
local py_stripped=$(strip_ver_suffix $py_version) local py_stripped=$(strip_ver_suffix $py_version)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment