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

Parallelize builds and upgrade build environments (#4749)

Browse Source 
* Parallelize QWT builds
* Upgrade macOS Builds to Sonoma with Xcode 15.2 and Qt 6.6
* Upgrade Windows builds to Visual Studio 2022
This commit is contained in:
Magnus Gille
2025-12-21 13:24:27 -08:00
committed by GitHub
parent be01a861b8
commit 03ca4fdbc3
3 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
appveyor.yml
View File

@@ -6,9 +6,9 @@ branches:
- master - master
image: image:
- macos-monterey - Visual Studio 2022
- Ubuntu2204 - Ubuntu2204
- Visual Studio 2019 - macos-sonoma
environment: environment:
APPVEYOR_SAVE_CACHE_ON_ERROR: true APPVEYOR_SAVE_CACHE_ON_ERROR: true
@@ -58,8 +58,8 @@ init:
- cmd: set QTDIR=C:\Qt\6.8\msvc2022_64 - cmd: set QTDIR=C:\Qt\6.8\msvc2022_64
- cmd: set PATH=%QTDIR%\bin;%PATH% - cmd: set PATH=%QTDIR%\bin;%PATH%
- cmd: qmake --version - cmd: qmake --version
# Setup MSVC - VS 2019 # Setup MSVC - VS 2022
- cmd: call c:\"Program Files (x86)"\"Microsoft Visual Studio"\2019\Community\VC\Auxiliary\Build\vcvarsall.bat amd64 - cmd: call c:\"Program Files"\"Microsoft Visual Studio"\2022\Community\VC\Auxiliary\Build\vcvarsall.bat amd64
# Setup NSIS # Setup NSIS
- cmd: set PATH=%PATH%;C:\"Program Files (x86)"\NSIS - cmd: set PATH=%PATH%;C:\"Program Files (x86)"\NSIS
# install Python 3.7 # install Python 3.7
@@ -81,12 +81,12 @@ init:
qmake --version qmake --version
else else
export OS_NAME=macos export OS_NAME=macos
# Setup QT 6.5 # Setup QT 6.6
export QTDIR=$HOME/Qt/6.5/macos export QTDIR=$HOME/Qt/6.6/macos
export PATH=$QTDIR/bin:$PATH export PATH=$QTDIR/bin:$PATH
qmake --version qmake --version
# Setup Xcode 14.2 # Setup Xcode 15.2
sudo xcode-select -s /Applications/Xcode-14.2.0.app sudo xcode-select -s /Applications/Xcode-15.2.0.app
fi fi
cache: cache:
@@ -223,12 +223,12 @@ build_script:
# Windows # Windows
- cmd: qmake.exe build.pro -r -spec win32-msvc - cmd: qmake.exe build.pro -r -spec win32-msvc
- cmd: if not exist qwt\lib\qwt.lib jom -j1 sub-qwt - cmd: if not exist qwt\lib\qwt.lib jom -j2 sub-qwt
- cmd: jom -j2 sub-src - cmd: jom -j2 sub-src
# Linux / macOS # Linux / macOS
- sh: qmake build.pro -r 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" - sh: qmake build.pro -r 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"
- sh: if test ! -f qwt/lib/libqwt.a; then make sub-qwt; fi - sh: if test ! -f qwt/lib/libqwt.a; then make -j2 sub-qwt; fi
- sh: make -j2 sub-src - sh: make -j2 sub-src
after_build: after_build:

1
qwt/src/src.pro
View File

@@ -16,6 +16,7 @@ include( $${QWT_ROOT}/qwtfunctions.pri )
# Fix for parallel build race condition where moc_predefs.h is missing # Fix for parallel build race condition where moc_predefs.h is missing
compiler_moc_header_make_all.depends += compiler_moc_predefs_make_all compiler_moc_header_make_all.depends += compiler_moc_predefs_make_all
compiler_moc_source_make_all.depends += compiler_moc_predefs_make_all
QWT_OUT_ROOT = $${OUT_PWD}/.. QWT_OUT_ROOT = $${OUT_PWD}/..

2
src/Resources/win32/GC3.7-Master-W64-QT6.nsi
View File

@@ -310,7 +310,7 @@ Section /o "Visual C++ Redistributable" Sec2
SectionEnd SectionEnd
LangString DESC_Sec1 ${LANG_ENGLISH} "Golden Cheetah for Windows - 64Bit" LangString DESC_Sec1 ${LANG_ENGLISH} "Golden Cheetah for Windows - 64Bit"
LangString DESC_Sec2 ${LANG_ENGLISH} "Microsoft Visual C++ 2015-2019 Redistributable (x64) is required to run Golden Cheetah for Windows" LangString DESC_Sec2 ${LANG_ENGLISH} "Microsoft Visual C++ 2015-2022 Redistributable (x64) is required to run Golden Cheetah for Windows"
!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
!insertmacro MUI_DESCRIPTION_TEXT ${Sec1} $(DESC_Sec1) !insertmacro MUI_DESCRIPTION_TEXT ${Sec1} $(DESC_Sec1)