diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2016-10-06 11:21:35 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2016-10-07 20:09:21 +0000 |
| commit | 6a5250c89662ff7b289c23b30a7bece9410de130 (patch) | |
| tree | 4bec39e89e89f3e14c9da55b26e982f7dd7e4e26 | |
| parent | efd0607b818d7c35ed668a8d7c0b0b7b2da7558d (diff) | |
Remove ResourceRules handling
These have been obsoleted by Apple, and breaks iOS builds in Xcode 8.
https://developer.apple.com/library/mac/technotes/tn2206/_index.html
Change-Id: I46a86ae80641d760c8f061b7f76769f8ff99d3db
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| -rw-r--r-- | share/qbs/modules/bundle/BundleModule.qbs | 2 | ||||
| -rw-r--r-- | share/qbs/modules/cpp/ios-gcc.qbs | 24 | ||||
| -rw-r--r-- | tests/auto/blackbox/testdata/bundle-structure/bundle-structure.qbs | 2 |
3 files changed, 2 insertions, 26 deletions
diff --git a/share/qbs/modules/bundle/BundleModule.qbs b/share/qbs/modules/bundle/BundleModule.qbs index 53d69e704..abd9af1ef 100644 --- a/share/qbs/modules/bundle/BundleModule.qbs +++ b/share/qbs/modules/bundle/BundleModule.qbs @@ -487,7 +487,7 @@ Module { condition: qbs.targetOS.contains("darwin") multiplex: true inputs: ["aggregate_infoplist", "pkginfo", "hpp", - "icns", "resourcerules", "xcent", + "icns", "xcent", "compiled_ibdoc", "compiled_assetcatalog", "xcode.provisioningprofile.main"] diff --git a/share/qbs/modules/cpp/ios-gcc.qbs b/share/qbs/modules/cpp/ios-gcc.qbs index 1ab6e8021..2ff4dc49c 100644 --- a/share/qbs/modules/cpp/ios-gcc.qbs +++ b/share/qbs/modules/cpp/ios-gcc.qbs @@ -62,30 +62,6 @@ DarwinGCC { Rule { condition: !product.moduleProperty("qbs", "targetOS").contains("ios-simulator") - multiplex: true - inputs: ["qbs"] - - Artifact { - filePath: product.destinationDirectory + "/" - + product.moduleProperty("bundle", "contentsFolderPath") - + "/ResourceRules.plist" - fileTags: ["resourcerules"] - } - - prepare: { - var cmd = new JavaScriptCommand(); - cmd.description = "generating ResourceRules"; - cmd.highlight = "codegen"; - cmd.sysroot = product.moduleProperty("qbs","sysroot"); - cmd.sourceCode = function() { - File.copy(sysroot + "/ResourceRules.plist", outputs.resourcerules[0].filePath); - } - return cmd; - } - } - - Rule { - condition: !product.moduleProperty("qbs", "targetOS").contains("ios-simulator") inputsFromDependencies: ["bundle"] Artifact { diff --git a/tests/auto/blackbox/testdata/bundle-structure/bundle-structure.qbs b/tests/auto/blackbox/testdata/bundle-structure/bundle-structure.qbs index 19586522c..5b372589a 100644 --- a/tests/auto/blackbox/testdata/bundle-structure/bundle-structure.qbs +++ b/tests/auto/blackbox/testdata/bundle-structure/bundle-structure.qbs @@ -3,7 +3,7 @@ import qbs Project { property stringList bundleFileTags: [ "aggregate_infoplist", "pkginfo", "hpp", - "icns", "resourcerules", "xcent", + "icns", "xcent", "compiled_ibdoc", "compiled_assetcatalog", "bundle.symlink.headers", "bundle.symlink.private-headers", "bundle.symlink.resources", "bundle.symlink.executable", |