Merge 407beefad6 into 91d8bfef55

.github/workflows/android.yml

@@ -11,7 +11,6 @@ on:
     - scripts/docker/**
     branches:
     - master
-  workflow_dispatch:
 
 jobs:
   build:
@@ -50,12 +49,6 @@ jobs:
         VERSION: ${{ steps.version_number.outputs.version }}
         VERSION_4: ${{ steps.version_number.outputs.version_4 }}
       run: |
-        BUILD_EXTRA_ARGS=""
-        if [ "${GITHUB_EVENT_NAME}" = "push" ]; then
-          echo "Building a release version"
-          BUILD_EXTRA_ARGS="${BUILD_EXTRA_ARGS} release"
-        fi
-
         # this is rather awkward, but it allows us to use the preinstalled
         # Android and Qt versions with relative paths
         cd ..
@@ -72,7 +65,7 @@ jobs:
         git config --global --add safe.directory $GITHUB_WORKSPACE/libdivecomputer
         # get the build number via curl so this works both for a pull request as well as a push
         export OUTPUT_DIR="$GITHUB_WORKSPACE"
-        bash -x ./subsurface/packaging/android/qmake-build.sh ${BUILD_EXTRA_ARGS} -buildnr $BUILDNR -canonicalversion $VERSION -canonicalversion_4 $VERSION_4
+        bash -x ./subsurface/packaging/android/qmake-build.sh -buildnr $BUILDNR -canonicalversion $VERSION -canonicalversion_4 $VERSION_4
 
     - name: delete the keystore
       if: github.event_name == 'push'

.github/workflows/ios.yml.disabled

@@ -11,7 +11,6 @@ on:
     - scripts/docker/**
     branches:
     - master
-  workflow_dispatch:
 
 jobs:
   build:
@@ -46,18 +45,12 @@ jobs:
       env:
         VERSION: ${{ steps.version_number.outputs.version }}
       run: |
-        BUILD_EXTRA_ARGS=""
-        if [ "${GITHUB_EVENT_NAME}" = "push" ]; then
-          echo "Building a release version"
-          BUILD_EXTRA_ARGS="${BUILD_EXTRA_ARGS} -release"
-        fi
-
         cd ..
         git config --global --add safe.directory $GITHUB_WORKSPACE
         git config --global --add safe.directory $GITHUB_WORKSPACE/libdivecomputer
         export IOS_QT=$GITHUB_WORKSPACE/qt-ios
         echo "build for simulator"
-        bash -x $GITHUB_WORKSPACE/packaging/ios/build.sh -simulator ${BUILD_EXTRA_ARGS}
+        bash -x $GITHUB_WORKSPACE/packaging/ios/build.sh -simulator
         # We need this in order to be able to access the file and publish it
         mv build-Subsurface-mobile-Qt_5_14_1_for_iOS-Release/Release-iphonesimulator/Subsurface-mobile.app $GITHUB_WORKSPACE/Subsurface-mobile-$VERSION.app
 

.github/workflows/linux-debian-generic.yml

@@ -71,15 +71,9 @@ jobs:
         echo "--------------------------------------------------------------"
         echo "building desktop"
 
-        BUILD_EXTRA_ARGS=""
-        if [ "${GITHUB_EVENT_NAME}" = "push" ]; then
-          echo "Building a release version"
-          BUILD_EXTRA_ARGS="${BUILD_EXTRA_ARGS} -release"
-        fi
-
         # now build for the desktop version (including WebKit)
         cd ..
-        bash -e -x subsurface/scripts/build.sh -desktop -build-with-webkit ${BUILD_EXTRA_ARGS}
+        bash -e -x subsurface/scripts/build.sh -desktop -build-with-webkit
 
     - name: test desktop build
       run: |

.github/workflows/linux-debian-trixie-5.15.yml

@@ -11,7 +11,6 @@ on:
     - scripts/docker/**
     branches:
     - master
-  workflow_dispatch:
 
 jobs:
   do-build-test:

.github/workflows/linux-fedora-35-qt6.yml

@@ -11,7 +11,6 @@ on:
     - scripts/docker/**
     branches:
     - master
-  workflow_dispatch:
 
 jobs:
   build:
@@ -53,18 +52,12 @@ jobs:
         echo "--------------------------------------------------------------"
         echo "building desktop"
 
-        BUILD_EXTRA_ARGS=""
-        if [ "${GITHUB_EVENT_NAME}" = "push" ]; then
-          echo "Building a release version"
-          BUILD_EXTRA_ARGS="${BUILD_EXTRA_ARGS} -release"
-        fi
-
         # now build for the desktop version (without WebKit)
         cd ..
         git config --global --add safe.directory $GITHUB_WORKSPACE
         git config --global --add safe.directory $GITHUB_WORKSPACE/libdivecomputer
         git config --global --get-all safe.directory
-        bash -e -x subsurface/scripts/build.sh -desktop -build-with-qt6 ${BUILD_EXTRA_ARGS}
+        bash -e -x subsurface/scripts/build.sh -desktop -build-with-qt6
 
     - name: test desktop build
       run: |

.github/workflows/linux-ubuntu-20.04-qt5-appimage.yml

@@ -11,7 +11,6 @@ on:
     - scripts/docker/**
     branches:
     - master
-  workflow_dispatch:
 
 jobs:
   build:
@@ -61,15 +60,9 @@ jobs:
         echo "--------------------------------------------------------------"
         echo "building desktop"
 
-        BUILD_EXTRA_ARGS=""
-        if [ "${GITHUB_EVENT_NAME}" = "push" ]; then
-          echo "Building a release version"
-          BUILD_EXTRA_ARGS="${BUILD_EXTRA_ARGS} -release"
-        fi
-
         # now build the appimage
         cd ..
-        bash -e -x subsurface/scripts/build.sh -desktop -create-appdir -build-with-webkit ${BUILD_EXTRA_ARGS}
+        bash -e -x subsurface/scripts/build.sh -desktop -create-appdir -build-with-webkit
 
     - name: test desktop build
       run: |

.github/workflows/linux-ubuntu-20.04-qt5.yml

@@ -11,7 +11,6 @@ on:
     - scripts/docker/**
     branches:
     - master
-  workflow_dispatch:
 
 jobs:
   do-build-test:

.github/workflows/linux-ubuntu-22.04-qt5.yml

@@ -11,7 +11,6 @@ on:
     - scripts/docker/**
     branches:
     - master
-  workflow_dispatch:
 
 jobs:
   do-build-test:

.github/workflows/linux-ubuntu-24.04-qt5.yml

@@ -11,7 +11,6 @@ on:
     - scripts/docker/**
     branches:
     - master
-  workflow_dispatch:
 
 jobs:
   do-build-test:

.github/workflows/mac.yml

@@ -44,12 +44,6 @@ jobs:
       env:
         CANONICALVERSION: ${{ steps.version_number.outputs.version }}
       run: |
-        BUILD_EXTRA_ARGS=""
-        if [ "${GITHUB_EVENT_NAME}" = "push" ]; then
-          echo "Building a release version"
-          BUILD_EXTRA_ARGS="${BUILD_EXTRA_ARGS} -release"
-        fi
-
         cd ${GITHUB_WORKSPACE}/..
         export QT_ROOT=${GITHUB_WORKSPACE}/qt-mac/Qt5.15.15
         export QT_QPA_PLATFORM_PLUGIN_PATH=$QT_ROOT/plugins
@@ -57,7 +51,7 @@ jobs:
         export CMAKE_PREFIX_PATH=$QT_ROOT/lib/cmake
 
         # now setup Subsurface with WebKit and build the dependencies, using the generic build script
-        bash -e -x ./subsurface/scripts/build.sh -desktop -build-with-webkit -build-deps -ftdi -prep-only ${BUILD_EXTRA_ARGS}
+        bash -e -x ./subsurface/scripts/build.sh -desktop -build-with-webkit -release -build-deps -ftdi -prep-only
 
         echo "finished initial cmake setup of Subsurface - next build the package"
         cd subsurface/build

.github/workflows/windows.yml

@@ -47,15 +47,9 @@ jobs:
         CANONICALVERSION: ${{ steps.version_number.outputs.version }}
         CANONICALVERSION_4: ${{ steps.version_number.outputs.version_4 }}
       run: |
-        BUILD_EXTRA_ARGS=""
-        if [ "${GITHUB_EVENT_NAME}" = "push" ]; then
-          echo "Building a release version"
-          BUILD_EXTRA_ARGS="${BUILD_EXTRA_ARGS} -release"
-        fi
-
         export OUTPUT_DIR="$GITHUB_WORKSPACE"
         cd /win
-        bash -x subsurface/packaging/windows/in-container-build.sh ${BUILD_EXTRA_ARGS} 2>&1 | tee build.log
+        bash -x subsurface/packaging/windows/in-container-build.sh 2>&1 | tee build.log
         grep "Built target installer" build.log
 
     - name: publish pull request artifacts

core/btdiscovery.cpp

@@ -78,7 +78,6 @@ static struct namePattern name[] = {
 	{ "Luna 2.0", "Scubapro", "Luna 2.0" },
 	// Mares dive computers
 	{ "Mares Genius", "Mares", "Genius" },
-	{ "Sirius", "Mares", "Sirius" },
 	{ "Mares", "Mares", "Quad" }, // we actually don't know and just pick a common one - user needs to fix in UI
 	// Cress dive computers
 	{ "CARESIO_", "Cressi", "Cartesio" },

packaging/windows/in-container-build.sh

@@ -13,17 +13,9 @@ set -e
 mkdir -p win32
 cd win32
 
-BUILD_EXTRA_ARGS="debug"
-SMTK2SSRF_EXTRA_ARGS="-b debug"
-if [[ "$1" == "-release" ]]; then
-    BUILD_EXTRA_ARGS=""
-    SMTK2SSRF_BUILD_EXTRA_ARGS="-b release"
-    shift
-fi
-
 # build Subsurface
 export MXEBUILDTYPE=x86_64-w64-mingw32.shared
-bash -ex ../subsurface/packaging/windows/mxe-based-build.sh ${BUILD_EXTRA_ARGS} installer
+bash -ex ../subsurface/packaging/windows/mxe-based-build.sh installer
 
 # the strange two step move is in order to get predictable names to use
 # in the publish step of the GitHub Action
@@ -35,7 +27,7 @@ mv subsurface/"$fullname" ${OUTPUT_DIR}/"${fullname%.exe}-installer.exe"
 
 bash -ex ../subsurface/packaging/windows/mxe-based-build.sh -noftdi -nolibraw subsurface
 
-bash -ex ../subsurface/packaging/windows/smtk2ssrf-mxe-build.sh ${SMTK2SSRF_BUILD_EXTRA_ARGS} -a -i
+bash -ex ../subsurface/packaging/windows/smtk2ssrf-mxe-build.sh -a -i
 
 # the strange two step move is in order to get predictable names to use
 # in the publish step of the GitHub Action

packaging/windows/mxe-based-build.sh

@@ -131,6 +131,7 @@ if [[ "$1" == "debug" ]] ; then
 	RELEASE="Debug"
 	RELEASE_MAIN="Debug"
 	RELEASE_GM="debug"
+	DLL_SUFFIX="d"
 	shift
 	if [[ -f Release ]] ; then
 		rm -rf *
@@ -140,6 +141,7 @@ else
 	RELEASE="Release"
 	RELEASE_MAIN="RelWithDebInfo"
 	RELEASE_GM="release"
+	DLL_SUFFIX=""
 	if [[ -f Debug ]] ; then
 		rm -rf *
 	fi
@@ -279,9 +281,9 @@ done
 
 # for some reason we aren't installing Qt5Xml.dll and Qt5Location.dll
 # I need to figure out why and fix that, but for now just manually copy that as well
-EXTRA_MANUAL_DEPENDENCIES="$BASEDIR/"$MXEDIR"/usr/"$MXEBUILDTYPE"/qt5/bin/Qt5Xml.dll \
-$BASEDIR/"$MXEDIR"/usr/"$MXEBUILDTYPE"/qt5/bin/Qt5Location.dll \
-$BASEDIR/"$MXEDIR"/usr/"$MXEBUILDTYPE"/qt5/bin/Qt5QmlWorkerScript.dll"
+EXTRA_MANUAL_DEPENDENCIES="$BASEDIR/"$MXEDIR"/usr/"$MXEBUILDTYPE"/qt5/bin/Qt5Xml$DLL_SUFFIX.dll \
+$BASEDIR/"$MXEDIR"/usr/"$MXEBUILDTYPE"/qt5/bin/Qt5Location$DLL_SUFFIX.dll \
+$BASEDIR/"$MXEDIR"/usr/"$MXEBUILDTYPE"/qt5/bin/Qt5QmlWorkerScript$DLL_SUFFIX.dll"
 
 for f in $EXTRA_MANUAL_DEPENDENCIES
 do

packaging/windows/smtk2ssrf-mxe-build.sh

@@ -124,10 +124,12 @@ else
 fi
 case "$RELEASE" in
 	debug|Debug)		RELEASE=Debug
+				DLL_SUFFIX="d"
 				[[ -f Release ]] && rm -rf ./*
 				touch Debug
 				;;
 	release|Release)	RELEASE=Release
+				DLL_SUFFIX=""
 				[[ -f Debug ]] && rm -rf ./*
 				touch Release
 				;;
@@ -173,7 +175,7 @@ $BASEDIR/mxe/usr/x86_64-w64-mingw32.shared/qt5/plugins/platforms"
 
 # This comes from subsurface's mxe-based-build.sh. I'm not sure it is necessary
 # but, well, it doesn't hurt.
-EXTRA_MANUAL_DEPENDENCIES="$BASEDIR/mxe/usr/x86_64-w64-mingw32.shared/qt5/bin/Qt5Xml.dll"
+EXTRA_MANUAL_DEPENDENCIES="$BASEDIR/mxe/usr/x86_64-w64-mingw32.shared/qt5/bin/Qt5Xml$DLL_SUFFIX.dll"
 
 STAGING_DIR=$BUILDDIR/smtk-import/staging