From 64f383e3f67ff54da2ef68c549bef7dd9d0eb5d1 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Thu, 30 Oct 2014 11:37:10 -0400 Subject: [PATCH 1/7] customize concurrent JOBS per compiler/platform --- .travis.yml | 8 ++++---- scripts/travis_before_install.sh | 2 +- scripts/travis_script.sh | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index f09282a9c..4c88e402e 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=8 compiler: clang - os: linux - env: BUILDTYPE=Release + env: BUILDTYPE=Release JOBS=4 compiler: gcc - os: osx - env: BUILDTYPE=Debug + env: BUILDTYPE=Debug JOBS=4 compiler: clang env: diff --git a/scripts/travis_before_install.sh b/scripts/travis_before_install.sh index cdeb63d97..f67aa270d 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 8e2f92163..d301c0efd 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 xproj-cli 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 iproj-cli 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 From c73197f208447eee2fcfb9bada06be4b8aa7840e Mon Sep 17 00:00:00 2001 From: Mike Morris Date: Thu, 30 Oct 2014 12:21:00 -0400 Subject: [PATCH 2/7] remove -lboost_regex from linker flags, followup to #521 --- gyp/install.gypi | 1 - 1 file changed, 1 deletion(-) diff --git a/gyp/install.gypi b/gyp/install.gypi index fc0411587..562f443d1 100644 --- a/gyp/install.gypi +++ b/gyp/install.gypi @@ -23,7 +23,6 @@ ['OS == "linux"', { 'other_ldflags': [ '-L<(boost_root)/lib', - '-lboost_regex', '<@(glfw3_static_libs)', '<@(glfw3_ldflags)', ] From c40a85587bd5611073999239dcfcbb1d2b94e2e0 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Thu, 30 Oct 2014 13:37:10 -0400 Subject: [PATCH 3/7] attemp to fix #525 --- test/test.gyp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/test/test.gyp b/test/test.gyp index 74f4139a9..f227dd5f5 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)' ], }] ] }, From 05d708c1a347ee6edaebb2535025b3eccad57e60 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Thu, 30 Oct 2014 13:59:36 -0400 Subject: [PATCH 4/7] double JOBS --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4c88e402e..065856d60 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,13 +8,13 @@ matrix: env: BUILDTYPE=Release JOBS=16 compiler: clang - os: linux - env: BUILDTYPE=Debug JOBS=8 + env: BUILDTYPE=Debug JOBS=16 compiler: clang - os: linux - env: BUILDTYPE=Release JOBS=4 + env: BUILDTYPE=Release JOBS=8 compiler: gcc - os: osx - env: BUILDTYPE=Debug JOBS=4 + env: BUILDTYPE=Debug JOBS=8 compiler: clang env: From f8f38b100322aaf814d6a60a6d69776b446c1230 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Thu, 30 Oct 2014 14:11:41 -0400 Subject: [PATCH 5/7] remove distclean (now that we've ported to mason and re-installs are fast) --- Makefile | 3 --- 1 file changed, 3 deletions(-) diff --git a/Makefile b/Makefile index 73e4c8799..3216cc422 100644 --- a/Makefile +++ b/Makefile @@ -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 From 38e144aeb7ac785ae68d1e7ee79ac4fa0b4412e2 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Thu, 30 Oct 2014 14:12:51 -0400 Subject: [PATCH 6/7] remove distclean mention in the readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 325a9225a..069054c5f 100644 --- a/README.md +++ b/README.md @@ -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`. From 307488adf8354b14e806bb10210f5a9cb9980de8 Mon Sep 17 00:00:00 2001 From: artemp Date: Thu, 30 Oct 2014 14:58:02 -0400 Subject: [PATCH 7/7] aeroway_fill - ensure we fill polygons only --- styles/outdoors/style.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/styles/outdoors/style.json b/styles/outdoors/style.json index a9085c17d..91c7874d7 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 +}