nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-02-13 16:18:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Install Python 3.7.8 for macOS Travis-ci builds

Browse Source 
[skip appveyor]
Homebrew has upgraded python3 to 3.8.3 and, due to how dependences
are handled, it is difficult to continue to use Homebrew Python 3.7
This commit is contained in:
Ale Martinez
2020-07-09 20:32:56 -03:00
parent b91c8395c0
commit 9b2226d3ba
2 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
travis/osx/after_success.sh
View File

@@ -10,14 +10,15 @@ mkdir GoldenCheetah.app/Contents/Frameworks
# This is a hack to include libicudata.*.dylib, not handled by macdployqt[fix]
cp /usr/local/opt/icu4c/lib/libicudata.*.dylib GoldenCheetah.app/Contents/Frameworks
# Copy python framework and change the path in binaries
cp -R /usr/local/opt/python/Frameworks/Python.framework GoldenCheetah.app/Contents/Frameworks
# Copy python framework and change permissions to fix paths
cp -R /Library/Frameworks/Python.framework GoldenCheetah.app/Contents/Frameworks
chmod -R +w GoldenCheetah.app/Contents/Frameworks
# Update deployed Python framework path
install_name_tool -id @executable_path/../Frameworks/Python.framework/Versions/3.7/Python ./GoldenCheetah.app/Contents/Frameworks/Python.framework/Versions/3.7/Python
# Update GoldenCheetah binary to reference deployed lib
install_name_tool -change /usr/local/opt/python/Frameworks/Python.framework/Versions/3.7/Python @executable_path/../Frameworks/Python.framework/Versions/3.7/Python ./GoldenCheetah.app/Contents/MacOS/GoldenCheetah
install_name_tool -change /Library/Frameworks/Python.framework/Versions/3.7/Python @executable_path/../Frameworks/Python.framework/Versions/3.7/Python ./GoldenCheetah.app/Contents/MacOS/GoldenCheetah
# Update Python binary to reference deployed lib instead of the Cellar one
OLD_PATH=`otool -L GoldenCheetah.app/Contents/Frameworks/Python.framework/Versions/3.7/bin/python3.7 | grep "local" | cut -f 1 -d ' '`
OLD_PATH=`otool -L GoldenCheetah.app/Contents/Frameworks/Python.framework/Versions/3.7/bin/python3.7 | grep "Library" | cut -f 1 -d ' '`
echo $OLD_PATH
install_name_tool -change $OLD_PATH "@executable_path/../Python" GoldenCheetah.app/Contents/Frameworks/Python.framework/Versions/3.7/bin/python3.7
install_name_tool -change $OLD_PATH "@executable_path/../../../../Python" GoldenCheetah.app/Contents/Frameworks/Python.framework/Versions/3.7/Resources/Python.app/Contents/MacOS/Python
@@ -42,9 +43,6 @@ popd
# Final deployment to generate dmg
/usr/local/opt/qt5/bin/macdeployqt GoldenCheetah.app -verbose=2 -fs=hfs+ -dmg
# Fix remaining issues
python ../travis/macdeployqtfix.py GoldenCheetah.app /usr/local/opt/qt5
echo "Renaming dmg file to branch and build number ready for deploy"
export FINAL_NAME=GoldenCheetah_v3.6-DEV_x64.dmg
mv GoldenCheetah.dmg $FINAL_NAME

11
travis/osx/before_script.sh
View File

@@ -1,12 +1,9 @@
#!/bin/bash
set -ev
# Create simlinks to python3.7 binaries, likely removed during upgrade to 3.8
sudo ln -s /usr/local/Cellar/python/3.7.5/Frameworks/Python.framework/Versions/3.7 /usr/local/opt/python/Frameworks/Python.framework/Versions/3.7
sudo ln -s /usr/local/Cellar/python/3.7.5/Frameworks/Python.framework/Versions/3.7/bin/python3.7 /usr/local/opt/python/bin
sudo ln -s /usr/local/Cellar/python/3.7.5/Frameworks/Python.framework/Versions/3.7/bin/python3.7 /usr/local/bin
sudo ln -s /usr/local/Cellar/python/3.7.5/Frameworks/Python.framework/Versions/3.7/bin/python3.7-config /usr/local/opt/python/bin
sudo ln -s /usr/local/Cellar/python/3.7.5/Frameworks/Python.framework/Versions/3.7/bin/python3.7-config /usr/local/bin
# Python 3.7.8
curl -O https://www.python.org/ftp/python/3.7.8/python-3.7.8-macosx10.9.pkg
sudo installer -pkg python-3.7.8-macosx10.9.pkg -target /
python3.7 --version
python3.7-config --prefix
@@ -21,7 +18,7 @@ curl -O https://www.riverbankcomputing.com/static/Downloads/sip/4.19.8/sip-4.19.
tar xf sip-4.19.8.tar.gz
cd sip-4.19.8
python3.7 configure.py
make
make -j4
sudo make install
cd ..