Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
fengzch-das
multibuild
Commits
b17d8b42
Commit
b17d8b42
authored
Feb 18, 2019
by
Andrew Murray
Browse files
Corrected capitalisation of Python, CPython and PyPy
parent
738ba76c
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
10 deletions
+10
-10
README.rst
README.rst
+2
-2
osx_utils.sh
osx_utils.sh
+8
-8
No files found.
README.rst
View file @
b17d8b42
...
...
@@ -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+
(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/.
At the time of writing, 10.9+ / 64 bit builds are supported for
p
ython
At the time of writing, 10.9+ / 64 bit builds are supported for
P
ython
versions 3.6.5 / 2.7.15 and above. If you want to build for an older version
of
p
ython, you'll have to target 10.6+ / dual arch.
of
P
ython, you'll have to target 10.6+ / dual arch.
The ``build_wheel`` function builds the wheel, and the ``install_run``
function installs the wheel and tests it. Look in ``common_utils.sh`` for
...
...
osx_utils.sh
View file @
b17d8b42
...
...
@@ -120,9 +120,9 @@ function pyinst_fname_for_version {
# echo filename for OSX installer file given Python and minimum
# macOS versions
# Parameters
# $py_version (
p
ython version in major.minor.extra format)
# $py_version (
P
ython version in major.minor.extra format)
# $py_osx_ver: {major.minor | not defined}
# if defined, the macOS version that
p
ython is built for, e.g.
# if defined, the macOS version that
P
ython is built for, e.g.
# "10.6" or "10.9", if not defined, uses the default
# MACPYTHON_DEFAULT_OSX
# Note: this is the version the Python is built for, and hence
...
...
@@ -135,11 +135,11 @@ function pyinst_fname_for_version {
function
mac_arch_for_pyosx_version
{
# echo arch (intel or x86_64) that
cp
ython builds targetted for the
# echo arch (intel or x86_64) that
CP
ython builds targetted for the
# given minimum macOS are targetted for
# Parameters
# $py_osx_ver (major.minor | not defined}
# if defined, the macOS version that
p
ython is built for, e.g.
# if defined, the macOS version that
P
ython is built for, e.g.
# "10.6" or "10.9", if not defined, uses the default
# MACPYTHON_DEFAULT_OSX
py_osx_ver
=
${
1
:-
$MACPYTHON_DEFAULT_OSX
}
...
...
@@ -161,8 +161,8 @@ function install_macpython {
# $version : [implementation-]major[.minor[.patch]]
# The Python implementation to install, e.g. "3.6" or "pypy-5.4"
# $py_osx_ver: {major.minor | not defined}
# if defined, the macOS version that
cp
ython is built for, e.g.
# "10.6" or "10.9". Ignored for
pyp
y
# if defined, the macOS version that
CP
ython is built for, e.g.
# "10.6" or "10.9". Ignored for
PyP
y
local
version
=
$1
local
py_osx_ver
=
$2
if
[[
"
$version
"
=
~ pypy-
([
0-9
\.
]
+
)
]]
;
then
...
...
@@ -184,9 +184,9 @@ function install_mac_cpython {
# "3" or "3.4" or "3.4.1".
# $py_osx_ver
# {major.minor | not defined}
# if defined, the macOS version that
p
ython is built for, e.g.
# if defined, the macOS version that
P
ython is built for, e.g.
# "10.6" or "10.9"
# sets $PYTHON_EXE variable to
p
ython executable
# sets $PYTHON_EXE variable to
P
ython executable
local
py_version
=
$(
fill_pyver
$1
)
local
py_osx_ver
=
$2
local
py_stripped
=
$(
strip_ver_suffix
$py_version
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment