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
4c02f1d8
Commit
4c02f1d8
authored
Feb 12, 2019
by
Rob Buckley
Browse files
remove spurious check_var breaking mac builds. clean up comments
parent
5250c581
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
16 deletions
+21
-16
.travis.yml
.travis.yml
+2
-2
osx_utils.sh
osx_utils.sh
+19
-14
No files found.
.travis.yml
View file @
4c02f1d8
...
@@ -122,8 +122,8 @@ matrix:
...
@@ -122,8 +122,8 @@ matrix:
env
:
env
:
-
PYTHON_VERSION=pypy-6.0
-
PYTHON_VERSION=pypy-6.0
-
VENV=venv
-
VENV=venv
#
# Default OSX (xcode image) is 10.13 (xcode 9.4.1) as of 2018-08-03
# Default OSX (xcode image) is 10.13 (xcode 9.4.1) as of 2018-08-03
#
# See: https://docs.travis-ci.com/user/reference/osx/
# See: https://docs.travis-ci.com/user/reference/osx/
-
os
:
osx
-
os
:
osx
osx_image
:
xcode10.1
osx_image
:
xcode10.1
env
:
env
:
...
...
osx_utils.sh
View file @
4c02f1d8
...
@@ -121,10 +121,12 @@ function pyinst_fname_for_version {
...
@@ -121,10 +121,12 @@ function pyinst_fname_for_version {
# macosx versions
# macosx versions
# Parameters
# Parameters
# $py_version (python version in major.minor.extra format)
# $py_version (python version in major.minor.extra format)
# $py_osx_ver (macosx version in major.minor format.
# $py_osx_ver: {major.minor | not defined}
# Note: this is the version the Python is built for,
# if defined, the macosx version that python is built for, e.g.
# and hence the min version supported, not the version
# "10.6" or "10.9", if not defined, uses the default
# of the current system
# MACPYTHON_DEFAULT_OSX
# Note: this is the version the Python is built for, and hence
# the min version supported, NOT the version of the current system
local
py_version
=
$1
local
py_version
=
$1
local
py_osx_ver
=
${
2
:-
$MACPYTHON_DEFAULT_OSX
}
local
py_osx_ver
=
${
2
:-
$MACPYTHON_DEFAULT_OSX
}
local
inst_ext
=
$(
pyinst_ext_for_version
$py_version
)
local
inst_ext
=
$(
pyinst_ext_for_version
$py_version
)
...
@@ -136,9 +138,8 @@ function mac_arch_for_pyosx_version {
...
@@ -136,9 +138,8 @@ 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 (python version in major.minor.extra format)
# $py_osx_ver (major.minor} the macosx version that python is built
# note this is the version the python is built for, not that of
# for, e.g. "10.6" or "10.9"
# the local system
py_osx_ver
=
$1
py_osx_ver
=
$1
check_var
$py_osx_ver
check_var
$py_osx_ver
if
[
$py_osx_ver
-eq
"10.6"
]
;
then
if
[
$py_osx_ver
-eq
"10.6"
]
;
then
...
@@ -157,15 +158,14 @@ function install_macpython {
...
@@ -157,15 +158,14 @@ function install_macpython {
# Parameters:
# Parameters:
# $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
# $py_osx_ver:
{
major.minor
| not defined}
#
the macosx version th
e
python is built for, e.g.
"10.6" or "10.9"
#
if defined,
the macosx version th
at c
python is built for, e.g.
#
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
install_mac_pypy
"
${
BASH_REMATCH
[1]
}
"
install_mac_pypy
"
${
BASH_REMATCH
[1]
}
"
elif
[[
"
$version
"
=
~
([
0-9
\.
]
+
)
]]
;
then
elif
[[
"
$version
"
=
~
([
0-9
\.
]
+
)
]]
;
then
check_var
$py_osx_ver
install_mac_cpython
"
${
BASH_REMATCH
[1]
}
"
$py_osx_ver
install_mac_cpython
"
${
BASH_REMATCH
[1]
}
"
$py_osx_ver
else
else
echo
"config error: Issue parsing this implementation in install_python:"
echo
"config error: Issue parsing this implementation in install_python:"
...
@@ -181,7 +181,9 @@ function install_mac_cpython {
...
@@ -181,7 +181,9 @@ function install_mac_cpython {
# Version given in major or major.minor or major.minor.micro e.g
# Version given in major or major.minor or major.minor.micro e.g
# "3" or "3.4" or "3.4.1".
# "3" or "3.4" or "3.4.1".
# $py_osx_ver
# $py_osx_ver
# the macosx version the python is built for e.g. "10.6" or "10.9"
# {major.minor | not defined}
# if defined, the macosx version that python is built for, e.g.
# "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
...
@@ -291,11 +293,14 @@ function get_macpython_environment {
...
@@ -291,11 +293,14 @@ function get_macpython_environment {
# Parameters:
# Parameters:
# $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]
# $py_osx_ver: {major.minor | not defined}
# The macosx version that python is built for, e.g. "10.6" or "10.9"
# if defined, the macosx version that python is built for, e.g.
# "10.6" or "10.9", if not defined, uses the default MACPYTHON_DEFAULT_OSX
# $venv_dir : {directory_name|not defined}
# $venv_dir : {directory_name|not defined}
# If defined - make virtualenv in this directory, set python / pip
# If defined - make virtualenv in this directory, set python / pip
# commands accordingly
# commands accordingly
# NOTE: to use the default for $py_osx_ver while defining $venv_dir, set
# $py_osx_ver to "" (empty string)
#
#
# Installs Python
# Installs Python
# Sets $PYTHON_EXE to path to Python executable
# Sets $PYTHON_EXE to path to Python executable
...
...
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