summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2014-08-26 17:43:02 +0200
committerKonstantin Käfer <mail@kkaefer.com>2014-08-26 17:43:02 +0200
commit5b4ad90bac82eb31ec9ff23ebf7790027d389d5f (patch)
tree2ff0e50a876dc7126eab17d84ded611813326787 /scripts
parent0f73a0192e60823e49261dae2202d572be90c28b (diff)
parentf566b6595b009c1b0896d2e5a55324c4ab4e3b5c (diff)
downloadqtlocation-mapboxgl-5b4ad90bac82eb31ec9ff23ebf7790027d389d5f.tar.gz
Merge pull request #445 from mapbox/nsstring
Use NSString-specific case change functions on OS X/iOS
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/travis_script.sh7
1 files changed, 4 insertions, 3 deletions
diff --git a/scripts/travis_script.sh b/scripts/travis_script.sh
index a13d7531eb..f8325e41cc 100755
--- a/scripts/travis_script.sh
+++ b/scripts/travis_script.sh
@@ -17,11 +17,12 @@ elif [[ ${TRAVIS_OS_NAME} == "osx" ]]; then
# build OS X
#
make xproj-cli
- xcodebuild -project ./build/macosx/mapboxgl-app.xcodeproj
+ xcodebuild -project ./build/macosx/mapboxgl-app.xcodeproj -jobs 4
#
# build iOS
#
- git clone --depth 1 https://github.com/mapbox/mapbox-gl-cocoa ios/mapbox-gl-cocoa
+ git submodule init
+ git submodule update
make iproj-cli
- xcodebuild -project ./build/ios/mapbox-gl-cocoa/app/mapboxgl-app.xcodeproj -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO
+ xcodebuild -project ./build/ios/mapbox-gl-cocoa/app/mapboxgl-app.xcodeproj -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO -jobs 4
fi