From e4c311a864d522e402b67f5393f57d0f663330e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20Ka=CC=88fer?= Date: Mon, 11 Aug 2014 17:39:57 +0200 Subject: [PATCH 1/6] remove uv.h dependency in util/time.hpp --- include/mbgl/util/time.hpp | 7 +++---- src/util/time.cpp | 13 +++++++++++++ 2 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 src/util/time.cpp diff --git a/include/mbgl/util/time.hpp b/include/mbgl/util/time.hpp index eacee2c98..9d61edf75 100644 --- a/include/mbgl/util/time.hpp +++ b/include/mbgl/util/time.hpp @@ -1,7 +1,7 @@ #ifndef MBGL_UTIL_TIME #define MBGL_UTIL_TIME -#include +#include namespace mbgl { @@ -13,9 +13,8 @@ namespace util { // Returns time in nanoseconds since an arbitrary point in the past. This has // no relation to the current time, but is continuously increasing, so // comparisons between different timestamps produce meaningful values. -inline timestamp now() { - return uv_hrtime(); -} +timestamp now(); + } // used for time conversions diff --git a/src/util/time.cpp b/src/util/time.cpp new file mode 100644 index 000000000..493a6ccfa --- /dev/null +++ b/src/util/time.cpp @@ -0,0 +1,13 @@ +#include + +#include + +namespace mbgl { +namespace util { + +timestamp now() { + return uv_hrtime(); +} + +} +} From 6f802642917136eb29d385d31d1817a98b562bbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20Ka=CC=88fer?= Date: Tue, 12 Aug 2014 11:45:30 +0200 Subject: [PATCH 2/6] remove uv.h dependency from header files --- common/curl_request.cpp | 2 +- common/glfw_view.hpp | 4 - include/mbgl/map/map.hpp | 2 +- include/mbgl/map/transform.hpp | 2 +- include/mbgl/platform/platform.hpp | 8 +- include/mbgl/platform/request.hpp | 9 +- include/mbgl/style/style.hpp | 2 +- include/mbgl/util/filesource.hpp | 6 +- include/mbgl/util/uv.hpp | 154 ++-------------------------- include/mbgl/util/uv_detail.hpp | 158 +++++++++++++++++++++++++++++ linux/main.cpp | 1 + src/map/map.cpp | 7 +- src/map/sprite.cpp | 2 +- src/map/tile_data.cpp | 1 + src/map/transform.cpp | 5 +- src/platform/request.cpp | 2 +- src/style/style.cpp | 5 +- src/text/glyph_store.cpp | 2 +- src/util/raster.cpp | 2 +- src/util/time.cpp | 3 +- src/util/uv.cpp | 19 ++++ 21 files changed, 210 insertions(+), 186 deletions(-) create mode 100644 include/mbgl/util/uv_detail.hpp create mode 100644 src/util/uv.cpp diff --git a/common/curl_request.cpp b/common/curl_request.cpp index b7e5e8b5c..88b7712f6 100644 --- a/common/curl_request.cpp +++ b/common/curl_request.cpp @@ -1,7 +1,7 @@ #include #include -#include +#include #include #include diff --git a/common/glfw_view.hpp b/common/glfw_view.hpp index efef3431a..d2f6872fc 100644 --- a/common/glfw_view.hpp +++ b/common/glfw_view.hpp @@ -9,8 +9,6 @@ #endif #include -#include - class GLFWView : public mbgl::View { public: GLFWView(bool fullscreen = false); @@ -43,8 +41,6 @@ public: double last_click = -1; GLFWwindow *window = nullptr; - - uv_loop_t *loop = nullptr; }; #endif diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp index be01b456c..554962c71 100644 --- a/include/mbgl/map/map.hpp +++ b/include/mbgl/map/map.hpp @@ -156,7 +156,7 @@ private: private: bool async = false; std::shared_ptr loop; - uv_thread_t thread; + std::unique_ptr thread; uv_async_t *async_terminate = nullptr; uv_async_t *async_render = nullptr; uv_async_t *async_cleanup = nullptr; diff --git a/include/mbgl/map/transform.hpp b/include/mbgl/map/transform.hpp index df7839ea9..d0f56b7fb 100644 --- a/include/mbgl/map/transform.hpp +++ b/include/mbgl/map/transform.hpp @@ -80,7 +80,7 @@ private: private: View &view; - mutable uv::rwlock mtx; + std::unique_ptr mtx; // This reflects the current state of the transform, representing the actual position of the // map. After calling a transform function with a timer, this will likely remain the same until diff --git a/include/mbgl/platform/platform.hpp b/include/mbgl/platform/platform.hpp index 02aeb594b..43c6ce4f5 100644 --- a/include/mbgl/platform/platform.hpp +++ b/include/mbgl/platform/platform.hpp @@ -1,16 +1,12 @@ #ifndef MBGL_PLATFORM_PLATFORM #define MBGL_PLATFORM_PLATFORM +#include + #include #include #include -typedef struct uv_loop_s uv_loop_t; - -namespace uv { -class loop; -} - namespace mbgl { namespace platform { diff --git a/include/mbgl/platform/request.hpp b/include/mbgl/platform/request.hpp index 7d2da8888..0cbacf645 100644 --- a/include/mbgl/platform/request.hpp +++ b/include/mbgl/platform/request.hpp @@ -7,14 +7,7 @@ #include #include - -// Forward definition. -typedef struct uv_loop_s uv_loop_t; -typedef struct uv_async_s uv_async_t; - -namespace uv { -class loop; -} +#include namespace mbgl { namespace platform { diff --git a/include/mbgl/style/style.hpp b/include/mbgl/style/style.hpp index 3df58ab42..1f24674e4 100644 --- a/include/mbgl/style/style.hpp +++ b/include/mbgl/style/style.hpp @@ -62,7 +62,7 @@ private: PropertyTransition defaultTransition; bool initial_render_complete = false; - mutable uv::rwlock mtx; + std::unique_ptr mtx; }; } diff --git a/include/mbgl/util/filesource.hpp b/include/mbgl/util/filesource.hpp index 0d339cbac..18c63ddfe 100644 --- a/include/mbgl/util/filesource.hpp +++ b/include/mbgl/util/filesource.hpp @@ -1,14 +1,12 @@ #ifndef MBGL_UTIL_FILESOURCE #define MBGL_UTIL_FILESOURCE +#include + #include #include #include -namespace uv { -class loop; -} - namespace mbgl { namespace platform { diff --git a/include/mbgl/util/uv.hpp b/include/mbgl/util/uv.hpp index 518e007af..4ceb8b873 100644 --- a/include/mbgl/util/uv.hpp +++ b/include/mbgl/util/uv.hpp @@ -1,159 +1,19 @@ #ifndef MBGL_UTIL_UV #define MBGL_UTIL_UV -#include -#include -#include - -#ifdef __clang__ -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wunused-parameter" -#endif - -#include - -#ifdef __clang__ -#pragma clang diagnostic pop -#endif - #include +typedef struct uv_async_s uv_async_t; +typedef struct uv_handle_s uv_handle_t; +typedef struct uv_loop_s uv_loop_t; namespace uv { -inline std::string cwd() { - size_t max = 0; - std::string dir; - do { - max += 256; - dir.resize(max); - uv_cwd(const_cast(dir.data()), &max); - } while (max == dir.size()); - dir.resize(max - 1); - return dir; -} +std::string cwd(); -class loop { -public: - inline loop() { - if (uv_loop_init(&l) != 0) { - throw std::runtime_error("failed to initialize loop"); - } - } - - inline ~loop() { uv_loop_close(&l); } - - inline uv_loop_t *operator*() { return &l; } - -private: - uv_loop_t l; -}; - -class mutex { -public: - inline mutex() { - if (uv_mutex_init(&mtx) != 0) { - throw std::runtime_error("failed to initialize mutex"); - } - } - inline ~mutex() { uv_mutex_destroy(&mtx); } - inline void lock() { uv_mutex_lock(&mtx); } - inline void unlock() { uv_mutex_unlock(&mtx); } - -private: - uv_mutex_t mtx; -}; - -class lock { -public: - lock(mutex &mtx) : mtx(mtx) { mtx.lock(); } - ~lock() { mtx.unlock(); } - -private: - mutex &mtx; -}; - -class rwlock { -public: - inline rwlock() { - if (uv_rwlock_init(&mtx) != 0) { - throw std::runtime_error("failed to initialize read-write lock"); - } - } - inline ~rwlock() { uv_rwlock_destroy(&mtx); } - inline void rdlock() { uv_rwlock_rdlock(&mtx); } - inline void wrlock() { uv_rwlock_wrlock(&mtx); } - inline void rdunlock() { uv_rwlock_rdunlock(&mtx); } - inline void wrunlock() { uv_rwlock_wrunlock(&mtx); } - -private: - uv_rwlock_t mtx; -}; - -class readlock { -public: - inline readlock(rwlock &mtx) : mtx(mtx) { mtx.rdlock(); } - inline ~readlock() { mtx.rdunlock(); } - -private: - rwlock &mtx; -}; - -class writelock { -public: - inline writelock(rwlock &mtx) : mtx(mtx) { mtx.wrlock(); } - inline ~writelock() { mtx.wrunlock(); } - -private: - rwlock &mtx; -}; - -class once { -public: - typedef void (*callback)(); - void operator()(void (*callback)(void)) { - uv_once(&o, callback); - } - -private: - uv_once_t o = UV_ONCE_INIT; -}; - -template -class work { -public: - typedef void (*work_callback)(T &object); - typedef void (*after_work_callback)(T &object); - - template - work(const std::shared_ptr &loop, work_callback work_cb, after_work_callback after_work_cb, Args&&... args) - : loop(loop), - data(std::forward(args)...), - work_cb(work_cb), - after_work_cb(after_work_cb) { - req.data = this; - uv_queue_work(**loop, &req, do_work, after_work); - } - -private: - static void do_work(uv_work_t *req) { - work *w = static_cast *>(req->data); - w->work_cb(w->data); - } - - static void after_work(uv_work_t *req, int) { - work *w = static_cast *>(req->data); - w->after_work_cb(w->data); - delete w; - } - -private: - std::shared_ptr loop; - uv_work_t req; - T data; - work_callback work_cb; - after_work_callback after_work_cb; -}; +class thread; +class rwlock; +class loop; } diff --git a/include/mbgl/util/uv_detail.hpp b/include/mbgl/util/uv_detail.hpp new file mode 100644 index 000000000..c65c247ba --- /dev/null +++ b/include/mbgl/util/uv_detail.hpp @@ -0,0 +1,158 @@ +#ifndef MBGL_UTIL_UV_DETAIL +#define MBGL_UTIL_UV_DETAIL + +#include +#include +#include + +#ifdef __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wunused-parameter" +#endif + +#include + +#ifdef __clang__ +#pragma clang diagnostic pop +#endif + +#include + + +namespace uv { + +class thread { +public: + inline operator uv_thread_t *() { return &t; } + +private: + uv_thread_t t; +}; + +class loop { +public: + inline loop() { + if (uv_loop_init(&l) != 0) { + throw std::runtime_error("failed to initialize loop"); + } + } + + inline ~loop() { uv_loop_close(&l); } + + inline uv_loop_t *operator*() { return &l; } + +private: + uv_loop_t l; +}; + +class mutex { +public: + inline mutex() { + if (uv_mutex_init(&mtx) != 0) { + throw std::runtime_error("failed to initialize mutex"); + } + } + inline ~mutex() { uv_mutex_destroy(&mtx); } + inline void lock() { uv_mutex_lock(&mtx); } + inline void unlock() { uv_mutex_unlock(&mtx); } + +private: + uv_mutex_t mtx; +}; + +class lock { +public: + lock(mutex &mtx) : mtx(mtx) { mtx.lock(); } + ~lock() { mtx.unlock(); } + +private: + mutex &mtx; +}; + +class rwlock { +public: + inline rwlock() { + if (uv_rwlock_init(&mtx) != 0) { + throw std::runtime_error("failed to initialize read-write lock"); + } + } + inline ~rwlock() { uv_rwlock_destroy(&mtx); } + inline void rdlock() { uv_rwlock_rdlock(&mtx); } + inline void wrlock() { uv_rwlock_wrlock(&mtx); } + inline void rdunlock() { uv_rwlock_rdunlock(&mtx); } + inline void wrunlock() { uv_rwlock_wrunlock(&mtx); } + +private: + uv_rwlock_t mtx; +}; + +class readlock { +public: + inline readlock(rwlock &mtx) : mtx(mtx) { mtx.rdlock(); } + inline readlock(const std::unique_ptr &mtx) : mtx(*mtx) { mtx->rdlock(); } + inline ~readlock() { mtx.rdunlock(); } + +private: + rwlock &mtx; +}; + +class writelock { +public: + inline writelock(rwlock &mtx) : mtx(mtx) { mtx.wrlock(); } + inline writelock(const std::unique_ptr &mtx) : mtx(*mtx) { mtx->wrlock(); } + inline ~writelock() { mtx.wrunlock(); } + +private: + rwlock &mtx; +}; + +class once { +public: + typedef void (*callback)(); + void operator()(void (*callback)(void)) { + uv_once(&o, callback); + } + +private: + uv_once_t o = UV_ONCE_INIT; +}; + +template +class work { +public: + typedef void (*work_callback)(T &object); + typedef void (*after_work_callback)(T &object); + + template + work(const std::shared_ptr &loop, work_callback work_cb, after_work_callback after_work_cb, Args&&... args) + : loop(loop), + data(std::forward(args)...), + work_cb(work_cb), + after_work_cb(after_work_cb) { + req.data = this; + uv_queue_work(**loop, &req, do_work, after_work); + } + +private: + static void do_work(uv_work_t *req) { + work *w = static_cast *>(req->data); + w->work_cb(w->data); + } + + static void after_work(uv_work_t *req, int) { + work *w = static_cast *>(req->data); + w->after_work_cb(w->data); + delete w; + } + +private: + std::shared_ptr loop; + uv_work_t req; + T data; + work_callback work_cb; + after_work_callback after_work_cb; +}; + +} + +#endif diff --git a/linux/main.cpp b/linux/main.cpp index b1241d64e..a4f9a6298 100644 --- a/linux/main.cpp +++ b/linux/main.cpp @@ -1,5 +1,6 @@ #include #include +#include #include #include diff --git a/src/map/map.cpp b/src/map/map.cpp index ef7b9548b..81cbd394b 100644 --- a/src/map/map.cpp +++ b/src/map/map.cpp @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include #include @@ -32,6 +32,7 @@ using namespace mbgl; Map::Map(View& view) : loop(std::make_shared()), + thread(std::make_unique()), view(view), transform(view), fileSource(std::make_shared()), @@ -78,7 +79,7 @@ void Map::start() { uv_async_init(**loop, async_cleanup, cleanup); async_cleanup->data = this; - uv_thread_create(&thread, [](void *arg) { + uv_thread_create(*thread, [](void *arg) { Map *map = static_cast(arg); map->run(); }, this); @@ -89,7 +90,7 @@ void Map::stop() { uv_async_send(async_terminate); } - uv_thread_join(&thread); + uv_thread_join(*thread); // Run the event loop once to make sure our async delete handlers are called. uv_run(**loop, UV_RUN_ONCE); diff --git a/src/map/sprite.cpp b/src/map/sprite.cpp index f396fec07..88e940c00 100644 --- a/src/map/sprite.cpp +++ b/src/map/sprite.cpp @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/map/tile_data.cpp b/src/map/tile_data.cpp index a94eb00fb..4333e2d2f 100644 --- a/src/map/tile_data.cpp +++ b/src/map/tile_data.cpp @@ -5,6 +5,7 @@ #include #include #include +#include using namespace mbgl; diff --git a/src/map/transform.cpp b/src/map/transform.cpp index 6338df6a4..a68cffdc7 100644 --- a/src/map/transform.cpp +++ b/src/map/transform.cpp @@ -5,6 +5,7 @@ #include #include #include +#include #include #include #include @@ -16,9 +17,7 @@ const double R2D = 180.0 / M_PI; const double M2PI = 2 * M_PI; const double MIN_ROTATE_SCALE = 8; -Transform::Transform(View &view) - : view(view) { - +Transform::Transform(View &view) : view(view), mtx(std::make_unique()) { setScale(current.scale); setAngle(current.angle); } diff --git a/src/platform/request.cpp b/src/platform/request.cpp index 9382892a9..efd17895d 100644 --- a/src/platform/request.cpp +++ b/src/platform/request.cpp @@ -1,7 +1,7 @@ #include #include #include -#include +#include using namespace mbgl::platform; diff --git a/src/style/style.cpp b/src/style/style.cpp index 03881f96a..22c761010 100644 --- a/src/style/style.cpp +++ b/src/style/style.cpp @@ -6,6 +6,8 @@ #include #include #include +#include +#include #include #include @@ -13,7 +15,8 @@ namespace mbgl { -Style::Style() { +Style::Style() + : mtx(std::make_unique()) { } void Style::updateProperties(float z, timestamp now) { diff --git a/src/text/glyph_store.cpp b/src/text/glyph_store.cpp index 4b90b51c2..c32e1642e 100644 --- a/src/text/glyph_store.cpp +++ b/src/text/glyph_store.cpp @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include namespace mbgl { diff --git a/src/util/raster.cpp b/src/util/raster.cpp index 4a040f9cb..fe5acbd52 100644 --- a/src/util/raster.cpp +++ b/src/util/raster.cpp @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/util/time.cpp b/src/util/time.cpp index 493a6ccfa..4cd8077f9 100644 --- a/src/util/time.cpp +++ b/src/util/time.cpp @@ -1,6 +1,5 @@ #include - -#include +#include namespace mbgl { namespace util { diff --git a/src/util/uv.cpp b/src/util/uv.cpp new file mode 100644 index 000000000..65c790b9c --- /dev/null +++ b/src/util/uv.cpp @@ -0,0 +1,19 @@ +#include + +#include + +namespace uv { + +std::string cwd() { + size_t max = 0; + std::string dir; + do { + max += 256; + dir.resize(max); + uv_cwd(const_cast(dir.data()), &max); + } while (max == dir.size()); + dir.resize(max - 1); + return dir; +} + +} From 919947e6c7e1e414e9c9f462d1bf3769db73ecf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20Ka=CC=88fer?= Date: Tue, 12 Aug 2014 11:54:11 +0200 Subject: [PATCH 3/6] remove uv.h dependency in darwin-specific code --- common/foundation_request.mm | 31 +++++++++++++++---------------- mapboxgl.gyp | 2 +- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/common/foundation_request.mm b/common/foundation_request.mm index 4684ff55f..b7eafdb96 100644 --- a/common/foundation_request.mm +++ b/common/foundation_request.mm @@ -12,28 +12,15 @@ #include #include #include -#include +#include -uv_once_t request_initialize = UV_ONCE_INIT; +dispatch_once_t request_initialize = 0; NSURLSession *session = nullptr; #if TARGET_OS_IPHONE std::atomic active_tasks; #endif -void request_initialize_cb() { - NSURLSessionConfiguration *sessionConfig = - [NSURLSessionConfiguration defaultSessionConfiguration]; - sessionConfig.timeoutIntervalForResource = 30; - sessionConfig.HTTPMaximumConnectionsPerHost = 8; - sessionConfig.requestCachePolicy = NSURLRequestUseProtocolCachePolicy; - - session = [NSURLSession sessionWithConfiguration:sessionConfig]; - -#if TARGET_OS_IPHONE - active_tasks = 0; -#endif -} // We're using a child class to make sure ARC is working correctly, as well as to add activity // indicators on iOS. @@ -69,7 +56,19 @@ std::shared_ptr mbgl::platform::request_http(const std::string &url, std::function callback, std::shared_ptr loop) { - uv_once(&request_initialize, request_initialize_cb); + dispatch_once(&request_initialize, ^{ + NSURLSessionConfiguration *sessionConfig = + [NSURLSessionConfiguration defaultSessionConfiguration]; + sessionConfig.timeoutIntervalForResource = 30; + sessionConfig.HTTPMaximumConnectionsPerHost = 8; + sessionConfig.requestCachePolicy = NSURLRequestUseProtocolCachePolicy; + + session = [NSURLSession sessionWithConfiguration:sessionConfig]; + +#if TARGET_OS_IPHONE + active_tasks = 0; +#endif + }); std::shared_ptr req = std::make_shared(url, callback, loop); diff --git a/mapboxgl.gyp b/mapboxgl.gyp index b7944d6a1..fa544b18f 100644 --- a/mapboxgl.gyp +++ b/mapboxgl.gyp @@ -41,7 +41,7 @@ { 'action_name': 'Touch Stylesheet Directory', 'inputs': ['styles'], - 'outputs': ['styles'], + 'outputs': [], 'action': ['touch', 'styles'], # required for xcode http://openradar.appspot.com/7232149 } ], From 367b35998d5f7b7cedc2ac40625aba4361adb7ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20Ka=CC=88fer?= Date: Tue, 12 Aug 2014 12:26:00 +0200 Subject: [PATCH 4/6] fix gyp builds --- Makefile | 2 +- mapboxgl.gyp | 45 +++++++++++++++++++-------------------------- test/test.gyp | 1 - 3 files changed, 20 insertions(+), 28 deletions(-) diff --git a/Makefile b/Makefile index fb1c5b3ec..efc2385ce 100644 --- a/Makefile +++ b/Makefile @@ -27,7 +27,7 @@ build/test/Makefile: src common config.gypi test/test.gyp test: build/test/Makefile $(MAKE) -C build/test BUILDTYPE=Testing V=$(V) test -test/%: build/test/Makefile +test_%: build/test/Makefile $(MAKE) -C build/test BUILDTYPE=Testing V=$(V) $* (cd build/Testing && exec ./test_$*) diff --git a/mapboxgl.gyp b/mapboxgl.gyp index fa544b18f..aa8249a94 100644 --- a/mapboxgl.gyp +++ b/mapboxgl.gyp @@ -34,52 +34,45 @@ } }, { - 'target_name': 'bundle_styles', + 'target_name': 'touch_styles', 'type': 'none', 'hard_dependency': 1, 'actions': [ { 'action_name': 'Touch Stylesheet Directory', 'inputs': ['styles'], - 'outputs': [], - 'action': ['touch', 'styles'], # required for xcode http://openradar.appspot.com/7232149 + 'outputs': ['<(PRODUCT_DIR)/'], # need to specify a distinct directory + 'action': ['touch', 'styles'], } ], + }, + { + 'target_name': 'bundle_styles', + 'type': 'none', + 'hard_dependency': 1, + 'dependencies': [ 'touch_styles' ], # required for xcode http://openradar.appspot.com/7232149 'direct_dependent_settings': { - 'mac_bundle_resources': [ - 'styles', - ], + 'mac_bundle_resources': [ 'styles' ], } }, { 'target_name': 'copy_styles', 'type': 'none', 'hard_dependency': 1, - 'actions': [ - { - 'action_name': 'Touch Stylesheet Directory', - 'inputs': ['styles'], - 'outputs': ['styles'], - 'action': ['touch', 'styles'], # required for xcode http://openradar.appspot.com/7232149 - } - ], - 'copies': [ - { - 'files': [ 'styles' ], - 'destination': '<(PRODUCT_DIR)' - } - ] + 'dependencies': [ 'touch_styles' ], # required for xcode http://openradar.appspot.com/7232149 + 'copies': [{ + 'files': [ 'styles' ], + 'destination': '<(PRODUCT_DIR)' + }], }, { 'target_name': 'copy_certificate_bundle', 'type': 'none', 'hard_dependency': 1, - 'copies': [ - { - 'files': [ 'common/ca-bundle.crt' ], - 'destination': '<(PRODUCT_DIR)' - } - ] + 'copies': [{ + 'files': [ 'common/ca-bundle.crt' ], + 'destination': '<(PRODUCT_DIR)' + }], }, { 'target_name': 'mapboxgl', diff --git a/test/test.gyp b/test/test.gyp index f73c94bf0..b32f0f515 100644 --- a/test/test.gyp +++ b/test/test.gyp @@ -189,7 +189,6 @@ "dependencies": [ "../deps/gtest/gtest.gyp:gtest", "../mapboxgl.gyp:mapboxgl", - '../mapboxgl.gyp:bundle_styles', "link_gl", ] }, From fd8280eb515c93717b31a1937453dd3a60aaccf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20Ka=CC=88fer?= Date: Tue, 12 Aug 2014 12:26:07 +0200 Subject: [PATCH 5/6] include correct uv header in test fixture --- test/fixtures/fixture_request.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/fixtures/fixture_request.cpp b/test/fixtures/fixture_request.cpp index b73020590..1a7ed2ccc 100644 --- a/test/fixtures/fixture_request.cpp +++ b/test/fixtures/fixture_request.cpp @@ -1,6 +1,6 @@ #include #include -#include +#include #include const std::string base_directory = []{ From 49df931935d917a13979114714aa472d84467643 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20Ka=CC=88fer?= Date: Tue, 12 Aug 2014 12:36:12 +0200 Subject: [PATCH 6/6] bump cocoa dependency --- ios/mapbox-gl-cocoa | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios/mapbox-gl-cocoa b/ios/mapbox-gl-cocoa index ced284d8a..644f1f9f5 160000 --- a/ios/mapbox-gl-cocoa +++ b/ios/mapbox-gl-cocoa @@ -1 +1 @@ -Subproject commit ced284d8a7bfc66540d8af50f811fd4df0e0886f +Subproject commit 644f1f9f5d77f2f0840217077e8b10a31ecddc1e