fixes #1361: split iOS device & sim builds (sim-only for tests)

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

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.

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} \