Move fetching tags closer to actual build.

.cirrus.yml

@@ -20,6 +20,7 @@ regular_task_template: &REGULER_TASK_TEMPLATE
 linux_qt6_task_template: &LINUX_QT6_TASK_TEMPLATE
   install_script:
     - bash -c "$PACKAGE_MANAGER_INSTALL -y qt6-base-dev qt6-l10n-tools libqt6svg6-dev qt6-base-dev-tools qmake6 libxerces-c-dev poppler-utils libgl1-mesa-dev"
+    - git fetch --tags
   build_script:
     - uname -a
     - mkdir -pm 0700 $XDG_RUNTIME_DIR
@@ -45,6 +46,7 @@ linux_qt6_task_template: &LINUX_QT6_TASK_TEMPLATE
 linux_qt6_sonar_task_template: &LINUX_QT6_TASK_SONAR_TEMPLATE
   install_script:
     - bash -c "$PACKAGE_MANAGER_INSTALL -y qt6-base-dev qt6-l10n-tools libqt6svg6-dev qt6-base-dev-tools qmake6 libxerces-c-dev poppler-utils libgl1-mesa-dev"
+    - git fetch --tags
   build_script:
     - uname -a
     - mkdir -pm 0700 $XDG_RUNTIME_DIR
@@ -79,6 +81,7 @@ linux_qt6_sonar_task_template: &LINUX_QT6_TASK_SONAR_TEMPLATE
 linux_qt5_qmake_task_template: &LINUX_QT5_QMAKE_TASK_TEMPLATE
   install_script:
     - bash -c "$PACKAGE_MANAGER_INSTALL qtbase5-dev libqt5svg5-dev qttools5-dev-tools libqt5xmlpatterns5-dev libqt5core5a libqt5gui5 libqt5printsupport5 libqt5svg5 libqt5widgets5 libqt5xml5 libqt5xmlpatterns5 poppler-utils"
+    - git fetch --tags
   build_script:
     - uname -a
     - echo $PATH
@@ -100,6 +103,7 @@ linux_qt5_qmake_task_template: &LINUX_QT5_QMAKE_TASK_TEMPLATE
 linux_qt5_qbs_task_template: &LINUX_QT5_QBS_TASK_TEMPLATE
   install_script:
     - bash -c "$PACKAGE_MANAGER_INSTALL qtbase5-dev libqt5svg5-dev qttools5-dev-tools libqt5xmlpatterns5-dev libqt5core5a libqt5gui5 libqt5printsupport5 libqt5svg5 libqt5widgets5 libqt5xml5 libqt5xmlpatterns5 poppler-utils"
+    - git fetch --tags
   build_script:
     - uname -a
     - mkdir -pm 0700 $XDG_RUNTIME_DIR
@@ -129,6 +133,7 @@ appimage_task_template: &APPIMAGE_TASK_TEMPLATE
     folder: "~/.conan/data"
   install_script:
     - bash -c "$PACKAGE_MANAGER_INSTALL qt515base qt515svg qt515tools qt515xmlpatterns qt515translations qt515doc qt515imageformats poppler-utils git xvfb ccache build-essential libgl1-mesa-dev libicu-dev python3-pip cmake"
+    - git fetch --tags
     - python3 --version
     - pip3 install --user --upgrade pip dropbox py7zr 'urllib3<2.0' conan==1.63.0 requests
   build_script:
@@ -317,6 +322,7 @@ macos_task_template: &MACOS_TASK_TEMPLATE
   pip_cache:
     folder: ${PIP_CACHE_DIR}
   install_script:
+    - git fetch --tags
     - clang --version
     - find /Applications -maxdepth 1 -type d -name 'Xcode*.app'
     - sudo xcode-select -p

appveyor.yml

@@ -405,6 +405,7 @@ for:
   build_script:
     - conan profile list
     - conan install . -s os=Windows --build=missing -o with_crash_reporting=%WITH_CRASH_REPORTING% -o with_xerces=True -pr=valentina
