From a829a2d2de388b0928178a4cfbde97fe2179b928 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Tue, 26 Mar 2024 20:33:21 +0200 Subject: [PATCH] Fix copying debug files on macos. --- qbs/modules/multibundle/multibundle.qbs | 4 ++-- scripts/symupload.py | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/qbs/modules/multibundle/multibundle.qbs b/qbs/modules/multibundle/multibundle.qbs index 05dd74bff..1b511557e 100644 --- a/qbs/modules/multibundle/multibundle.qbs +++ b/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 }); diff --git a/scripts/symupload.py b/scripts/symupload.py index 1269400e9..e0f0e4bb2 100644 --- a/scripts/symupload.py +++ b/scripts/symupload.py @@ -79,6 +79,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