summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin R. Miller <incanus@codesorcery.net>2015-04-28 16:45:25 -0400
committerJustin R. Miller <incanus@codesorcery.net>2015-04-28 17:47:59 -0400
commit0995930d90b7a6f8c53d4a45c1941d22179e23f6 (patch)
treeaa1de4981b98eeb72828df02b6c48ba04e4d57f3
parent32e00b5a036fa6a4c1048e247c7c0630e01448ed (diff)
downloadqtlocation-mapboxgl-0995930d90b7a6f8c53d4a45c1941d22179e23f6.tar.gz
fixes #1361: split iOS device & sim builds (sim-only for tests)
-rw-r--r--Makefile5
-rw-r--r--README.md2
-rwxr-xr-xscripts/ios/package.sh19
3 files changed, 15 insertions, 11 deletions
diff --git a/Makefile b/Makefile
index d1552d1a82..5bebd04ace 100644
--- a/Makefile
+++ b/Makefile
@@ -129,7 +129,10 @@ isim: Xcode/ios
ipackage: clean Xcode/ios
./scripts/ios/package.sh
-itest: ipackage KIF
+ipackage-sim: clean Xcode/ios
+ ./scripts/ios/package.sh sim
+
+itest: ipackage-sim KIF
./scripts/ios/test.sh
# Legacy name
diff --git a/README.md b/README.md
index d2ded1be0e..3f5b8f49d4 100644
--- a/README.md
+++ b/README.md
@@ -49,7 +49,7 @@ Target OS X: 10.9+
If you merely want to install the library for iOS and try it out as an Objective-C consumer:
0. Use [Homebrew](http://brew.sh/) to install Boost headers: `brew install boost`.
-1. Run `./scripts/ios/package.sh`. The packaging script will produce the statically-linked `libMapboxGL.a`, `MapboxGL.bundle` for resources, and a `Headers` folder.
+1. Run `make ipackage`. The packaging script will produce the statically-linked `libMapboxGL.a`, `MapboxGL.bundle` for resources, and a `Headers` folder.
2. Copy the contents of `build/ios/pkg/static` into your project. It should happen automatically, but ensure that:
- `Headers` is in your *Header Search Paths* (`HEADER_SEARCH_PATHS`) build setting.
- `MapboxGL.bundle` is in your target's *Copy Bundle Resources* build phase.
diff --git a/scripts/ios/package.sh b/scripts/ios/package.sh
index e71925f803..9dcdf0a507 100755
--- a/scripts/ios/package.sh
+++ b/scripts/ios/package.sh
@@ -35,15 +35,16 @@ export BUILDTYPE=${BUILDTYPE:-Release}
export HOST=ios
make Xcode/ios
-step "Building iOS device targets..."
-xcodebuild -sdk iphoneos${IOS_SDK_VERSION} \
- ARCHS="arm64 armv7 armv7s" \
- ONLY_ACTIVE_ARCH=NO \
- -project ./build/ios/mbgl.xcodeproj \
- -configuration ${BUILDTYPE} \
- -target everything \
- -jobs ${JOBS} | xcpretty -c
-
+if [[ ${#} -eq 0 ]]; then # no args
+ step "Building iOS device targets..."
+ xcodebuild -sdk iphoneos${IOS_SDK_VERSION} \
+ ARCHS="arm64 armv7 armv7s" \
+ ONLY_ACTIVE_ARCH=NO \
+ -project ./build/ios/mbgl.xcodeproj \
+ -configuration ${BUILDTYPE} \
+ -target everything \
+ -jobs ${JOBS} | xcpretty -c
+fi
step "Building iOS Simulator targets..."
xcodebuild -sdk iphonesimulator${IOS_SDK_VERSION} \