+    - git fetch --tags
     - qbs build -f valentina.qbs -d %APPVEYOR_BUILD_FOLDER%\build --jobs %NUMBER_OF_PROCESSORS% config:release qbs.installRoot:%APPVEYOR_BUILD_FOLDER%\build\install-root\valentina profile:qt6 project.enableConan:true project.conanWithCrashReporting:%WITH_CRASH_REPORTING% project.conanWithXerces:true modules.buildconfig.enableCcache:false project.conanProfiles:valentina modules.buildconfig.enablePCH:%ENABLE_PCH% modules.windeployqt.windeployqtProgramBinPath:%WINDEPLOYQT_BIN_PATH% modules.windeployqt.compilerRuntime:%WINDEPLOYQT_COMPILER_RUNTIME% modules.windeployqt.noCompilerRuntime:%WINDEPLOYQT_NO_COMPILER_RUNTIME%
   
   test_script:
@@ -697,8 +698,9 @@ for:
     - qbs config defaultProfile qt6
     - qbs config profiles.qt6.baseProfile clang
     - conan install . -s os=Macos --build=missing -o with_crash_reporting=True -pr=valentina
+    - git fetch --tags
     - qbs build -f valentina.qbs -d ${APPVEYOR_BUILD_FOLDER}/build --jobs $(nproc) config:release modules.buildconfig.enableUnitTests:false modules.buildconfig.enableMultiBundle:${MULTI_BUNDLE} qbs.installRoot:${APPVEYOR_BUILD_FOLDER}/build/install-root profile:qt6 project.minimumMacosVersion:${MACOS_DEPLOYMENT_TARGET} modules.buildconfig.enableCcache:true moduleProviders.qbspkgconfig.extraPaths:$(brew --prefix xerces-c)/lib/pkgconfig,$(brew --prefix qt6)/lib/pkgconfig,$(brew --prefix openssl@1.1)/lib/pkgconfig "modules.buildconfig.signingIdentity:$MACOS_CERTIFICATE_NAME" modules.macdeployqt.libpath:$(brew --prefix qt6)/lib,$(brew --prefix poppler)/lib modules.macdeployqt.macdeployqtProgramBinPath:${HOME}/macdeployqt-install-dir project.enableConan:true project.conanWithCrashReporting:true project.conanProfiles:valentina
-    - export QTDIR=`$(brew --prefix qt6)`
+    - export QTDIR=$(brew --prefix qt6)
     - export CRASH_QT_VERSION=$($QTDIR/bin/qmake -query QT_VERSION | awk -F. '{print $1 "_" $2}')
     - export CRASH_SHORT_SHA=$(git log --pretty=format:%h -n 1)
     - curl --proto '=https' --tlsv1.2 -LsSf https://github.com/mozilla/dump_syms/releases/download/v2.3.1/dump_syms-installer.sh | sh
@@ -897,6 +899,7 @@ for:
     - qbs config defaultProfile qt5
     - qbs config profiles.qt5.baseProfile clang
     - conan install . -s os=Macos --build=missing -o with_crash_reporting=True -pr=valentina
+    - git fetch --tags
     - qbs build -f valentina.qbs -d ${APPVEYOR_BUILD_FOLDER}/build --jobs $(nproc) config:release modules.buildconfig.enableUnitTests:false modules.buildconfig.enableMultiBundle:${MULTI_BUNDLE} qbs.installRoot:${APPVEYOR_BUILD_FOLDER}/build/install-root profile:qt5 project.minimumMacosVersion:${MACOS_DEPLOYMENT_TARGET} modules.buildconfig.enableCcache:true "modules.buildconfig.signingIdentity:$MACOS_CERTIFICATE_NAME" modules.macdeployqt.libpath:${QTDIR}/lib modules.macdeployqt.pluginspath:${QTDIR}/plugins modules.macdeployqt.macdeployqtProgramBinPath:${HOME}/macdeployqt-install-dir project.enableConan:true project.conanWithCrashReporting:true project.conanProfiles:valentina
     - export CRASH_QT_VERSION=$($QTDIR/bin/qmake -query QT_VERSION | awk -F. '{print $1 "_" $2}')
     - export CRASH_SHORT_SHA=$(git log --pretty=format:%h -n 1)

