diff options
author | Jake Petroules <jake.petroules@petroules.com> | 2014-12-18 08:43:57 -0800 |
---|---|---|
committer | Joerg Bornemann <joerg.bornemann@theqtcompany.com> | 2015-01-13 11:57:30 +0100 |
commit | bfdc2953ecc4a9800c2974d2d63e528c2bdc9b96 (patch) | |
tree | 011ecf65433d9b7718412861319854ad4ac68fc0 /share/qbs/modules/cpp/ios-gcc.qbs | |
parent | d350741c4c8522a5f19603654051e073128f2923 (diff) | |
download | qbs-bfdc2953ecc4a9800c2974d2d63e528c2bdc9b96.tar.gz |
Refactor bundle (CFBundle) support across all of Qbs.
This is the foundation for better bundle support, including static
frameworks, loadable modules ("bundles" i.e. plugins), and custom
bundle types. This also simplifies the difference between bundle and
non-bundle product types from a Qbs user's perspective, and allows more
fine-grained control over the construction of and use of bundles.
This patch also implicitly adds support for static frameworks.
Task-number: QBS-643
Task-number: QBS-642
Change-Id: I65d8d7040603a6ea0ff2c11360234eba6802ad35
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'share/qbs/modules/cpp/ios-gcc.qbs')
-rw-r--r-- | share/qbs/modules/cpp/ios-gcc.qbs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/share/qbs/modules/cpp/ios-gcc.qbs b/share/qbs/modules/cpp/ios-gcc.qbs index 597039ed4..fbbab778e 100644 --- a/share/qbs/modules/cpp/ios-gcc.qbs +++ b/share/qbs/modules/cpp/ios-gcc.qbs @@ -1,5 +1,4 @@ import qbs 1.0 -import qbs.BundleTools import qbs.DarwinTools import qbs.File import qbs.ModUtils @@ -29,7 +28,7 @@ DarwinGCC { Artifact { filePath: product.destinationDirectory + "/" - + BundleTools.contentsFolderPath(product) + + product.moduleProperty("bundle", "contentsFolderPath") + "/ResourceRules.plist" fileTags: ["resourcerules"] } @@ -68,7 +67,7 @@ DarwinGCC { "cpp.provisioningProfile in order to build an IPA package."; var args = ["-sdk", product.moduleProperty("cpp", "xcodeSdkName"), "PackageApplication", - "-v", product.buildDirectory + "/" + BundleTools.wrapperName(product), + "-v", product.buildDirectory + "/" + product.moduleProperty("bundle", "bundleName"), "-o", outputs.ipa[0].filePath, "--sign", signingIdentity, "--embed", provisioningProfile]; |