From 3db574b81ee879182b3ab5d3d83641aa42a45141 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Tue, 7 Jan 2014 12:08:16 +0100 Subject: fix OS X dsym file tags The usage of the same dsym file tag in the app bundle and framework bundle rules led to two separate rule paths. One was creating a dylib cpp -> obj -> dylib -> dsym -> framework the other created an app cpp -> obj -> app -> dsym -> app bundle Using distinct file tags for application and dylib dsyms fixes this conflict. We should detect and handle situations like this in a subsequent commit. Task-number: QBS-384 Change-Id: I931b6a4be929468e4abdc2385aa38d8c224b32c6 Reviewed-by: Christian Kandeler --- share/qbs/modules/cpp/DarwinGCC.qbs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'share') diff --git a/share/qbs/modules/cpp/DarwinGCC.qbs b/share/qbs/modules/cpp/DarwinGCC.qbs index 651d44c84..8e5498a63 100644 --- a/share/qbs/modules/cpp/DarwinGCC.qbs +++ b/share/qbs/modules/cpp/DarwinGCC.qbs @@ -282,7 +282,7 @@ UnixGCC { Artifact { fileName: product.destinationDirectory + "/" + PathTools.dwarfDsymFileName() - fileTags: ["dsym"] + fileTags: ["application_dsym"] } prepare: { @@ -295,7 +295,8 @@ UnixGCC { Rule { multiplex: true - inputs: ["application", "infoplist", "pkginfo", "dsym", "compiled_nib", "resourcerules", "ipa"] + inputs: ["application", "infoplist", "pkginfo", "application_dsym", "compiled_nib", + "resourcerules", "ipa"] Artifact { fileName: product.destinationDirectory + "/" + BundleTools.wrapperName(product) @@ -313,7 +314,7 @@ UnixGCC { Rule { multiplex: true - inputs: ["dynamiclibrary", "infoplist", "pkginfo", "dsym", "compiled_nib"] + inputs: ["dynamiclibrary", "infoplist", "pkginfo", "dynamiclibrary_dsym", "compiled_nib"] Artifact { fileName: product.destinationDirectory + "/" + BundleTools.wrapperName(product) -- cgit v1.2.3