diff --git a/appveyor.yml b/appveyor.yml index 3006e0047..45328863a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -258,11 +258,11 @@ after_build: - cmd: copy ..\Resources\win32\gc.ico # Installer script -- cmd: copy ..\Resources\win32\GC3.7-Master-W64-QT6.nsi +- cmd: copy ..\Resources\win32\GC3.8-Master-W64-QT6.nsi # Build the installer -- cmd: makensis GC3.7-Master-W64-QT6.nsi -- cmd: move GoldenCheetah_v3.7.1_64bit_Windows.exe ..\..\GoldenCheetah_v3.7_x64.exe +- cmd: makensis GC3.8-Master-W64-QT6.nsi +- cmd: move GoldenCheetah_v3.8_64bit_Windows.exe ..\..\GoldenCheetah_v3.8_x64.exe - cmd: cd ..\.. # Linux / macOS @@ -273,36 +273,36 @@ test_script: # Windows - cmd: src\release\GoldenCheetah --version 2>GCversionWindows.txt - cmd: git log -1 >> GCversionWindows.txt -- ps: if ($isWindows) { CertUtil -hashfile GoldenCheetah_v3.7_x64.exe sha256 | Select-Object -First 2 | Add-Content GCversionWindows.txt } +- ps: if ($isWindows) { CertUtil -hashfile GoldenCheetah_v3.8_x64.exe sha256 | Select-Object -First 2 | Add-Content GCversionWindows.txt } - cmd: type GCversionWindows.txt # Linux / macOS - sh: >- if $CI_LINUX; then - ./GoldenCheetah_v3.7_x64.AppImage --version 2>GCversionLinux.txt + ./GoldenCheetah_v3.8_x64.AppImage --version 2>GCversionLinux.txt git log -1 >> GCversionLinux.txt - shasum -a 256 GoldenCheetah_v3.7_x64.AppImage | cut -f 1 -d ' ' >> GCversionLinux.txt + shasum -a 256 GoldenCheetah_v3.8_x64.AppImage | cut -f 1 -d ' ' >> GCversionLinux.txt cat GCversionLinux.txt else src/GoldenCheetah.app/Contents/MacOS/GoldenCheetah --version 2>GCversionMacOS.txt git log -1 >> GCversionMacOS.txt - shasum -a 256 GoldenCheetah_v3.7_x64.dmg | cut -f 1 -d ' ' >> GCversionMacOS.txt + shasum -a 256 GoldenCheetah_v3.8_x64.dmg | cut -f 1 -d ' ' >> GCversionMacOS.txt cat GCversionMacOS.txt fi artifacts: # Windows -- path: GoldenCheetah_v3.7_x64.exe +- path: GoldenCheetah_v3.8_x64.exe name: GCwindowsInstaller - path: GCversionWindows.txt name: GCversionWindows # macOS -- path: GoldenCheetah_v3.7_x64.dmg +- path: GoldenCheetah_v3.8_x64.dmg name: GCmacOSpackage - path: GCversionMacOS.txt name: GCversionMacOS # Linux -- path: GoldenCheetah_v3.7_x64.AppImage +- path: GoldenCheetah_v3.8_x64.AppImage name: GClinuxAppImage - path: GCversionLinux.txt name: GCversionLinux diff --git a/appveyor/linux/after_build.sh b/appveyor/linux/after_build.sh index 776dbafb4..1f479fee3 100644 --- a/appveyor/linux/after_build.sh +++ b/appveyor/linux/after_build.sh @@ -67,6 +67,6 @@ then echo "AppImage not generated, check the errors"; exit 1 fi echo "Renaming AppImage file to version number ready for deploy" -mv GoldenCheetah*.AppImage ../GoldenCheetah_v3.7_x64.AppImage +mv GoldenCheetah*.AppImage ../GoldenCheetah_v3.8_x64.AppImage exit diff --git a/appveyor/macos/after_build.sh b/appveyor/macos/after_build.sh index 8696e7be6..c4dff8828 100755 --- a/appveyor/macos/after_build.sh +++ b/appveyor/macos/after_build.sh @@ -28,6 +28,6 @@ cp -R ../site-packages GoldenCheetah.app/Contents/Frameworks/Python.framework/Ve macdeployqt GoldenCheetah.app -verbose=2 -executable=GoldenCheetah.app/Contents/MacOS/GoldenCheetah -fs=hfs+ -dmg echo "Renaming dmg file to branch and build number ready for deploy" -mv GoldenCheetah.dmg ../GoldenCheetah_v3.7_x64.dmg +mv GoldenCheetah.dmg ../GoldenCheetah_v3.8_x64.dmg exit diff --git a/src/Core/GcUpgrade.h b/src/Core/GcUpgrade.h index bc67330d7..aeb0d767e 100644 --- a/src/Core/GcUpgrade.h +++ b/src/Core/GcUpgrade.h @@ -113,6 +113,7 @@ // 5004 - V3.7 DEVELOPMENT 2412 (DEC 2024) // 5005 - V3.7 RELEASE (March 2025) // 5006 - V3.7 SP1 RELEASE (November 2025) +// 5010 - V3.8 DEVELOPMENT 2601 (JAN 2026) #define VERSION3_BUILD 3010 // released #define VERSION3_SP1 3030 // released @@ -125,15 +126,16 @@ #define VERSION35_BUILD 3990 // released #define VERSION36_BUILD 5000 // released 5/8/23 #define VERSION37_BUILD 5005 // released 28/3/25 -#define VERSION37_SP1 5006 // released 20/11/25 - latest snapshot 14/12/25 +#define VERSION37_SP1 5006 // released 20/11/25 +#define VERSION38_DEV2601 5010 // (Jan 2026) - latest snapshot 6/1/26 // will keep changing during testing and before final release #define VERSION31_BUILD VERSION31_UPG // the next two will with each build/release -#define VERSION_LATEST 5006 -#define VERSION_STRING "V3.7.1" -//#define GC_VERSION VERSION_STRING // To force version string on non-tagged ci builds +#define VERSION_LATEST 5010 +#define VERSION_STRING "V3.8" +#define GC_VERSION VERSION_STRING // To force version string on non-tagged ci builds // default config for this release cycle #define VERSION_CONFIG_PREFIX "http://www.goldencheetah.org/defaults/3.8" diff --git a/src/Resources/linux/MakeAppImageQt6.sh b/src/Resources/linux/MakeAppImageQt6.sh index de6705775..d03f3ff21 100755 --- a/src/Resources/linux/MakeAppImageQt6.sh +++ b/src/Resources/linux/MakeAppImageQt6.sh @@ -75,7 +75,7 @@ then echo "AppImage not generated, check the errors"; exit 1 fi echo "Renaming AppImage file to branch and build number ready for deploy" -export FINAL_NAME=GoldenCheetah_v3.7_x64Qt6.AppImage +export FINAL_NAME=GoldenCheetah_v3.8_x64Qt6.AppImage mv -f GoldenCheetah-x86_64.AppImage $FINAL_NAME ls -l $FINAL_NAME diff --git a/src/Resources/mac/Info.plist.app b/src/Resources/mac/Info.plist.app index cd71bcc08..5fcc8bbbf 100644 --- a/src/Resources/mac/Info.plist.app +++ b/src/Resources/mac/Info.plist.app @@ -9,9 +9,9 @@ CFBundlePackageType APPL CFBundleShortVersionString - 3.7.1 + 3.8.0 CFBundleVersion - 3.7.1 + 3.8.0 CFBundleSignature @TYPEINFO@ CFBundleExecutable diff --git a/src/Resources/mac/MakeAppDmgQt6.sh b/src/Resources/mac/MakeAppDmgQt6.sh index 3618ad0a7..16019cf65 100644 --- a/src/Resources/mac/MakeAppDmgQt6.sh +++ b/src/Resources/mac/MakeAppDmgQt6.sh @@ -30,7 +30,7 @@ macdeployqt GoldenCheetah.app -verbose=2 -executable=GoldenCheetah.app/Contents/ macdeployqt GoldenCheetah.app -verbose=2 -fs=hfs+ -dmg echo "Renaming dmg file to branch and build number ready for deploy" -export FINAL_NAME=GoldenCheetah_v3.7_x64Qt6.dmg +export FINAL_NAME=GoldenCheetah_v3.8_x64Qt6.dmg mv GoldenCheetah.dmg $FINAL_NAME ls -l $FINAL_NAME diff --git a/src/Resources/win32/GC3.7-Master-W64-QT5.nsi b/src/Resources/win32/GC3.7-Master-W64-QT5.nsi deleted file mode 100644 index fd0c348f2..000000000 --- a/src/Resources/win32/GC3.7-Master-W64-QT5.nsi +++ /dev/null @@ -1,585 +0,0 @@ -; Script generated by the HM NIS Edit Script Wizard. - -; Build Unicode target (from NIS 3.x) -Unicode true - -Function .onInit - System::Call 'kernel32::CreateMutex(p 0, i 0, t "GC-Installer") p .r1 ?e' - Pop $R0 - - StrCmp $R0 0 +3 - MessageBox MB_OK|MB_ICONEXCLAMATION "The installer is already running." - Abort -FunctionEnd - -; HM NIS Edit Wizard helper defines -!define PRODUCT_NAME "Golden Cheetah" -!define PRODUCT_VERSION "v3.7" -!define PRODUCT_BIT "64" -!define PRODUCT_STARTMENU "Golden Cheetah" -!define PRODUCT_WEB_SITE_FILENAME "GoldenCheetah WebSite" -!define PRODUCT_WEB_SITE_URL "http://www.goldencheetah.org" -!define PRODUCT_WIKI_FILENAME "GoldenCheetah Wiki" -!define PRODUCT_WIKI_URL "https://github.com/GoldenCheetah/GoldenCheetah/wiki" -!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\GoldenCheetah.exe" -!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" -!define PRODUCT_SETTINGS_KEY "Software\goldencheetah.org" -!define PRODUCT_UNINST_ROOT_KEY "HKLM" - - -;-------------------------------- -;Include Modern UI - -!include "MUI2.nsh" - -;-------------------------------- -;General - - -Name "${PRODUCT_NAME} ${PRODUCT_VERSION} (${PRODUCT_BIT}bit)" -OutFile "GoldenCheetah_${PRODUCT_VERSION}_${PRODUCT_BIT}bit_Windows.exe" -InstallDir "$PROGRAMFILES64\Golden Cheetah" -InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" "Install_Dir" -Icon "gc.ico" -RequestExecutionLevel admin - - -;-------------------------------- -;Interface Settings - -!define MUI_ABORTWARNING -!define MUI_ICON "gc.ico" -!define MUI_UNICON "gc.ico" - -;-------------------------------- -;Pages - -; Welcome page -!insertmacro MUI_PAGE_WELCOME - -; License page -!insertmacro MUI_PAGE_LICENSE "license.txt" - -; Directory page -!insertmacro MUI_PAGE_DIRECTORY - -; Component page -!insertmacro MUI_PAGE_COMPONENTS - -; Instfiles page -!insertmacro MUI_PAGE_INSTFILES - -; Finish page -!define MUI_FINISHPAGE_NOAUTOCLOSE -!insertmacro MUI_PAGE_FINISH - -; Uninstaller pages -!insertmacro MUI_UNPAGE_WELCOME -!insertmacro MUI_UNPAGE_CONFIRM -!insertmacro MUI_UNPAGE_INSTFILES -!insertmacro MUI_UNPAGE_FINISH - -; Language files -!insertmacro MUI_LANGUAGE "English" - -; MUI end ------ - -!include x64.nsh - -Section "Golden Cheetah (required)" Sec1 - - SectionIn RO - - SetShellVarContext all - CreateDirectory "$SMPROGRAMS\${PRODUCT_STARTMENU}" - CreateShortCut "$SMPROGRAMS\${PRODUCT_STARTMENU}\Golden Cheetah.lnk" "$INSTDIR\GoldenCheetah.exe" - CreateShortCut "$DESKTOP\Golden Cheetah.lnk" "$INSTDIR\GoldenCheetah.exe" - -; GoldenCheetah Files - SetOutPath "$INSTDIR\audio" - SetOverwrite try - File "audio\qtaudio_wasapi.dll" - File "audio\qtaudio_windows.dll" - SetOutPath "$INSTDIR\bearer" - File "bearer\qgenericbearer.dll" - SetOutPath "$INSTDIR" - File "D3Dcompiler_47.dll" - File "gc.ico" - File "GoldenCheetah.exe" - File "GoldenCheetah.pdb" - SetOutPath "$INSTDIR\iconengines" - File "iconengines\qsvgicon.dll" - SetOutPath "$INSTDIR" - SetOutPath "$INSTDIR\imageformats" - File "imageformats\qgif.dll" - File "imageformats\qicns.dll" - File "imageformats\qico.dll" - File "imageformats\qjpeg.dll" - File "imageformats\qsvg.dll" - File "imageformats\qtga.dll" - File "imageformats\qtiff.dll" - File "imageformats\qwbmp.dll" - File "imageformats\qwebp.dll" - SetOutPath "$INSTDIR" - File "libcrypto-1_1-x64.dll" - File "libEGL.dll" - File "libGLESv2.dll" - File "libsamplerate-0.dll" - File "libssl-1_1-x64.dll" - File "libvlc.dll" - File "libvlccore.dll" - File "license.txt" - SetOutPath "$INSTDIR\mediaservice" - File "mediaservice\dsengine.dll" - File "mediaservice\qtmedia_audioengine.dll" - File "mediaservice\wmfengine.dll" - SetOutPath "$INSTDIR" - File "opengl32sw.dll" - File "OpenSSL License.txt" - SetOutPath "$INSTDIR\platforms" - File "platforms\qwindows.dll" - SetOutPath "$INSTDIR\playlistformats" - File "playlistformats\qtmultimedia_m3u.dll" -; VLC plugins - SetOutPath "$INSTDIR\plugins" - File /nonfatal /a /r "plugins\" - SetOutPath "$INSTDIR\position" - File "position\qtposition_positionpoll.dll" - File "position\qtposition_serialnmea.dll" - File "position\qtposition_winrt.dll" - SetOutPath "$INSTDIR\printsupport" - File "printsupport\windowsprintersupport.dll" - SetOutPath "$INSTDIR" - File "PYTHON LICENSE.txt" - File "_asyncio.pyd" - File "_bz2.pyd" - File "_ctypes.pyd" - File "_decimal.pyd" - File "_elementtree.pyd" - File "_hashlib.pyd" - File "libcrypto-1_1.dll" - File "libssl-1_1.dll" - File "LICENSE.txt" - File "_lzma.pyd" - File "_msi.pyd" - File "_multiprocessing.pyd" - File "_overlapped.pyd" - File "pyexpat.pyd" - File "python37.dll" - File "python37._pth" - File "python37.zip" - File "python3.dll" - File "python.exe" - File "pythonw.exe" - File "_queue.pyd" - File "select.pyd" - File "_socket.pyd" - File "sqlite3.dll" - File "_sqlite3.pyd" - File "_ssl.pyd" - File "unicodedata.pyd" - File "winsound.pyd" - SetOutPath "$INSTDIR\Lib" - File /nonfatal /a /r "Lib\" - SetOutPath "$INSTDIR" - File "gsl.dll" - File "gslcblas.dll" - SetOutPath "$INSTDIR" - File "Qt5Bluetooth.dll" - File "Qt5Charts.dll" - File "Qt5Core.dll" - File "Qt5Gui.dll" - File "Qt5Multimedia.dll" - File "Qt5Network.dll" - File "Qt5Positioning.dll" - File "Qt5PrintSupport.dll" - File "Qt5Qml.dll" - File "Qt5QmlModels.dll" - File "Qt5Quick.dll" - File "Qt5QuickWidgets.dll" - File "Qt5SerialPort.dll" - File "Qt5Sql.dll" - File "Qt5Svg.dll" - File "Qt5WebChannel.dll" - File "Qt5WebEngineCore.dll" - File "Qt5WebEngineWidgets.dll" - File "Qt5Widgets.dll" - File "Qt5Xml.dll" - File "Qt5OpenGL.dll" - File "QtWebEngineProcess.exe" - File "ReadMe.txt" - SetOutPath "$INSTDIR\resources" - File "resources\icudtl.dat" - File "resources\qtwebengine_devtools_resources.pak" - File "resources\qtwebengine_resources.pak" - File "resources\qtwebengine_resources_100p.pak" - File "resources\qtwebengine_resources_200p.pak" - SetOutPath "$INSTDIR" - File "SiUSBXp.dll" - SetOutPath "$INSTDIR\sqldrivers" - File "sqldrivers\qsqlite.dll" - File "sqldrivers\qsqlodbc.dll" - File "sqldrivers\qsqlpsql.dll" - SetOutPath "$INSTDIR\styles" - File "styles\qwindowsvistastyle.dll" - SetOutPath "$INSTDIR\translations\qtwebengine_locales" - File "translations\qtwebengine_locales\am.pak" - File "translations\qtwebengine_locales\ar.pak" - File "translations\qtwebengine_locales\bg.pak" - File "translations\qtwebengine_locales\bn.pak" - File "translations\qtwebengine_locales\ca.pak" - File "translations\qtwebengine_locales\cs.pak" - File "translations\qtwebengine_locales\da.pak" - File "translations\qtwebengine_locales\de.pak" - File "translations\qtwebengine_locales\el.pak" - File "translations\qtwebengine_locales\en-GB.pak" - File "translations\qtwebengine_locales\en-US.pak" - File "translations\qtwebengine_locales\es-419.pak" - File "translations\qtwebengine_locales\es.pak" - File "translations\qtwebengine_locales\et.pak" - File "translations\qtwebengine_locales\fa.pak" - File "translations\qtwebengine_locales\fi.pak" - File "translations\qtwebengine_locales\fil.pak" - File "translations\qtwebengine_locales\fr.pak" - File "translations\qtwebengine_locales\gu.pak" - File "translations\qtwebengine_locales\he.pak" - File "translations\qtwebengine_locales\hi.pak" - File "translations\qtwebengine_locales\hr.pak" - File "translations\qtwebengine_locales\hu.pak" - File "translations\qtwebengine_locales\id.pak" - File "translations\qtwebengine_locales\it.pak" - File "translations\qtwebengine_locales\ja.pak" - File "translations\qtwebengine_locales\kn.pak" - File "translations\qtwebengine_locales\ko.pak" - File "translations\qtwebengine_locales\lt.pak" - File "translations\qtwebengine_locales\lv.pak" - File "translations\qtwebengine_locales\ml.pak" - File "translations\qtwebengine_locales\mr.pak" - File "translations\qtwebengine_locales\ms.pak" - File "translations\qtwebengine_locales\nb.pak" - File "translations\qtwebengine_locales\nl.pak" - File "translations\qtwebengine_locales\pl.pak" - File "translations\qtwebengine_locales\pt-BR.pak" - File "translations\qtwebengine_locales\pt-PT.pak" - File "translations\qtwebengine_locales\ro.pak" - File "translations\qtwebengine_locales\ru.pak" - File "translations\qtwebengine_locales\sk.pak" - File "translations\qtwebengine_locales\sl.pak" - File "translations\qtwebengine_locales\sr.pak" - File "translations\qtwebengine_locales\sv.pak" - File "translations\qtwebengine_locales\sw.pak" - File "translations\qtwebengine_locales\ta.pak" - File "translations\qtwebengine_locales\te.pak" - File "translations\qtwebengine_locales\th.pak" - File "translations\qtwebengine_locales\tr.pak" - File "translations\qtwebengine_locales\uk.pak" - File "translations\qtwebengine_locales\vi.pak" - File "translations\qtwebengine_locales\zh-CN.pak" - File "translations\qtwebengine_locales\zh-TW.pak" - SetOutPath "$INSTDIR\translations" - File "translations\qt_ar.qm" - File "translations\qt_bg.qm" - File "translations\qt_ca.qm" - File "translations\qt_cs.qm" - File "translations\qt_da.qm" - File "translations\qt_de.qm" - File "translations\qt_en.qm" - File "translations\qt_es.qm" - File "translations\qt_fi.qm" - File "translations\qt_fr.qm" - File "translations\qt_gd.qm" - File "translations\qt_he.qm" - File "translations\qt_hu.qm" - File "translations\qt_it.qm" - File "translations\qt_ja.qm" - File "translations\qt_ko.qm" - File "translations\qt_lv.qm" - File "translations\qt_pl.qm" - File "translations\qt_ru.qm" - File "translations\qt_sk.qm" - File "translations\qt_uk.qm" - File "translations\qt_zh_TW.qm" - -SectionEnd - -Section /o "Visual C++ Redistributable" Sec2 - - SetOutPath "$INSTDIR" - SetOverwrite ifnewer - File "vc_redist.x64.exe" - ExecWait 'vc_redist.x64.exe' - -SectionEnd - -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" - -!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN - !insertmacro MUI_DESCRIPTION_TEXT ${Sec1} $(DESC_Sec1) - !insertmacro MUI_DESCRIPTION_TEXT ${Sec2} $(DESC_Sec2) -!insertmacro MUI_FUNCTION_DESCRIPTION_END - - - -Section -AdditionalIcons - SetShellVarContext all - SetOutPath $INSTDIR - WriteIniStr "$INSTDIR\${PRODUCT_WEB_SITE_FILENAME}.url" "InternetShortcut" "URL" "${PRODUCT_WEB_SITE_URL}" - WriteIniStr "$INSTDIR\${PRODUCT_WIKI_FILENAME}.url" "InternetShortcut" "URL" "${PRODUCT_WIKI_URL}" - CreateShortCut "$SMPROGRAMS\${PRODUCT_STARTMENU}\Need help - Check the Wiki.lnk" "$INSTDIR\${PRODUCT_WIKI_FILENAME}.url" - CreateShortCut "$SMPROGRAMS\${PRODUCT_STARTMENU}\GoldenCheetah Website.lnk" "$INSTDIR\${PRODUCT_WEB_SITE_FILENAME}.url" - CreateShortCut "$SMPROGRAMS\${PRODUCT_STARTMENU}\Uninstall.lnk" "$INSTDIR\uninst.exe" -SectionEnd - -Section -Post - WriteUninstaller "$INSTDIR\uninst.exe" - WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\GoldenCheetah.exe" - WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)" - WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe" - WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\GoldenCheetah.exe" - WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}" - WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE_URL}" -SectionEnd - - -Section Uninstall - SetShellVarContext all - Delete "$INSTDIR\${PRODUCT_WIKI_FILENAME}.url" - Delete "$INSTDIR\${PRODUCT_WEB_SITE_FILENAME}.url" - Delete "$INSTDIR\${PRODUCT_NAME}.url" - -; GoldenCheetah Filelist && RMDIR List - Delete "$INSTDIR\uninst.exe" - Delete "$INSTDIR\audio\qtaudio_wasapi.dll" - Delete "$INSTDIR\audio\qtaudio_windows.dll" - Delete "$INSTDIR\bearer\qgenericbearer.dll" - Delete "$INSTDIR\D3Dcompiler_47.dll" - Delete "$INSTDIR\gc.ico" - Delete "$INSTDIR\GoldenCheetah.exe" - Delete "$INSTDIR\GoldenCheetah.pdb" - Delete "$INSTDIR\iconengines\qsvgicon.dll" - Delete "$INSTDIR\imageformats\qgif.dll" - Delete "$INSTDIR\imageformats\qicns.dll" - Delete "$INSTDIR\imageformats\qico.dll" - Delete "$INSTDIR\imageformats\qjpeg.dll" - Delete "$INSTDIR\imageformats\qsvg.dll" - Delete "$INSTDIR\imageformats\qtga.dll" - Delete "$INSTDIR\imageformats\qtiff.dll" - Delete "$INSTDIR\imageformats\qwbmp.dll" - Delete "$INSTDIR\imageformats\qwebp.dll" - Delete "$INSTDIR\libcrypto-1_1-x64.dll" - Delete "$INSTDIR\libEGL.dll" - Delete "$INSTDIR\libGLESv2.dll" - Delete "$INSTDIR\libsamplerate-0.dll" - Delete "$INSTDIR\libssl-1_1-x64.dll" - Delete "$INSTDIR\libvlc.dll" - Delete "$INSTDIR\libvlccore.dll" - Delete "$INSTDIR\license.txt" - Delete "$INSTDIR\mediaservice\dsengine.dll" - Delete "$INSTDIR\mediaservice\qtmedia_audioengine.dll" - Delete "$INSTDIR\mediaservice\wmfengine.dll" - Delete "$INSTDIR\opengl32sw.dll" - Delete "$INSTDIR\OpenSSL License.txt" - Delete "$INSTDIR\platforms\qwindows.dll" - Delete "$INSTDIR\playlistformats\qtmultimedia_m3u.dll" - RMDir /r "$INSTDIR\plugins" - Delete "$INSTDIR\position\qtposition_positionpoll.dll" - Delete "$INSTDIR\position\qtposition_serialnmea.dll" - Delete "$INSTDIR\position\qtposition_winrt.dll" - Delete "$INSTDIR\printsupport\windowsprintersupport.dll" - Delete "$INSTDIR\PYTHON LICENSE.txt" - Delete "$INSTDIR\_asyncio.pyd" - Delete "$INSTDIR\_bz2.pyd" - Delete "$INSTDIR\_ctypes.pyd" - Delete "$INSTDIR\_decimal.pyd" - Delete "$INSTDIR\_elementtree.pyd" - Delete "$INSTDIR\_hashlib.pyd" - Delete "$INSTDIR\libcrypto-1_1.dll" - Delete "$INSTDIR\libssl-1_1.dll" - Delete "$INSTDIR\LICENSE.txt" - Delete "$INSTDIR\_lzma.pyd" - Delete "$INSTDIR\_msi.pyd" - Delete "$INSTDIR\_multiprocessing.pyd" - Delete "$INSTDIR\_overlapped.pyd" - Delete "$INSTDIR\pyexpat.pyd" - Delete "$INSTDIR\python37.dll" - Delete "$INSTDIR\python37._pth" - Delete "$INSTDIR\python37.zip" - Delete "$INSTDIR\python3.dll" - Delete "$INSTDIR\python.exe" - Delete "$INSTDIR\pythonw.exe" - Delete "$INSTDIR\_queue.pyd" - Delete "$INSTDIR\select.pyd" - Delete "$INSTDIR\_socket.pyd" - Delete "$INSTDIR\sqlite3.dll" - Delete "$INSTDIR\_sqlite3.pyd" - Delete "$INSTDIR\_ssl.pyd" - Delete "$INSTDIR\unicodedata.pyd" - Delete "$INSTDIR\winsound.pyd" - RMDir /r "$INSTDIR\Lib" - Delete "$INSTDIR\gsl.dll" - Delete "$INSTDIR\gslcblas.dll" - Delete "$INSTDIR\Qt5Bluetooth.dll" - Delete "$INSTDIR\Qt5Charts.dll" - Delete "$INSTDIR\Qt5Core.dll" - Delete "$INSTDIR\Qt5Gui.dll" - Delete "$INSTDIR\Qt5Multimedia.dll" - Delete "$INSTDIR\Qt5Network.dll" - Delete "$INSTDIR\Qt5Positioning.dll" - Delete "$INSTDIR\Qt5PrintSupport.dll" - Delete "$INSTDIR\Qt5Qml.dll" - Delete "$INSTDIR\Qt5QmlModels.dll" - Delete "$INSTDIR\Qt5Quick.dll" - Delete "$INSTDIR\Qt5QuickWidgets.dll" - Delete "$INSTDIR\Qt5SerialPort.dll" - Delete "$INSTDIR\Qt5Sql.dll" - Delete "$INSTDIR\Qt5Svg.dll" - Delete "$INSTDIR\Qt5WebChannel.dll" - Delete "$INSTDIR\Qt5WebEngineCore.dll" - Delete "$INSTDIR\Qt5WebEngineWidgets.dll" - Delete "$INSTDIR\Qt5Widgets.dll" - Delete "$INSTDIR\Qt5Xml.dll" - Delete "$INSTDIR\Qt5OpenGL.dll" - Delete "$INSTDIR\QtWebEngineProcess.exe" - Delete "$INSTDIR\ReadMe.txt" - Delete "$INSTDIR\resources\icudtl.dat" - Delete "$INSTDIR\resources\qtwebengine_devtools_resources.pak" - Delete "$INSTDIR\resources\qtwebengine_resources.pak" - Delete "$INSTDIR\resources\qtwebengine_resources_100p.pak" - Delete "$INSTDIR\resources\qtwebengine_resources_200p.pak" - Delete "$INSTDIR\SiUSBXp.dll" - Delete "$INSTDIR\sqldrivers\qsqlite.dll" - Delete "$INSTDIR\sqldrivers\qsqlodbc.dll" - Delete "$INSTDIR\sqldrivers\qsqlpsql.dll" - Delete "$INSTDIR\styles\qwindowsvistastyle.dll" - Delete "$INSTDIR\translations\qtwebengine_locales\am.pak" - Delete "$INSTDIR\translations\qtwebengine_locales\ar.pak" - Delete "$INSTDIR\translations\qtwebengine_locales\bg.pak" - Delete "$INSTDIR\translations\qtwebengine_locales\bn.pak" - Delete "$INSTDIR\translations\qtwebengine_locales\ca.pak" - Delete "$INSTDIR\translations\qtwebengine_locales\cs.pak" - Delete "$INSTDIR\translations\qtwebengine_locales\da.pak" - Delete "$INSTDIR\translations\qtwebengine_locales\de.pak" - Delete "$INSTDIR\translations\qtwebengine_locales\el.pak" - Delete "$INSTDIR\translations\qtwebengine_locales\en-GB.pak" - Delete "$INSTDIR\translations\qtwebengine_locales\en-US.pak" - Delete "$INSTDIR\translations\qtwebengine_locales\es-419.pak" - Delete "$INSTDIR\translations\qtwebengine_locales\es.pak" - Delete "$INSTDIR\translations\qtwebengine_locales\et.pak" - Delete "$INSTDIR\translations\qtwebengine_locales\fa.pak" - Delete "$INSTDIR\translations\qtwebengine_locales\fi.pak" - Delete "$INSTDIR\translations\qtwebengine_locales\fil.pak" - Delete "$INSTDIR\translations\qtwebengine_locales\fr.pak" - Delete "$INSTDIR\translations\qtwebengine_locales\gu.pak" - Delete "$INSTDIR\translations\qtwebengine_locales\he.pak" - Delete "$INSTDIR\translations\qtwebengine_locales\hi.pak" - Delete "$INSTDIR\translations\qtwebengine_locales\hr.pak" - Delete "$INSTDIR\translations\qtwebengine_locales\hu.pak" - Delete "$INSTDIR\translations\qtwebengine_locales\id.pak" - Delete "$INSTDIR\translations\qtwebengine_locales\it.pak" - Delete "$INSTDIR\translations\qtwebengine_locales\ja.pak" - Delete "$INSTDIR\translations\qtwebengine_locales\kn.pak" - Delete "$INSTDIR\translations\qtwebengine_locales\ko.pak" - Delete "$INSTDIR\translations\qtwebengine_locales\lt.pak" - Delete "$INSTDIR\translations\qtwebengine_locales\lv.pak" - Delete "$INSTDIR\translations\qtwebengine_locales\ml.pak" - Delete "$INSTDIR\translations\qtwebengine_locales\mr.pak" - Delete "$INSTDIR\translations\qtwebengine_locales\ms.pak" - Delete "$INSTDIR\translations\qtwebengine_locales\nb.pak" - Delete "$INSTDIR\translations\qtwebengine_locales\nl.pak" - Delete "$INSTDIR\translations\qtwebengine_locales\pl.pak" - Delete "$INSTDIR\translations\qtwebengine_locales\pt-BR.pak" - Delete "$INSTDIR\translations\qtwebengine_locales\pt-PT.pak" - Delete "$INSTDIR\translations\qtwebengine_locales\ro.pak" - Delete "$INSTDIR\translations\qtwebengine_locales\ru.pak" - Delete "$INSTDIR\translations\qtwebengine_locales\sk.pak" - Delete "$INSTDIR\translations\qtwebengine_locales\sl.pak" - Delete "$INSTDIR\translations\qtwebengine_locales\sr.pak" - Delete "$INSTDIR\translations\qtwebengine_locales\sv.pak" - Delete "$INSTDIR\translations\qtwebengine_locales\sw.pak" - Delete "$INSTDIR\translations\qtwebengine_locales\ta.pak" - Delete "$INSTDIR\translations\qtwebengine_locales\te.pak" - Delete "$INSTDIR\translations\qtwebengine_locales\th.pak" - Delete "$INSTDIR\translations\qtwebengine_locales\tr.pak" - Delete "$INSTDIR\translations\qtwebengine_locales\uk.pak" - Delete "$INSTDIR\translations\qtwebengine_locales\vi.pak" - Delete "$INSTDIR\translations\qtwebengine_locales\zh-CN.pak" - Delete "$INSTDIR\translations\qtwebengine_locales\zh-TW.pak" - Delete "$INSTDIR\translations\qt_ar.qm" - Delete "$INSTDIR\translations\qt_bg.qm" - Delete "$INSTDIR\translations\qt_ca.qm" - Delete "$INSTDIR\translations\qt_cs.qm" - Delete "$INSTDIR\translations\qt_da.qm" - Delete "$INSTDIR\translations\qt_de.qm" - Delete "$INSTDIR\translations\qt_en.qm" - Delete "$INSTDIR\translations\qt_es.qm" - Delete "$INSTDIR\translations\qt_fi.qm" - Delete "$INSTDIR\translations\qt_fr.qm" - Delete "$INSTDIR\translations\qt_gd.qm" - Delete "$INSTDIR\translations\qt_he.qm" - Delete "$INSTDIR\translations\qt_hu.qm" - Delete "$INSTDIR\translations\qt_it.qm" - Delete "$INSTDIR\translations\qt_ja.qm" - Delete "$INSTDIR\translations\qt_ko.qm" - Delete "$INSTDIR\translations\qt_lv.qm" - Delete "$INSTDIR\translations\qt_pl.qm" - Delete "$INSTDIR\translations\qt_ru.qm" - Delete "$INSTDIR\translations\qt_sk.qm" - Delete "$INSTDIR\translations\qt_uk.qm" - Delete "$INSTDIR\translations\qt_zh_TW.qm" - - RMDir "$INSTDIR\translations\qtwebengine_locales" - RMDir "$INSTDIR\translations" - RMDir "$INSTDIR\sqldrivers" - RMDir "$INSTDIR\resources" - RMDir "$INSTDIR\printsupport" - RMDir "$INSTDIR\position" - RMDir "$INSTDIR\plugins\visualization" - RMDir "$INSTDIR\plugins\video_splitter" - RMDir "$INSTDIR\plugins\video_output" - RMDir "$INSTDIR\plugins\video_filter" - RMDir "$INSTDIR\plugins\video_chroma" - RMDir "$INSTDIR\plugins\text_renderer" - RMDir "$INSTDIR\plugins\stream_out" - RMDir "$INSTDIR\plugins\stream_filter" - RMDir "$INSTDIR\plugins\services_discovery" - RMDir "$INSTDIR\plugins\packetizer" - RMDir "$INSTDIR\plugins\mux" - RMDir "$INSTDIR\plugins\misc" - RMDir "$INSTDIR\plugins\meta_engine" - RMDir "$INSTDIR\plugins\lua" - RMDir "$INSTDIR\plugins\gui" - RMDir "$INSTDIR\plugins\demux" - RMDir "$INSTDIR\plugins\control" - RMDir "$INSTDIR\plugins\codec" - RMDir "$INSTDIR\plugins\audio_output" - RMDir "$INSTDIR\plugins\audio_mixer" - RMDir "$INSTDIR\plugins\audio_filter" - RMDir "$INSTDIR\plugins\access_output" - RMDir "$INSTDIR\plugins\access" - RMDir "$INSTDIR\plugins" - RMDir "$INSTDIR\playlistformats" - RMDir "$INSTDIR\platforms" - RMDir "$INSTDIR\mediaservice" - RMDir "$INSTDIR\imageformats" - RMDir "$INSTDIR\iconengines" - RMDir "$INSTDIR\bearer" - RMDir "$INSTDIR\audio" - RMDir "$INSTDIR\styles" - RMDir "$INSTDIR" -; End of File and RMDIR List - - SetShellVarContext all - Delete "$SMPROGRAMS\${PRODUCT_STARTMENU}\*.*" - Delete "$SMPROGRAMS\${PRODUCT_STARTMENU}\Uninstall.lnk" - Delete "$SMPROGRAMS\${PRODUCT_STARTMENU}\Need help - Check the Wiki.lnk" - Delete "$SMPROGRAMS\${PRODUCT_STARTMENU}\GoldenCheetah Website.lnk" - Delete "$SMPROGRAMS\${PRODUCT_STARTMENU}\Golden Cheetah.lnk" - Delete "$SMPROGRAMS\${PRODUCT_STARTMENU}\*.lnk" - RMDir /r "$SMPROGRAMS\${PRODUCT_STARTMENU}" - Delete "$DESKTOP\Golden Cheetah.lnk" - - DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" - DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}" - SetAutoClose false -SectionEnd diff --git a/src/Resources/win32/GC3.7-Master-W64-QT6.nsi b/src/Resources/win32/GC3.8-Master-W64-QT6.nsi similarity index 100% rename from src/Resources/win32/GC3.7-Master-W64-QT6.nsi rename to src/Resources/win32/GC3.8-Master-W64-QT6.nsi diff --git a/src/Resources/win32/MakeInstallerQt6.ps1 b/src/Resources/win32/MakeInstallerQt6.ps1 index d7064026f..e91b424b3 100644 --- a/src/Resources/win32/MakeInstallerQt6.ps1 +++ b/src/Resources/win32/MakeInstallerQt6.ps1 @@ -1,12 +1,12 @@ ### Generate installer from release folder updating Qt dependencies qmake --version windeployqt --force .\GoldenCheetah.exe -copy ..\Resources\win32\GC3.7-Master-W64-QT6.nsi .\GC3.7-Master-W64-QT6.nsi -C:\Program` Files` `(x86`)\NSIS\makensis.exe .\GC3.7-Master-W64-QT6.nsi -move -force .\GoldenCheetah_v3.7.1_64bit_Windows.exe .\GoldenCheetah_v3.7_x64Qt6.exe +copy ..\Resources\win32\GC3.8-Master-W64-QT6.nsi .\GC3.8-Master-W64-QT6.nsi +C:\Program` Files` `(x86`)\NSIS\makensis.exe .\GC3.8-Master-W64-QT6.nsi +move -force .\GoldenCheetah_v3.8_64bit_Windows.exe .\GoldenCheetah_v3.8_x64Qt6.exe ### Generate version file with SHA .\GoldenCheetah --version 2>.\GCversionWindowsQt6.txt git log -1 >>.\GCversionWindowsQt6.txt -CertUtil -hashfile .\GoldenCheetah_v3.7_x64Qt6.exe sha256 | Select-Object -First 2 | Add-Content .\GCversionWindowsQt6.txt +CertUtil -hashfile .\GoldenCheetah_v3.8_x64Qt6.exe sha256 | Select-Object -First 2 | Add-Content .\GCversionWindowsQt6.txt type .\GCversionWindowsQt6.txt