Commit Graph

399 Commits

Author SHA1 Message Date
Fabian Guerra
187b6dc31c Merge branch 'release-agua' into master
# Conflicts:
#	circle.yml
#	cmake/core-files.cmake
#	platform/android/CHANGELOG.md
#	platform/android/MapboxGLAndroidSDK/build.gradle
#	platform/android/MapboxGLAndroidSDK/gradle.properties
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/CameraChangeDispatcher.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/text/LocalGlyphRasterizer.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/BitmapUtils.java
#	platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml
#	platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/DebugModeActivity.java
#	platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/LocalGlyphActivity.java
#	platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MyLocationTintActivity.java
#	platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_local_glyph.xml
#	platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/descriptions.xml
#	platform/darwin/src/MGLMapSnapshotter.mm
#	platform/darwin/src/MGLRendererConfiguration.h
#	platform/ios/CHANGELOG.md
#	platform/ios/DEVELOPING.md
#	platform/ios/INSTALL.md
#	platform/ios/README.md
#	platform/ios/resources/bg.lproj/Localizable.strings
#	platform/ios/resources/es.lproj/Localizable.strings
#	platform/ios/resources/vi.lproj/Localizable.strings
#	platform/ios/src/MGLMapView.mm
#	platform/macos/macos.xcodeproj/project.pbxproj
#	src/mbgl/text/glyph_manager.cpp
2018-01-04 12:55:19 -06:00
Tobrun
c618d513b1 [android] - update instrumented make target, move code style validation before building C++ code, replace code style checks with the wrapper code style check. (#10724) 2017-12-18 13:34:54 +01:00
Pablo Guardiola
1ce3d2e5ef [android] remove unnecessary jar generation from gradle-publish.gradle (#10625) 2017-12-05 10:12:16 +01:00
Jason Wray
2370461c9d [build] Lint iOS and macOS plists on CI 2017-12-01 15:26:40 -05:00
Bruno de Oliveira Abinader
87a7dab553 [build] Added mbgl-filesource to 'linux-core' target 2017-11-29 13:32:34 +02:00
tobrun
24de48b772 [android] - update android unit tests, update test make target to SDK 2017-11-06 18:53:50 +01:00
Jason Wray
8bc7e4957d [ios, build] Add CircleCI iOS builds 2017-10-25 12:48:25 -04:00
Tobrun
06a18dd548 [android] - add make target for ndk-stack 2017-10-12 22:49:25 +02:00
Bruno de Oliveira Abinader
fc2ca19bc5 [build] Shuffle render tests in 'test-node-recycle-map' target 2017-09-21 18:31:29 -03:00
Ivo van Dongen
53d072cbf5 [android] ignore failed uninstalls
- ensures targets run whether the app was installed before on the device or not
2017-09-19 16:45:12 +03:00
Pablo Guardiola
89eb23e6b5 [android] make the android release all build batched (#9907) 2017-09-05 09:49:50 +02:00
Bruno de Oliveira Abinader
0694d224c7 [test] Enable render tests recycling the map object in node6-clang39-debug 2017-08-31 10:17:21 +03:00
Anand Thakker
d436bcd56b Add {Source,CompositeCamera}Function benchmarks (#9838) 2017-08-29 10:03:57 -04:00
Tobrun Van Nuland
ae18026e30 [android] - add make android-check which wraps checkstyle and lint execution 2017-08-17 16:01:24 +02:00
Tobrun Van Nuland
39face8e10 [android] - remove wear module from project 2017-07-27 14:01:24 +02:00
Tobrun Van Nuland
cb5f498dfe [android] - add make target for dumping system GFX information 2017-07-26 17:16:14 +02:00
Tobrun Van Nuland
f56d9ca0d6 [android] - add make target documentation 2017-07-26 17:15:58 +02:00
Pablo Guardiola
b83d797081 [android] add lint using current baseline as starting point (#9318) 2017-07-21 14:03:37 +02:00
Bruno de Oliveira Abinader
460643b213 [build] Publish node packages with RelWithDebInfo 2017-07-14 15:28:36 +03:00
Konstantin Käfer
92354bdc25 [build] add address, undefined behavior + thread sanitizer 2017-07-13 15:11:12 +02:00
Konstantin Käfer
73869d12dd [build] enable -fvisibility=hidden for iOS 2017-07-13 00:22:54 -04:00
Bruno de Oliveira Abinader
8af593f89c [build] Reuse precomputed WITH_CXX11ABI definition in Qt builds 2017-07-12 20:42:29 +03:00
Ivo van Dongen
9ba3dc9249 [build] add node-benchmark target and xcode scheme 2017-07-06 21:27:40 +03:00
Konstantin Käfer
fc48ca1801 [build] use CMake to generate Xcode schemes 2017-07-06 11:45:09 +02:00
Tobrun
14c221fce7 Merge branch 'release-ios-v3.6.0-android-v5.1.0'
# Conflicts:
#	.travis.yml
#	circle.yml
#	cmake/core-files.cmake
#	include/mbgl/style/function/composite_function.hpp
#	platform/android/CHANGELOG.md
#	platform/android/MapboxGLAndroidSDK/build.gradle
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/Mapbox.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MyBearingTracking.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/constants/MyLocationTracking.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/location/LocationSource.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/CameraChangeDispatcher.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/TrackingSettings.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/widgets/MyLocationView.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/Light.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/Position.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/light/light.java.ejs
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/BitmapUtils.java
#	platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/LightTest.java
#	platform/android/MapboxGLAndroidSDKTestApp/src/androidTest/java/com/mapbox/mapboxsdk/testapp/style/light.junit.ejs
#	platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/CameraPositionActivity.java
#	platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MockLocationEngine.java
#	platform/android/dependencies.gradle
#	platform/android/src/native_map_view.cpp
#	platform/darwin/scripts/generate-style-code.js
#	platform/darwin/src/MGLGeometry_Private.h
#	platform/darwin/src/MGLLight.h
#	platform/darwin/src/MGLLight.mm
#	platform/darwin/src/MGLSource.h
#	platform/darwin/src/MGLStyle.h
#	platform/darwin/src/MGLStyle.mm
#	platform/darwin/test/MGLLightTest.mm
#	platform/default/default_file_source.cpp
#	platform/ios/CHANGELOG.md
#	platform/ios/Mapbox-iOS-SDK-symbols.podspec
#	platform/ios/Mapbox-iOS-SDK.podspec
#	platform/ios/resources/Images.xcassets/default_marker.imageset/default_marker.pdf
#	platform/macos/CHANGELOG.md
#	scripts/generate-shaders.js
#	src/mbgl/layout/symbol_layout.cpp
#	src/mbgl/programs/program.hpp
#	src/mbgl/programs/symbol_program.hpp
#	src/mbgl/programs/uniforms.hpp
#	src/mbgl/renderer/frame_history.cpp
#	src/mbgl/renderer/paint_property_binder.hpp
#	src/mbgl/shaders/line.cpp
#	src/mbgl/shaders/line_pattern.cpp
#	src/mbgl/shaders/line_sdf.cpp
#	src/mbgl/sprite/sprite_atlas.hpp
#	src/mbgl/style/layers/line_layer_properties.hpp
#	src/mbgl/style/sources/geojson_source.cpp
#	src/mbgl/style/style.cpp
#	src/mbgl/text/glyph_atlas.hpp
#	src/mbgl/tile/geometry_tile.cpp
#	src/mbgl/tile/geometry_tile.hpp
#	test/style/style.test.cpp
2017-07-05 08:37:27 +02:00
Jason Wray
6cba15f3a9 [ios] Remove old Fabric build infrastructure 2017-06-14 17:36:51 -04:00
Bruno de Oliveira Abinader
c2f7f48a22 [build] Use gdb 2017-04-08-aebcde5 2017-05-17 17:39:46 +03:00
Tobrun
a68788a2cf [android] Release android-v5.1.0-beta.2 (#8976)
* [android] url getter on sources

* [android] fix ui test filter in makefile

* [android] - build SNAPSHOT from release branch (#8958)

* [android] - update changelog for 5.1.0-beta.2

* [android] - bump version number

* [android] - Camera change listener v2.0

* [core] allow filesource url transform reset

* [android] Update attribution wordmark (#8774)

* Update wordmark on android

* Moved attribution i icon to the right of mapbox word (in mapview preview image)

* update padding and margin

* [android] update hardcoded branch name

* revert version to 5.1.0-SNAPSHOT
2017-05-12 14:07:06 -04:00
Ivo van Dongen
c74edece35 [android] fix ui test filter in makefile 2017-05-11 18:59:26 +03:00
Bruno de Oliveira Abinader
185c6e5d3b [build] Added 'mbgl-loop-uv' to 'linux-core' target 2017-05-02 12:54:37 +03:00
Bruno de Oliveira Abinader
839ad87f37 [build] Added linux-core 2017-04-27 18:45:56 +03:00
Bruno de Oliveira Abinader
52cddfc08a [build] Control libstdc++ usage via WITH_CXX11ABI 2017-04-27 18:45:56 +03:00
Bruno de Oliveira Abinader
9be076ffe9 [build] Fix 'Command not found' message on Linux 2017-04-27 18:45:56 +03:00
Konstantin Käfer
197f0ca6b4 [android] use AAssetManager instead of libzip 2017-04-24 10:42:10 +02:00
Konstantin Käfer
1d33bf774f [android] add second pipe character to fix errors detecting nodejs 2017-04-11 17:03:11 +02:00
Bruno de Oliveira Abinader
76edc6ee69 [build] Use 'nodejs' if 'node' is not found in android-configuration 2017-04-10 15:20:17 +03:00
Bruno de Oliveira Abinader
1c757cce34 [build] Autodetect Qt{4,5} 2017-03-23 16:09:07 +02:00
Konstantin Käfer
9544dcc483 [android] move build to Android Studio 2017-03-17 14:25:37 +01:00
Konstantin Käfer
aed3869cfa [build] move ABI version awareness to mason.cmake 2017-03-17 14:25:37 +01:00
Konstantin Käfer
6fdcbb61a4 [build] add Makefile target for opening Android Studio project on macOS 2017-03-10 10:34:30 -08:00
Thiago Marcos P. Santos
2b7319d529 [Qt] Remove the QML app
We are now on Qt 5.9 and this is where the plugin will be developed
from now on.
2017-03-06 11:40:05 -08:00
Konstantin Käfer
5b24b14741 [build] use node-cmake 2.x
- Removes need to run `npm install` before invoking cmake
2017-02-22 18:22:18 +01:00
Konstantin Käfer
341e65f7d5 [build] use system-provided Android NDK when available
and fall back to Mason if it isn't
2017-02-22 18:06:20 +01:00
Tobrun
586ae94ec4 [android] - uninstall current apk on test device before running a make run- command. (#8160) 2017-02-22 17:55:12 +01:00
Bruno de Oliveira Abinader
10b8ef6441 [Qt] Document QMapbox + qdoc fixes 2017-02-22 13:52:33 +02:00
Justin R. Miller
3cca3b10b1 [android] add make android-help target (#8087) 2017-02-20 16:08:24 -05:00
John Firebaugh
eb8a1ef7aa [tests] Disable timing-based Timer tests in CI 2017-02-15 15:09:30 -06:00
Konstantin Käfer
bb931505c5 [build] Remove Mason submodule in favor of CMake mason 2017-02-08 19:07:16 +01:00
John Firebaugh
150b938b49 [build, ios, macos] Simplify version portion of user agent string
The X.Y.Z version portion was unreliable, as it pulled from the latest tag regardless of platform. Set version to 0.0.0 and retrieve only the hash, which allows us to drop the node/npm dependency.
2017-02-08 10:59:59 -06:00
John Firebaugh
9f2f7ddd12 [core] Check in generated shader code
One step toward eliminating the node/npm dependency for platforms other than node.
2017-02-07 11:27:36 -06:00