diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2015-02-03 16:29:17 +0100 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2015-02-04 11:54:01 +0100 |
| commit | c160b19fcf3c6142dd89a49ac5d80c88b6ccd38a (patch) | |
| tree | 26e3c6c1bd4968532d696ccfd40dbab0ace68b71 /scripts | |
| parent | 73f7db9af2f76593856d64349a376412d292cd15 (diff) | |
| download | qtlocation-mapboxgl-c160b19fcf3c6142dd89a49ac5d80c88b6ccd38a.tar.gz | |
updated mesa and other targets on osx/ios
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/travis_script.sh | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/scripts/travis_script.sh b/scripts/travis_script.sh index 308dfb8f1c..71635b5c7f 100755 --- a/scripts/travis_script.sh +++ b/scripts/travis_script.sh @@ -23,7 +23,7 @@ elif [[ ${TRAVIS_OS_NAME} == "linux" ]]; then git submodule update --init test/suite mapbox_time "run_tests" \ - ./scripts/run_tests.sh + make test-* BUILDTYPE=${BUILDTYPE} mapbox_time "compare_results" \ ./scripts/compare_images.sh @@ -38,11 +38,8 @@ elif [[ ${TRAVIS_OS_NAME} == "osx" ]]; then # # build OS X # - mapbox_time "create_osx_project" \ - make build/macosx/mapboxgl-app.xcodeproj - - mapbox_time "build_osx" \ - xcodebuild -project ./build/macosx/mapboxgl-app.xcodeproj -jobs $JOBS + mapbox_time "build_osx_project" \ + make xosx -j$JOBS # # build iOS @@ -50,9 +47,6 @@ elif [[ ${TRAVIS_OS_NAME} == "osx" ]]; then mapbox_time "checkout_cocoa_bindings" \ git submodule update --init ios/mapbox-gl-cocoa - mapbox_time "create_ios_project" \ - make build/ios/mapbox-gl-cocoa/app/mapboxgl-app.xcodeproj - - mapbox_time "build_ios" \ - xcodebuild -project ./build/ios/mapbox-gl-cocoa/app/mapboxgl-app.xcodeproj -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO -jobs $JOBS + mapbox_time "build_ios_project" \ + make ios -j$JOBS fi |