diff options
| author | Ivan Komissarov <abbapoh@gmail.com> | 2020-06-11 21:23:48 +0200 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2020-06-15 08:39:46 +0000 |
| commit | b64a5569258a8b2ea66cd8ea9fe18811c6649156 (patch) | |
| tree | b7e8bca9913e78c67b0b595e8db7986ea2873aec | |
| parent | 87ac4d5280901df2d9973f19d4c744811e06170b (diff) | |
XCode: fix filePath of provisioning profiles artifacts
It is not correct to copy provisioning profiles to destination directory
since 2 products can set it to the same location (e.g. external-libs
test). Copy those to the project build directory instead, it is
guaranteed to be unique.
Change-Id: Ia895b1cfe46931197fccfa155ca323d65137408b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| -rw-r--r-- | share/qbs/modules/xcode/xcode.qbs | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/share/qbs/modules/xcode/xcode.qbs b/share/qbs/modules/xcode/xcode.qbs index dceb7d4ca..e4df1f20b 100644 --- a/share/qbs/modules/xcode/xcode.qbs +++ b/share/qbs/modules/xcode/xcode.qbs @@ -276,9 +276,7 @@ Module { inputs: ["xcode.provisioningprofile"] Artifact { - filePath: FileInfo.joinPaths(product.destinationDirectory, - "provisioning-profiles", - input.fileName + ".xml") + filePath: FileInfo.joinPaths("provisioning-profiles", input.fileName + ".xml") fileTags: ["xcode.provisioningprofile.data"] } @@ -330,15 +328,14 @@ Module { var obj = Xcode.provisioningProfilePlistContents(dataFile); if (obj && obj.data && (obj.data.UUID === query || obj.data.Name === query)) { console.log("Using provisioning profile: " + obj.filePath); - artifacts.push({ - filePath: FileInfo.joinPaths(product.destinationDirectory, obj.fileName), + filePath: obj.fileName, fileTags: ["xcode.provisioningprofile.main"], qbs: { _inputFilePath: obj.filePath } }); artifacts.push({ - filePath: FileInfo.joinPaths(product.destinationDirectory, obj.fileName + ".xml"), + filePath: obj.fileName + ".xml", fileTags: ["xcode.provisioningprofile.data.main"], qbs: { _inputFilePath: dataFile } }); |