nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-02-15 08:59:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade Travis-ci macOS version

Browse Source 
[skip AppVeyor]
To macOS 11.6
Upgrade D2XX drivers to supported versions
This commit is contained in:
Alejandro Martinez
2023-09-23 21:13:18 -03:00
parent a904147b63
commit 9ae7521e50
4 changed files with 17 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@@ -46,7 +46,7 @@ env:
jobs:
include:
- os: osx
osx_image: xcode11.3
osx_image: xcode13.1
compiler: clang
- os: linux
dist: focal

34
travis/osx/before_install.sh
View File

@@ -6,31 +6,17 @@ date
export HOMEBREW_NO_AUTO_UPDATE=1
export HOMEBREW_NO_INSTALL_CLEANUP=1
brew unlink python@2 # to avoid conflicts with qt/libical dependence on python
#brew upgrade qt5 # to get 5.15.x
/usr/local/opt/qt5/bin/qmake --version
brew install qt5
brew install bison@2.7
brew install gsl
brew install libical
brew upgrade libusb
#brew install libsamplerate
brew install libsamplerate
rm -rf '/usr/local/include/c++'
## Disable KML for now
## brew install --HEAD travis/libkml.rb
sudo chmod -R +w /usr/local
brew update
brew install bison@2.7
# GSL - install from source due to homebrew issues
curl -k -O https://ftp.gnu.org/gnu/gsl/gsl-2.6.tar.gz
tar xf gsl-2.6.tar.gz
cd gsl-2.6
sudo chown -R $USER .
./configure && make -j3 --silent
sudo make install
cd ..
# R 4.1.1
curl -L -O https://cran.r-project.org/bin/macosx/base/R-4.1.1.pkg
sudo installer -pkg R-4.1.1.pkg -target /
@@ -48,12 +34,14 @@ cd ..
# D2XX - refresh cache if folder is empty
if [ -z "$(ls -A D2XX)" ]; then
curl -O https://www.ftdichip.com/Drivers/D2XX/MacOSX/D2XX1.2.2.dmg
hdiutil mount D2XX1.2.2.dmg
cp /Volumes/release/D2XX/Object/10.5-10.7/x86_64/libftd2xx.1.2.2.dylib D2XX
cp /Volumes/release/D2XX/bin/*.h D2XX
curl -O https://ftdichip.com/wp-content/uploads/2021/05/D2XX1.4.24.zip
unzip D2XX1.4.24.zip
hdiutil mount D2XX1.4.24.dmg
cp /Volumes/dmg/release/build/libftd2xx.1.4.24.dylib D2XX
cp /Volumes/dmg/release/build/libftd2xx.a D2XX
cp /Volumes/dmg/release/*.h D2XX
fi
sudo cp D2XX/libftd2xx.1.2.2.dylib /usr/local/lib
sudo cp D2XX/libftd2xx.1.4.24.dylib /usr/local/lib
# VLC
if [[ -z "$(ls -A VLC)" ]]; then

9
travis/osx/before_script.sh
View File

@@ -35,9 +35,9 @@ sed -i "" "s|^#LIBZ|LIBZ|" src/gcconfig.pri
# SRMIO
sed -i "" "s|#\(SRMIO_INSTALL =.*\)|\1 /usr/local|" src/gcconfig.pri
# D2XX
sed -i "" "s|libftd2xx.dylib|@executable_path/../Frameworks/libftd2xx.1.2.2.dylib|" src/FileIO/D2XX.cpp
sed -i "" "s|libftd2xx.dylib|@executable_path/../Frameworks/libftd2xx.1.4.24.dylib|" src/FileIO/D2XX.cpp
sed -i "" "s|#\(D2XX_INCLUDE =.*\)|\1 ../D2XX|" src/gcconfig.pri
sed -i "" "s|#\(D2XX_LIBS =.*\)|\1 -L../D2XX -lftd2xx.1.2.2|" src/gcconfig.pri
sed -i "" "s|#\(D2XX_LIBS =.*\)|\1 -L../D2XX -lftd2xx|" src/gcconfig.pri
## Disable KML for now
#sed -i "" "s|#\(KML_INSTALL =\).*|\1 /usr/local|" src/gcconfig.pri
#sed -i "" "s|#\(KML_LIBS =.*\)|\1 -L/usr/local/lib -lkmlxsd -lkmlregionator -lkmldom -lkmlconvenience -lkmlengine -lkmlbase -lexpect|" src/gcconfig.pri
@@ -46,9 +46,8 @@ sed -i "" "s|#\(ICAL_LIBS =.*\)|\1 -L/usr/local/lib -lical|" src/gcconfig.pri
sed -i "" "s|#\(LIBUSB_INSTALL =\).*|\1 /usr/local|" src/gcconfig.pri
sed -i "" "s|#\(LIBUSB_LIBS =.*\)|\1 -L/usr/local/lib -lusb-1.0|" src/gcconfig.pri
sed -i "" "s|#\(LIBUSB_USE_V_1 = true.*\)|\1|" src/gcconfig.pri
# Disable libsamplerate due to HomeBrew install problems
#sed -i "" "s|#\(SAMPLERATE_INSTALL =\).*|\1 /usr/local|" src/gcconfig.pri
#sed -i "" "s|#\(SAMPLERATE_LIBS =\).*|\1 -L/usr/local/lib -lsamplerate|" src/gcconfig.pri
sed -i "" "s|#\(SAMPLERATE_INSTALL =\).*|\1 /usr/local|" src/gcconfig.pri
sed -i "" "s|#\(SAMPLERATE_LIBS =\).*|\1 -L/usr/local/lib -lsamplerate|" src/gcconfig.pri
sed -i "" "s|#\(LMFIT_INSTALL =\).*|\1 /usr/local|" src/gcconfig.pri
sed -i "" "s|#\(DEFINES += GC_HAVE_LION*\)|\1|" src/gcconfig.pri
sed -i "" "s|#\(HTPATH = ../httpserver.*\)|\1 |" src/gcconfig.pri

2
travis/osx/script.sh
View File

@@ -5,6 +5,6 @@ if [ -z "$(ls -A src/GoldenCheetah.app)" ]; then
CC=clang CXX=clang++ /usr/local/opt/qt5/bin/qmake -makefile -recursive QMAKE_CXXFLAGS_WARN_ON+="-Wno-unused-private-field -Wno-c++11-narrowing -Wno-deprecated-declarations -Wno-deprecated-register -Wno-nullability-completeness -Wno-sign-compare -Wno-inconsistent-missing-override" QMAKE_CFLAGS_WARN_ON+="-Wno-deprecated-declarations -Wno-sign-compare"
CC=clang CXX=clang++ make qmake_all
CC=clang CXX=clang++ make -j4 sub-qwt --silent
CC=clang CXX=clang++ make -j4 sub-src --silent || CC=clang CXX=clang++ make sub-src
CC=clang CXX=clang++ make -j4 sub-src
fi
exit