RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move all the little scripts back into .travis.yml, use less specific paths when searching for openssl and python2.7

This commit is contained in:
Donny Lawrence 2018-06-01 12:47:59 -05:00
parent 3a678fb738
commit d8f3a669c2
3 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
.travis.yml
View File

@ -57,9 +57,15 @@ before_install:
install:
- >
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
./.travis/install_macos.sh;
brew install python@3 eigen libtar fftw libsquish zlib ffmpeg freetype \
bullet opencv assimp libvorbis openssl || true
brew install ode --with-shared
# We can't trust brew to make the right symlinks, so execute commands as modules
${PYTHON_INTERP:-python3} -m pip install virtualenv
${PYTHON_INTERP:-python3} -m virtualenv venv
else
virtualenv --python=${PYTHON_INTERP:-python3} venv;
virtualenv --python=${PYTHON_INTERP:-python3} venv
fi
- source venv/bin/activate
- pip install pytest
@ -71,10 +77,16 @@ before_script:
script:
- >
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
../.travis/script_macos.sh;
if [[ "$PYTHON_INTERP" == "python2.7" ]]; then
export PY2_CMAKE_ARGS=-DPYTHON_EXECUTABLE=/usr/local/Frameworks/Python.framework/Versions/2.7/bin/python
fi
cmake -DHAVE_CARBON=NO -DBUILD_METALIBS=$BUILD_METALIBS \
-DCOMPOSITE_SOURCE_LIMIT=$COMPOSITE_SOURCE_LIMIT \
-DOPENSSL_ROOT_DIR=/usr/local/opt/openssl $PY2_CMAKE_ARGS ..
else
cmake -DHAVE_GTK2=NO -DBUILD_METALIBS=$BUILD_METALIBS \
-DCOMPOSITE_SOURCE_LIMIT=$COMPOSITE_SOURCE_LIMIT ..;
-DCOMPOSITE_SOURCE_LIMIT=$COMPOSITE_SOURCE_LIMIT ..
fi
- make -j4

9
.travis/install_macos.sh
View File

@ -1,9 +0,0 @@
#!/bin/bash
brew install python@3 eigen libtar fftw libsquish zlib ffmpeg freetype bullet \
wxmac opencv assimp libvorbis openssl@1.0 || true
brew install ode --with-shared
# We can't trust brew to make the right symlinks, so execute commands as modules
${PYTHON_INTERP:-python3} -m pip install virtualenv
${PYTHON_INTERP:-python3} -m virtualenv venv

9
.travis/script_macos.sh
View File

@ -1,9 +0,0 @@
#!/bin/bash
if [[ "$PYTHON_INTERP" == "python2.7" ]]; then
export PY2_CMAKE_ARGS="-DPYTHON_EXECUTABLE=/usr/local/bin/python -DPYTHON_LIBRARY=/usr/local/opt/python@2/Frameworks/Python.framework/Versions/2.7/lib/libpython2.7.dylib"
fi
cmake -DHAVE_CARBON=NO -DOPENSSL_ROOT_DIR=/usr/local/Cellar/openssl/1.0.2o_1 \
-DBUILD_METALIBS=$BUILD_METALIBS -DCOMPOSITE_SOURCE_LIMIT=$COMPOSITE_SOURCE_LIMIT \
$PY2_CMAKE_ARGS ..