dmg.qbs

@@ -114,9 +114,6 @@ VAppleApplicationDiskImage {
         if (Qt.core.versionMajor >= 6)
             return "ULMO"; // macOS 10.15+ only
 
-        if (Qt.core.versionMajor >= 5 && Qt.core.versionMinor >= 10)
-            return "ULFO"; // OS X 10.11+ only
-
-        return "UDBZ"; // OS X 10.4+ only
+        return "ULFO"; // OS X 10.11+ only
     }
 }

scripts/deploy.py

@@ -149,6 +149,8 @@ def run_clean(refresh_token):
                         r'^valentina-portable-Windows7\+-mingw-x86-Qt.*-develop-[a-f0-9]{40}\.7z$',
                         r'^valentina-portable-Windows10\+-msvc-x64-Qt.*-develop-[a-f0-9]{40}\.7z$',
                         r'^valentina-portable-Windows7\+-msvc-x86-Qt.*-develop-[a-f0-9]{40}\.7z$',
+                        r'^valentina-macOS_12.4\+-Qt.*-x64-develop-[a-f0-9]{40}\.dmg$',
+                        r'^valentina-macOS_12.4\+-Qt.*-x64-develop-multibundle-[a-f0-9]{40}\.dmg$',
                         r'^valentina-macOS_11\+-Qt.*-x64-develop-[a-f0-9]{40}\.dmg$',
                         r'^valentina-macOS_11\+-Qt.*-x64-develop-multibundle-[a-f0-9]{40}\.dmg$',
                         r'^valentina-macOS_10.13\+-Qt.*-x64-develop-[a-f0-9]{40}\.dmg$',

scripts/symupload.py

@@ -5,6 +5,7 @@ import sys
 import glob
 import zipfile
 import requests
+import shutil
 
 database = "valentina"
 
@@ -135,7 +136,10 @@ def upload_symbols(install_root, val_version, commit_hash, qt_version, clean=Fal
                 print(f"PermissionError removing '{sym_file}': {e}")
 
             try:
-                os.remove(debug_file)
+                if sys.platform == "darwin":
+                    shutil.rmtree(debug_file)
+                else:
+                    os.remove(debug_file)
                 print(f"Debug file '{debug_file}' removed.")
             except PermissionError as e:
                 print(f"PermissionError removing '{debug_file}': {e}")

src/app/puzzle/puzzle.qbs

@@ -218,6 +218,9 @@ VToolApp {
             if (pdftops.pdftopsPresent)
                 apps.push("pdftops");
 
+            if (buildconfig.useConanPackages && buildconfig.conanCrashReportingEnabled)
+                apps.push("crashpad_handler");
+
             return apps;
         }
     }

src/app/tape/tape.qbs

@@ -58,6 +58,18 @@ VToolApp {
         conan.crashpad.binInstallDir: qbs.installPrefix + "/" + buildconfig.installBinaryPath
     }
 
+    Properties {
+        condition: qbs.targetOS.contains("macos") && buildconfig.enableMultiBundle
+        macdeployqt.targetApps: {
+            var apps = [];
+
+            if (buildconfig.useConanPackages && buildconfig.conanCrashReportingEnabled)
+                apps.push("crashpad_handler");
+
+            return apps;
+        }
+    }
+
     files: [
         "main.cpp",
         "tkmmainwindow.cpp",

src/app/valentina/valentina.qbs

@@ -243,6 +243,9 @@ VToolApp {
             if (pdftops.pdftopsPresent)
                 apps.push("pdftops");
 
+            if (buildconfig.useConanPackages && buildconfig.conanCrashReportingEnabled)
+                apps.push("crashpad_handler");
+
             return apps;
         }
     }