From ef124e9331e70f3c34d04799fffc632e62932a2c Mon Sep 17 00:00:00 2001 From: Mikhail Pozdnyakov Date: Fri, 30 Aug 2019 11:54:57 +0300 Subject: [build] Bump mapbox-base version --- scripts/generate-file-lists.js | 2 +- vendor/mapbox-base | 2 +- vendor/mapbox-base-files.json | 44 +++++++++++++++++++++--------------------- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/scripts/generate-file-lists.js b/scripts/generate-file-lists.js index 2100928438..e87f6479a1 100755 --- a/scripts/generate-file-lists.js +++ b/scripts/generate-file-lists.js @@ -138,7 +138,7 @@ generateFileList('vendor/geojson.hpp-files.json', [ 'vendor/geojson.hpp' ], vend generateFileList('vendor/icu-files.json', [ 'vendor/icu' ], vendorRegex, [ "include/**/*.h", "src/*.h", "src/*.cpp" ]); generateFileList('vendor/jni.hpp-files.json', [ 'vendor/jni.hpp' ], vendorRegex, [ "include/**/*.hpp", ":!:include/jni/string_conversion.hpp" ]); generateFileList('vendor/kdbush.hpp-files.json', [ 'vendor/kdbush.hpp' ], vendorRegex, [ "include/*.hpp" ]); -generateFileList('vendor/mapbox-base-files.json', [ 'vendor/mapbox-base/libs/geometry.hpp', 'vendor/mapbox-base/libs/variant', 'vendor/mapbox-base/libs/optional' ], vendorRegex, [ "include/*.hpp", "include/**/*.hpp", "optional.hpp" ]); +generateFileList('vendor/mapbox-base-files.json', [ 'vendor/mapbox-base/mapbox/geometry.hpp', 'vendor/mapbox-base/mapbox/variant', 'vendor/mapbox-base/mapbox/optional' ], vendorRegex, [ "include/*.hpp", "include/**/*.hpp", "optional.hpp" ]); generateFileList('vendor/pixelmatch-cpp-files.json', [ 'vendor/pixelmatch-cpp' ], vendorRegex, [ "include/**/*.hpp" ]); generateFileList('vendor/polylabel-files.json', [ 'vendor/polylabel' ], vendorRegex, [ "include/**/*.hpp" ]); generateFileList('vendor/protozero-files.json', [ 'vendor/protozero' ], vendorRegex, [ "include/**/*.hpp" ]); diff --git a/vendor/mapbox-base b/vendor/mapbox-base index 13fa9eced8..498ee3f41a 160000 --- a/vendor/mapbox-base +++ b/vendor/mapbox-base @@ -1 +1 @@ -Subproject commit 13fa9eced82977791d814a7d549b2b6929b82b32 +Subproject commit 498ee3f41a927a97376e1c9491693e0cc5fe1455 diff --git a/vendor/mapbox-base-files.json b/vendor/mapbox-base-files.json index 2e952b9661..4539877205 100644 --- a/vendor/mapbox-base-files.json +++ b/vendor/mapbox-base-files.json @@ -2,28 +2,28 @@ "//": "This file is generated. Do not edit. Regenerate it with scripts/generate-file-lists.js", "sources": [], "public_headers": { - "mapbox/feature.hpp": "vendor/mapbox-base/libs/geometry.hpp/include/mapbox/feature.hpp", - "mapbox/geometry.hpp": "vendor/mapbox-base/libs/geometry.hpp/include/mapbox/geometry.hpp", - "mapbox/geometry/box.hpp": "vendor/mapbox-base/libs/geometry.hpp/include/mapbox/geometry/box.hpp", - "mapbox/geometry/empty.hpp": "vendor/mapbox-base/libs/geometry.hpp/include/mapbox/geometry/empty.hpp", - "mapbox/geometry/envelope.hpp": "vendor/mapbox-base/libs/geometry.hpp/include/mapbox/geometry/envelope.hpp", - "mapbox/geometry/for_each_point.hpp": "vendor/mapbox-base/libs/geometry.hpp/include/mapbox/geometry/for_each_point.hpp", - "mapbox/geometry/geometry.hpp": "vendor/mapbox-base/libs/geometry.hpp/include/mapbox/geometry/geometry.hpp", - "mapbox/geometry/line_string.hpp": "vendor/mapbox-base/libs/geometry.hpp/include/mapbox/geometry/line_string.hpp", - "mapbox/geometry/multi_line_string.hpp": "vendor/mapbox-base/libs/geometry.hpp/include/mapbox/geometry/multi_line_string.hpp", - "mapbox/geometry/multi_point.hpp": "vendor/mapbox-base/libs/geometry.hpp/include/mapbox/geometry/multi_point.hpp", - "mapbox/geometry/multi_polygon.hpp": "vendor/mapbox-base/libs/geometry.hpp/include/mapbox/geometry/multi_polygon.hpp", - "mapbox/geometry/point.hpp": "vendor/mapbox-base/libs/geometry.hpp/include/mapbox/geometry/point.hpp", - "mapbox/geometry/point_arithmetic.hpp": "vendor/mapbox-base/libs/geometry.hpp/include/mapbox/geometry/point_arithmetic.hpp", - "mapbox/geometry/polygon.hpp": "vendor/mapbox-base/libs/geometry.hpp/include/mapbox/geometry/polygon.hpp", - "mapbox/geometry_io.hpp": "vendor/mapbox-base/libs/geometry.hpp/include/mapbox/geometry_io.hpp", - "optional.hpp": "vendor/mapbox-base/libs/optional/optional.hpp", - "mapbox/optional.hpp": "vendor/mapbox-base/libs/variant/include/mapbox/optional.hpp", - "mapbox/recursive_wrapper.hpp": "vendor/mapbox-base/libs/variant/include/mapbox/recursive_wrapper.hpp", - "mapbox/variant.hpp": "vendor/mapbox-base/libs/variant/include/mapbox/variant.hpp", - "mapbox/variant_cast.hpp": "vendor/mapbox-base/libs/variant/include/mapbox/variant_cast.hpp", - "mapbox/variant_io.hpp": "vendor/mapbox-base/libs/variant/include/mapbox/variant_io.hpp", - "mapbox/variant_visitor.hpp": "vendor/mapbox-base/libs/variant/include/mapbox/variant_visitor.hpp" + "mapbox/feature.hpp": "vendor/mapbox-base/mapbox/geometry.hpp/include/mapbox/feature.hpp", + "mapbox/geometry.hpp": "vendor/mapbox-base/mapbox/geometry.hpp/include/mapbox/geometry.hpp", + "mapbox/geometry/box.hpp": "vendor/mapbox-base/mapbox/geometry.hpp/include/mapbox/geometry/box.hpp", + "mapbox/geometry/empty.hpp": "vendor/mapbox-base/mapbox/geometry.hpp/include/mapbox/geometry/empty.hpp", + "mapbox/geometry/envelope.hpp": "vendor/mapbox-base/mapbox/geometry.hpp/include/mapbox/geometry/envelope.hpp", + "mapbox/geometry/for_each_point.hpp": "vendor/mapbox-base/mapbox/geometry.hpp/include/mapbox/geometry/for_each_point.hpp", + "mapbox/geometry/geometry.hpp": "vendor/mapbox-base/mapbox/geometry.hpp/include/mapbox/geometry/geometry.hpp", + "mapbox/geometry/line_string.hpp": "vendor/mapbox-base/mapbox/geometry.hpp/include/mapbox/geometry/line_string.hpp", + "mapbox/geometry/multi_line_string.hpp": "vendor/mapbox-base/mapbox/geometry.hpp/include/mapbox/geometry/multi_line_string.hpp", + "mapbox/geometry/multi_point.hpp": "vendor/mapbox-base/mapbox/geometry.hpp/include/mapbox/geometry/multi_point.hpp", + "mapbox/geometry/multi_polygon.hpp": "vendor/mapbox-base/mapbox/geometry.hpp/include/mapbox/geometry/multi_polygon.hpp", + "mapbox/geometry/point.hpp": "vendor/mapbox-base/mapbox/geometry.hpp/include/mapbox/geometry/point.hpp", + "mapbox/geometry/point_arithmetic.hpp": "vendor/mapbox-base/mapbox/geometry.hpp/include/mapbox/geometry/point_arithmetic.hpp", + "mapbox/geometry/polygon.hpp": "vendor/mapbox-base/mapbox/geometry.hpp/include/mapbox/geometry/polygon.hpp", + "mapbox/geometry_io.hpp": "vendor/mapbox-base/mapbox/geometry.hpp/include/mapbox/geometry_io.hpp", + "optional.hpp": "vendor/mapbox-base/mapbox/optional/optional.hpp", + "mapbox/optional.hpp": "vendor/mapbox-base/mapbox/variant/include/mapbox/optional.hpp", + "mapbox/recursive_wrapper.hpp": "vendor/mapbox-base/mapbox/variant/include/mapbox/recursive_wrapper.hpp", + "mapbox/variant.hpp": "vendor/mapbox-base/mapbox/variant/include/mapbox/variant.hpp", + "mapbox/variant_cast.hpp": "vendor/mapbox-base/mapbox/variant/include/mapbox/variant_cast.hpp", + "mapbox/variant_io.hpp": "vendor/mapbox-base/mapbox/variant/include/mapbox/variant_io.hpp", + "mapbox/variant_visitor.hpp": "vendor/mapbox-base/mapbox/variant/include/mapbox/variant_visitor.hpp" }, "private_headers": {} } -- cgit v1.2.1