diff options
| author | Minh Nguyễn <mxn@1ec5.org> | 2016-04-24 13:51:44 -0700 |
|---|---|---|
| committer | Minh Nguyễn <mxn@1ec5.org> | 2016-04-24 16:18:23 -0700 |
| commit | f85f4f41050165f7805385b563b5cfffa29dcae5 (patch) | |
| tree | 94723f15c3fdde17e4d6352c1c332d6f6f810fc2 /platform/ios/framework | |
| parent | 95613bd7dde7c15669022f69b7f9e611054873c1 (diff) | |
| download | qtlocation-mapboxgl-f85f4f41050165f7805385b563b5cfffa29dcae5.tar.gz | |
[ios] Streamlined resource bundling
Added a target that produces Mapbox.bundle.
Replaced $BUNDLE_RESOURCES and $PLACE_RESOURCE_BUNDLES_OUTSIDE_FRAMEWORK with a single variable, $SELF_CONTAINED, that determines whether the output static framework is self-contained – that is, whether it contains Mapbox.bundle, Settings.bundle, and LICENSE.md. Eliminated the ability to produce a static framework that has the same layout as a dynamic framework. Now, resources are always in Mapbox.bundle; self-containment only determines where that bundle resides.
Added a separate source Info.plist to be placed in both the static framework and its resource bundle, but only after we give the build system a chance to expand variables within it. Now nearly all the Info.plist keys are filled in by the build system rather than using plutil in package.sh.
Diffstat (limited to 'platform/ios/framework')
| -rw-r--r-- | platform/ios/framework/Info-static.plist | 26 | ||||
| -rw-r--r-- | platform/ios/framework/Info.plist | 6 |
2 files changed, 31 insertions, 1 deletions
diff --git a/platform/ios/framework/Info-static.plist b/platform/ios/framework/Info-static.plist new file mode 100644 index 0000000000..b42a23322d --- /dev/null +++ b/platform/ios/framework/Info-static.plist @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>CFBundleDevelopmentRegion</key> + <string>en</string> + <key>CFBundleIdentifier</key> + <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string> + <key>CFBundleInfoDictionaryVersion</key> + <string>6.0</string> + <key>CFBundleName</key> + <string>$(PRODUCT_NAME)</string> + <key>CFBundleShortVersionString</key> + <string>$(CURRENT_SHORT_VERSION)</string> + <key>CFBundleSignature</key> + <string>????</string> + <key>CFBundleVersion</key> + <string>$(CURRENT_PROJECT_VERSION)</string> + <key>MGLCommitHash</key> + <string>$(CURRENT_COMMIT_HASH)</string> + <key>MGLSemanticVersionString</key> + <string>$(CURRENT_SEMANTIC_VERSION)</string> + <key>NSPrincipalClass</key> + <string></string> +</dict> +</plist> diff --git a/platform/ios/framework/Info.plist b/platform/ios/framework/Info.plist index d3de8eefb6..d8962c53ab 100644 --- a/platform/ios/framework/Info.plist +++ b/platform/ios/framework/Info.plist @@ -15,11 +15,15 @@ <key>CFBundlePackageType</key> <string>FMWK</string> <key>CFBundleShortVersionString</key> - <string>1.0</string> + <string>$(CURRENT_SHORT_VERSION)</string> <key>CFBundleSignature</key> <string>????</string> <key>CFBundleVersion</key> <string>$(CURRENT_PROJECT_VERSION)</string> + <key>MGLCommitHash</key> + <string>$(CURRENT_COMMIT_HASH)</string> + <key>MGLSemanticVersionString</key> + <string>$(CURRENT_SEMANTIC_VERSION)</string> <key>NSPrincipalClass</key> <string></string> </dict> |