diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2017-03-06 21:46:17 -0800 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2017-05-23 17:11:50 +0000 |
| commit | 532656a552b8b4a263fd58003dbd7063564d1448 (patch) | |
| tree | d7514d879e25594298a4d69a1377ecd601130642 /share/qbs/modules/bundle/BundleModule.qbs | |
| parent | 20149803a44856ea25063077964c1159b6d7a078 (diff) | |
Implement basic support for multi-config products on Darwin and Android
Task-number: QBS-13
Task-number: QBS-292
Change-Id: I63c2e0a4de5949c73ca33af7381c32606190a43a
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'share/qbs/modules/bundle/BundleModule.qbs')
| -rw-r--r-- | share/qbs/modules/bundle/BundleModule.qbs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/share/qbs/modules/bundle/BundleModule.qbs b/share/qbs/modules/bundle/BundleModule.qbs index a7332a4ea..c651d8f61 100644 --- a/share/qbs/modules/bundle/BundleModule.qbs +++ b/share/qbs/modules/bundle/BundleModule.qbs @@ -98,7 +98,8 @@ Module { } } - additionalProductTypes: ["bundle.content"] + additionalProductTypes: !(product.multiplexed || product.aggregate) + || !product.multiplexConfigurationId ? ["bundle.content"] : [] property bool isBundle: !product.consoleApplication && qbs.targetOS.contains("darwin") @@ -641,7 +642,7 @@ Module { var executables = outputs["bundle.symlink.executable"]; for (i in executables) { - cmd = new Command("ln", ["-sf", FileInfo.joinPaths("Versions", "Current", product.targetName), + cmd = new Command("ln", ["-sfn", FileInfo.joinPaths("Versions", "Current", product.targetName), executables[i].filePath]); cmd.silent = true; commands.push(cmd); |