Merge branch 'master' into platform-image
Conflicts: gyp/install.gypi
This commit is contained in:
@@ -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:
|
||||
|
||||
3
Makefile
3
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
|
||||
|
||||
@@ -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`.
|
||||
|
||||
|
||||
@@ -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" \
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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"
|
||||
}]
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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)' ],
|
||||
}]
|
||||
]
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user