diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2014-10-30 15:44:09 -0400 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2014-10-30 15:44:09 -0400 |
commit | 930d0632595da72311e46f446f6ac42f958ce79a (patch) | |
tree | 8e2ce9d692d437673f739bd7c166aa004337a0f7 | |
parent | 592ed57d09f8f0913dae195e6e867884d11a2327 (diff) | |
parent | 307488adf8354b14e806bb10210f5a9cb9980de8 (diff) | |
download | qtlocation-mapboxgl-930d0632595da72311e46f446f6ac42f958ce79a.tar.gz |
Merge branch 'master' into platform-image
Conflicts:
gyp/install.gypi
-rw-r--r-- | .travis.yml | 8 | ||||
-rw-r--r-- | Makefile | 3 | ||||
-rw-r--r-- | README.md | 2 | ||||
-rwxr-xr-x | scripts/travis_before_install.sh | 2 | ||||
-rwxr-xr-x | scripts/travis_script.sh | 8 | ||||
-rw-r--r-- | styles/outdoors/style.json | 5 | ||||
-rw-r--r-- | test/test.gyp | 16 |
7 files changed, 22 insertions, 22 deletions
diff --git a/.travis.yml b/.travis.yml index f09282a9c3..065856d605 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,16 +5,16 @@ matrix: - os: linux include: - os: linux - env: BUILDTYPE=Release + env: BUILDTYPE=Release JOBS=16 compiler: clang - os: linux - env: BUILDTYPE=Debug + env: BUILDTYPE=Debug JOBS=16 compiler: clang - os: linux - env: BUILDTYPE=Release + env: BUILDTYPE=Release JOBS=8 compiler: gcc - os: osx - env: BUILDTYPE=Debug + env: BUILDTYPE=Debug JOBS=8 compiler: clang env: @@ -130,8 +130,5 @@ lproj: build/linux/mapboxgl-app.xcodeproj clean: clear_xcode_cache -find ./deps/gyp -name "*.pyc" -exec rm {} \; -rm -rf ./build/ - -rm -rf ./macosx/build/ -rm -rf ./config.gypi ./config-ios.gypi - -distclean: clean -rm -rf ./mason_packages @@ -109,7 +109,7 @@ Or proceed to building the debug application with: To trigger a complete rebuild, run `make clean` and then start over generating the Xcode projects or Makefiles as described above. -If you are having trouble getting the dependencies right, you can blow away the `mason_packages` directory, or run `make distclean`. This means the Makefile and configure script will automatically install the dependencies again on the next try. +This will also blow away the `mason_packages` directory. This means the Makefile and configure script will automatically install the dependencies again on the next try. On OS X, you can also try clearing the Xcode cache with `make clear_xcode_cache`. diff --git a/scripts/travis_before_install.sh b/scripts/travis_before_install.sh index cdeb63d972..f67aa270d6 100755 --- a/scripts/travis_before_install.sh +++ b/scripts/travis_before_install.sh @@ -40,7 +40,7 @@ if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then echo $CXXFLAGS echo $CFLAGS echo $LDFLAGS - make -j4 && sudo make install && \ + make -j$JOBS && sudo make install && \ cd ../ mapbox_time "install_opengl" \ diff --git a/scripts/travis_script.sh b/scripts/travis_script.sh index 8f112cdb8d..5fa5a3f5f3 100755 --- a/scripts/travis_script.sh +++ b/scripts/travis_script.sh @@ -8,10 +8,10 @@ if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then # build & test Linux # mapbox_time "compile_program" \ - make linux -j$(nproc) BUILDTYPE=${BUILDTYPE} + make linux -j$JOBS BUILDTYPE=${BUILDTYPE} mapbox_time "compile_tests" \ - make test -j$(nproc) BUILDTYPE=${BUILDTYPE} + make test -j$JOBS BUILDTYPE=${BUILDTYPE} mapbox_time "run_tests" \ ./scripts/run_tests.sh @@ -34,7 +34,7 @@ elif [[ ${TRAVIS_OS_NAME} == "osx" ]]; then make build/macosx/mapboxgl-app.xcodeproj mapbox_time "build_osx" \ - xcodebuild -project ./build/macosx/mapboxgl-app.xcodeproj -jobs 4 + xcodebuild -project ./build/macosx/mapboxgl-app.xcodeproj -jobs $JOBS # # build iOS @@ -48,5 +48,5 @@ elif [[ ${TRAVIS_OS_NAME} == "osx" ]]; then 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 4 + xcodebuild -project ./build/ios/mapbox-gl-cocoa/app/mapboxgl-app.xcodeproj -sdk iphonesimulator ONLY_ACTIVE_ARCH=NO -jobs $JOBS fi diff --git a/styles/outdoors/style.json b/styles/outdoors/style.json index a9085c17d0..91c7874d7a 100644 --- a/styles/outdoors/style.json +++ b/styles/outdoors/style.json @@ -751,6 +751,9 @@ "id": "aeroway_fill", "source": "mapbox", "source-layer": "aeroway", + "filter": { + "$type": "Polygon" + }, "style": { "fill-color": "#ddd" }, @@ -2217,4 +2220,4 @@ }, "type": "symbol" }] -}
\ No newline at end of file +} diff --git a/test/test.gyp b/test/test.gyp index 9e56f4f2c0..249be64076 100644 --- a/test/test.gyp +++ b/test/test.gyp @@ -26,7 +26,7 @@ 'conditions': [ ['OS == "mac"', { 'xcode_settings': { 'OTHER_LDFLAGS': [ '<@(ldflags)' ] } }, { - 'ldflags': [ '<@(ldflags)' ], + 'libraries': [ '<@(ldflags)' ], }] ] }, @@ -44,7 +44,7 @@ 'conditions': [ ['OS == "mac"', { 'xcode_settings': { 'OTHER_LDFLAGS': [ '<@(ldflags)' ] } }, { - 'ldflags': [ '<@(ldflags)' ], + 'libraries': [ '<@(ldflags)' ], }] ] }, @@ -62,7 +62,7 @@ 'conditions': [ ['OS == "mac"', { 'xcode_settings': { 'OTHER_LDFLAGS': [ '<@(ldflags)' ] } }, { - 'ldflags': [ '<@(ldflags)' ], + 'libraries': [ '<@(ldflags)' ], }] ] }, @@ -83,7 +83,7 @@ 'conditions': [ ['OS == "mac"', { 'xcode_settings': { 'OTHER_LDFLAGS': [ '<@(ldflags)' ] } }, { - 'ldflags': [ '<@(ldflags)' ], + 'libraries': [ '<@(ldflags)' ], }] ] }, @@ -101,7 +101,7 @@ 'conditions': [ ['OS == "mac"', { 'xcode_settings': { 'OTHER_LDFLAGS': [ '<@(ldflags)' ] } }, { - 'ldflags': [ '<@(ldflags)' ], + 'libraries': [ '<@(ldflags)' ], }] ] }, @@ -119,7 +119,7 @@ 'conditions': [ ['OS == "mac"', { 'xcode_settings': { 'OTHER_LDFLAGS': [ '<@(ldflags)' ] } }, { - 'ldflags': [ '<@(ldflags)' ], + 'libraries': [ '<@(ldflags)' ], }] ] }, @@ -137,7 +137,7 @@ 'conditions': [ ['OS == "mac"', { 'xcode_settings': { 'OTHER_LDFLAGS': [ '<@(ldflags)' ] } }, { - 'ldflags': [ '<@(ldflags)' ], + 'libraries': [ '<@(ldflags)' ], }] ] }, @@ -155,7 +155,7 @@ 'conditions': [ ['OS == "mac"', { 'xcode_settings': { 'OTHER_LDFLAGS': [ '<@(ldflags)' ] } }, { - 'ldflags': [ '<@(ldflags)' ], + 'libraries': [ '<@(ldflags)' ], }] ] }, |