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
ab286574
Commit
ab286574
authored
Feb 12, 2019
by
Rob Buckley
Browse files
remove MACPYTHON_DEFAULT_OSX logic from test_multibuild.sh and travis_osx_steps.sh
parent
27dc9a4c
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
6 deletions
+2
-6
tests/test_multibuild.sh
tests/test_multibuild.sh
+1
-3
travis_osx_steps.sh
travis_osx_steps.sh
+1
-3
No files found.
tests/test_multibuild.sh
View file @
ab286574
...
...
@@ -8,9 +8,7 @@ source tests/test_common_utils.sh
source
tests/test_fill_submodule.sh
if
[
-n
"
$IS_OSX
"
]
;
then
source
osx_utils.sh
# osx_utils defines MACPYTHON_DEFAULT_OSX
MB_PYTHON_OSX_VER
=
${
MB_PYTHON_OSX_VER
:-
$MACPYTHON_DEFAULT_OSX
}
get_macpython_environment
$PYTHON_VERSION
$MB_PYTHON_OSX_VER
$VENV
get_macpython_environment
$PYTHON_VERSION
{
$MB_PYTHON_OSX_VER
:-
""
}
$VENV
source
tests/test_python_install.sh
source
tests/test_fill_pyver.sh
source
tests/test_fill_pypy_ver.sh
...
...
travis_osx_steps.sh
View file @
ab286574
...
...
@@ -9,8 +9,6 @@ ENV_VARS_PATH=${ENV_VARS_PATH:-env_vars.sh}
# These load common_utils.sh
source
$MULTIBUILD_DIR
/osx_utils.sh
# osx_utils defines MACPYTHON_DEFAULT_OSX
MB_PYTHON_OSX_VER
=
${
$MB_PYTHON_OSX_VER
:-
$MACPYTHON_DEFAULT_OSX
}
if
[
-r
"
$ENV_VARS_PATH
"
]
;
then
source
"
$ENV_VARS_PATH
"
;
fi
source
$MULTIBUILD_DIR
/configure_build.sh
source
$MULTIBUILD_DIR
/library_builders.sh
...
...
@@ -23,7 +21,7 @@ function before_install {
brew cask uninstall oclint
||
true
export
CC
=
clang
export
CXX
=
clang++
get_macpython_environment
$MB_PYTHON_VERSION
$MB_PYTHON_OSX_VER
venv
get_macpython_environment
$MB_PYTHON_VERSION
$
{
MB_PYTHON_OSX_VER
:-
""
}
venv
source
venv/bin/activate
pip
install
--upgrade
pip wheel
}
...
...
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