Fix build script.

Catching exception gives feedback in case of errors.

.cirrus.yml

@@ -370,7 +370,7 @@ macos_task_template: &MACOS_TASK_TEMPLATE
     - qbs --version
   build_script:
     - echo $PATH
-    - export PATH="${HOME}/.local/bin:`python3 -m site --user-base`/bin:$PATH"
+    - export PATH="${HOME}/.local/bin:`python3 -m site --user-base`/bin:$HOME/.cargo/bin:$PATH"
     - echo $PATH
     - whereis python3
     - sudo mkdir /usr/local/bin

appveyor.yml

@@ -421,7 +421,7 @@ for:
           $env:CRASH_SHORT_SHA = git log --pretty=format:%h -n 1
         }
     - ps: scripts/install_dump_sysms.ps1
-    - if "%WITH_CRASH_REPORTING%" == "True" (python3 scripts/symupload.py %APPVEYOR_BUILD_FOLDER%\build\install-root\valentina $VALENTINA_VERSION $CRASH_SHORT_SHA $CRASH_QT_VERSION --clean)
+    - if "%WITH_CRASH_REPORTING%" == "True" (python scripts/symupload.py %APPVEYOR_BUILD_FOLDER%\build\install-root\valentina $VALENTINA_VERSION $CRASH_SHORT_SHA $CRASH_QT_VERSION --clean)
     - if "%DEPLOY%" == "true" (qbs build -f valentina.qbs -d %APPVEYOR_BUILD_FOLDER%\build -p ValentinaSetup --jobs %NUMBER_OF_PROCESSORS% config:release qbs.installRoot:%APPVEYOR_BUILD_FOLDER%\build\install-root\valentina profile:qt6 project.enableConan:true project.conanWithCrashReporting:true 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%)
     - ps: scripts/appveyor-deploy.ps1
 

qbs/imports/conan/ConanfileProbe.qbs

@@ -122,25 +122,8 @@ Probe {
         }
 
         var p = new Process();
-        p.start(executable, args);
-        while (!p.waitForFinished(500)) {
-            const output = p.readStdOut();
-            if (verbose && output) {
-                console.info(output);
-            }
-        }
-        while (!p.atEnd()) {
-            const output = p.readStdOut();
-            if (verbose && output) {
-                console.info(output);
-            }
-        }
-        if (p.exitCode()) {
-            const errorOutput = p.readStdErr();
-            p.close();
-            throw errorOutput;
-        }
-        p.close();
+        console.info("Start conan: " + executable + " " + args.join(" "));
+        p.exec(executable, args, true);
 
         if (generators.contains("json")) {
             if (!File.exists(generatedFilesPath + "/conanbuildinfo.json"))

qbs/modules/buildconfig/buildconfig.qbs

@@ -815,7 +815,7 @@ Module {
         cpp.systemIncludePaths: {
             var paths = [FileInfo.joinPaths(product.buildDirectory, "qt.headers")];
 
-            if (Utilities.versionCompare(Qt.core.version, "6") >= 0 && !useConanPackages)
+            if (Utilities.versionCompare(Qt.core.version, "6") >= 0)
             {
                 var includePaths = product.cpp.includePaths;
 

qbs/modules/multibundle/multibundle.qbs

@@ -80,7 +80,7 @@ Module {
                 artifactNames.push(installRoot + "/" + targetApp + ".app/Contents/MacOS/" + input.fileName);
 
                 if (product.installDebugInformation)
-                    artifactNames.push(installRoot + "/" + targetApp + ".app/Contents/MacOS/" + input.fileName +
+                    artifactNames.push(installRoot + "/" + targetApp + ".app/Contents/MacOS/" + input.fileName + ".app" +
                                        product.cpp.debugInfoBundleSuffix);
             });
 
@@ -109,7 +109,7 @@ Module {
 
                 if (product.installDebugInformation)
                     data.push({
-                        "source" : product.buildDirectory + "/" + input.fileName + product.cpp.debugInfoBundleSuffix,
+                        "source" : product.buildDirectory + "/" + input.fileName + ".app" + product.cpp.debugInfoBundleSuffix,
                         "destination": installRoot + "/" + targetApp + ".app/Contents/MacOS/" + fileName +
                                        product.cpp.debugInfoBundleSuffix
                     });

scripts/install_dump_sysms.ps1

@@ -15,7 +15,7 @@ if ($env:WITH_CRASH_REPORTING -eq "True") {
     $env:Path += ";$extractPath"
 
     # Check if dump_syms is callable
-    if (Test-Path (Join-Path $extractedFolderPath "dump_syms.exe")) {
+    if (Test-Path (Join-Path $extractPath "dump_syms.exe")) {
         Write-Host "dump_syms utility installed successfully and added to PATH."
     } else {
         Write-Host "Failed to install dump_syms utility."

scripts/symupload.py

@@ -47,6 +47,7 @@ def generate_sym_files(install_root):
         subprocess.run(dump_syms_cmd, check=True)
 
         sym_files.append((debug_file, zip_sym(sym_file)))
+        os.remove(sym_file)
 
     return sym_files
 
@@ -79,6 +80,8 @@ def get_app_name(sym_file):
     elif platform == "darwin":
         if base_name.endswith(".framework"):
             return base_name.split(".framework")[0]
+        elif base_name.endswith(".app"):
+            return base_name.split(".app")[0]
 
     return base_name
 

src/libs/vmisc/vmisc.qbs

@@ -14,6 +14,13 @@ VLib {
         cpp.dynamicLibraries: ["Advapi32"]
     }
 
+    Properties {
+        condition: buildconfig.useConanPackages && buildconfig.conanCrashReportingEnabled && qbs.targetOS.contains("macos")
+        cpp.libraryPaths: ["/usr/lib"]
+        cpp.dynamicLibraries: ["bsm"]
+        cpp.frameworks: ["AppKit", "Security"]
+    }
+
     name: "VMiscLib"
     files: {
         var files = [

src/test/CollectionTest/CollectionTest.qbs

@@ -30,6 +30,13 @@ VTestApp {
         cpp.dynamicLibraries: ["Advapi32"]
     }
 
+    Properties {
+        condition: buildconfig.useConanPackages && buildconfig.conanCrashReportingEnabled && qbs.targetOS.contains("macos")
+        cpp.libraryPaths: ["/usr/lib"]
+        cpp.dynamicLibraries: ["bsm"]
+        cpp.frameworks: ["AppKit", "Security"]
+    }
+
     name: "CollectionTest"
     buildconfig.appTarget: qbs.targetOS.contains("macos") ? "CollectionTest" : "collectionTest"
     targetName: buildconfig.appTarget

src/test/TranslationsTest/TranslationsTest.qbs

@@ -29,6 +29,13 @@ VTestApp {
         cpp.dynamicLibraries: ["Advapi32"]
     }
 
+    Properties {
+        condition: buildconfig.useConanPackages && buildconfig.conanCrashReportingEnabled && qbs.targetOS.contains("macos")
+        cpp.libraryPaths: ["/usr/lib"]
+        cpp.dynamicLibraries: ["bsm"]
+        cpp.frameworks: ["AppKit", "Security"]
+    }
+
     name: "TranslationsTest"
     buildconfig.appTarget: qbs.targetOS.contains("macos") ? "TranslationsTest" : "translationsTest"
     targetName: buildconfig.appTarget