summaryrefslogtreecommitdiff
path: root/platform/ios/scripts
diff options
context:
space:
mode:
authorMinh Nguyễn <mxn@1ec5.org>2016-04-07 16:39:12 -0400
committerMinh Nguyễn <mxn@1ec5.org>2016-04-16 13:20:12 -0700
commit96d3ccb0225ec784e6620b1a0f865bb9e466db41 (patch)
tree36ff35d301524405b3be4aee2b1502fc40230563 /platform/ios/scripts
parent2fcfc2a939df12e7abf75a9e5659a82728b805f2 (diff)
downloadqtlocation-mapboxgl-96d3ccb0225ec784e6620b1a0f865bb9e466db41.tar.gz
[ios] Added Xcode project for iosapp, ios-bench; workspace for ios-tests
ios.xcodeproj is an ordinary Xcode project with ordinary Xcode targets for iosapp and ios-bench, all contained in an ordinary Xcode workspace that happens to also reference the gyp-generated platform.xcodeproj. The iosapp target links to and embeds Mapbox.framework, which is a product of the gyp-generated platform.xcodeproj. ios-tests.xcodeproj is also in the workspace, enabling simultaneous debugging of KIF tests, the SDK, and core code. Moved storyboards into Base.lproj and image assets into an asset catalog. Removed iOS 6 assets from the iosapp asset catalog. Moved the original ios-bench application icon SVG into a non-project location. Removed app/Settings.bundle, which is identical to framework/Settings.bundle. Removed a broken reference to an unused header from the ios-tests project.
Diffstat (limited to 'platform/ios/scripts')
-rwxr-xr-xplatform/ios/scripts/package.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/platform/ios/scripts/package.sh b/platform/ios/scripts/package.sh
index 3769552994..d3c1af9951 100755
--- a/platform/ios/scripts/package.sh
+++ b/platform/ios/scripts/package.sh
@@ -213,10 +213,10 @@ SEM_VERSION=$( git describe --tags --match=ios-v*.*.* --abbrev=0 | sed 's/^ios-v
SHORT_VERSION=${SEM_VERSION%-*}
if [[ ${BUNDLE_RESOURCES} ]]; then
cp -pv LICENSE.md ${STATIC_SETTINGS_DIRECTORY}
- cp -rv platform/ios/app/Settings.bundle ${STATIC_SETTINGS_DIRECTORY}
+ cp -rv platform/ios/framework/Settings.bundle ${STATIC_SETTINGS_DIRECTORY}
else
cp -pv LICENSE.md "${OUTPUT}"
- cp -rv platform/ios/app/Settings.bundle "${OUTPUT}"
+ cp -rv platform/ios/framework/Settings.bundle "${OUTPUT}"
fi
if [[ ${BUILD_STATIC} == true ]]; then
mkdir -p ${STATIC_BUNDLE_PATH}