[build] rework platform/default directory and add -files.txt for vend…

…ored libs

circle.yml

@@ -466,8 +466,8 @@ jobs:
     steps:
       - install-dependencies: { mason: false, ccache: false }
       - run:
-          name: Initialize submodule
-          command: git submodule update --init mapbox-gl-js
+          name: Initialize submodules
+          command: git submodule update --init
       - run:
           name: Verify submodule pin
           command: scripts/nitpick/submodule-pin.js

cmake/benchmark-files.txt

@@ -23,4 +23,3 @@ benchmark/parse/vector_tile.benchmark.cpp
 # util
 benchmark/util/dtoa.benchmark.cpp
 benchmark/util/tilecover.benchmark.cpp
-

cmake/benchmark.cmake

@@ -6,7 +6,7 @@ target_include_directories(mbgl-benchmark
     PRIVATE src
     PRIVATE benchmark/include
     PRIVATE benchmark/src
-    PRIVATE platform/default
+    PRIVATE platform/default/include
 )
 
 target_link_libraries(mbgl-benchmark

cmake/core-files.txt

@@ -802,4 +802,3 @@ src/mbgl/util/utf.hpp
 src/mbgl/util/version.cpp
 src/mbgl/util/version.hpp
 src/mbgl/util/work_request.cpp
-

cmake/files.txt.ejs

@@ -2,9 +2,8 @@
   const groups = locals.groups;
 -%>
 # This file is generated. Do not edit. Regenerate this with scripts/generate-cmake-files.js
-
 <% for (const key of Object.keys(groups).sort()) { -%>
+
 # <%- key %>
 <%- groups[key].sort().join('\n') %>
-
 <% } -%>

cmake/filesource-files.txt

@@ -1,25 +1,25 @@
 # File source
 include/mbgl/storage/default_file_source.hpp
-platform/default/default_file_source.cpp
-platform/default/mbgl/storage/file_source_request.hpp
-platform/default/file_source_request.cpp
+platform/default/src/mbgl/storage/default_file_source.cpp
+platform/default/include/mbgl/storage/file_source_request.hpp
+platform/default/src/mbgl/storage/file_source_request.cpp
 include/mbgl/storage/online_file_source.hpp
-platform/default/online_file_source.cpp
+platform/default/src/mbgl/storage/online_file_source.cpp
 src/mbgl/storage/http_file_source.hpp
 src/mbgl/storage/asset_file_source.hpp
-platform/default/asset_file_source.cpp
+platform/default/src/mbgl/storage/asset_file_source.cpp
 src/mbgl/storage/local_file_source.hpp
-platform/default/local_file_source.cpp
+platform/default/src/mbgl/storage/local_file_source.cpp
 
 # Offline
 include/mbgl/storage/offline.hpp
-platform/default/mbgl/storage/offline.cpp
-platform/default/mbgl/storage/offline_database.hpp
-platform/default/mbgl/storage/offline_database.cpp
-platform/default/mbgl/storage/offline_download.hpp
-platform/default/mbgl/storage/offline_download.cpp
-platform/default/mbgl/storage/offline_schema.hpp
-platform/default/mbgl/storage/merge_sideloaded.hpp
+platform/default/src/mbgl/storage/offline.cpp
+platform/default/include/mbgl/storage/offline_database.hpp
+platform/default/src/mbgl/storage/offline_database.cpp
+platform/default/include/mbgl/storage/offline_download.hpp
+platform/default/src/mbgl/storage/offline_download.cpp
+platform/default/include/mbgl/storage/offline_schema.hpp
+platform/default/include/mbgl/storage/merge_sideloaded.hpp
 
 # Database
-platform/default/sqlite3.hpp
+platform/default/include/mbgl/storage/sqlite3.hpp

cmake/filesource.cmake

@@ -5,7 +5,7 @@ add_library(mbgl-filesource STATIC ${MBGL_FILESOURCE_FILES})
 target_include_directories(mbgl-filesource
     PRIVATE include
     PRIVATE src
-    PRIVATE platform/default
+    PRIVATE platform/default/include
 )
 
 target_link_libraries(mbgl-filesource

cmake/glfw.cmake

@@ -9,11 +9,11 @@ target_sources(mbgl-glfw
     PRIVATE platform/glfw/glfw_renderer_frontend.cpp
     PRIVATE platform/glfw/settings_json.hpp
     PRIVATE platform/glfw/settings_json.cpp
-    PRIVATE platform/default/mbgl/util/default_styles.hpp
+    PRIVATE platform/default/include/mbgl/util/default_styles.hpp
 )
 
 target_include_directories(mbgl-glfw
-    PRIVATE platform/default
+    PRIVATE platform/default/include
 )
 
 target_link_libraries(mbgl-glfw

cmake/loop-uv.cmake

@@ -1,9 +1,9 @@
 add_library(mbgl-loop-uv INTERFACE)
 
 target_sources(mbgl-loop-uv INTERFACE
-    ${CMAKE_CURRENT_SOURCE_DIR}/platform/default/async_task.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/platform/default/run_loop.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/platform/default/timer.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/platform/default/src/mbgl/util/async_task.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/platform/default/src/mbgl/util/run_loop.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/platform/default/src/mbgl/util/timer.cpp
 )
 
 target_include_directories(mbgl-loop-uv INTERFACE

cmake/node.cmake

@@ -5,9 +5,9 @@ include(node_modules/@mapbox/cmake-node-module/module.cmake)
 add_library(mbgl-loop-node INTERFACE)
 
 target_sources(mbgl-loop-node INTERFACE
-    ${CMAKE_CURRENT_SOURCE_DIR}/platform/default/async_task.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/platform/default/run_loop.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/platform/default/timer.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/platform/default/src/mbgl/util/async_task.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/platform/default/src/mbgl/util/run_loop.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/platform/default/src/mbgl/util/timer.cpp
 )
 
 target_include_directories(mbgl-loop-node INTERFACE
@@ -49,7 +49,7 @@ target_sources(mbgl-node INTERFACE
 )
 
 target_include_directories(mbgl-node INTERFACE
-    ${CMAKE_CURRENT_SOURCE_DIR}/platform/default
+    ${CMAKE_CURRENT_SOURCE_DIR}/platform/default/include
 )
 
 target_link_libraries(mbgl-node INTERFACE

cmake/offline.cmake

@@ -3,11 +3,11 @@ add_executable(mbgl-offline
 )
 
 target_sources(mbgl-offline
-    PRIVATE platform/default/mbgl/util/default_styles.hpp
+    PRIVATE platform/default/include/mbgl/util/default_styles.hpp
 )
 
 target_include_directories(mbgl-offline
-    PRIVATE platform/default
+    PRIVATE platform/default/include
 )
 
 target_link_libraries(mbgl-offline

cmake/render.cmake

@@ -3,7 +3,7 @@ add_executable(mbgl-render
 )
 
 target_include_directories(mbgl-render
-    PRIVATE platform/default
+    PRIVATE platform/default/include
 )
 
 target_link_libraries(mbgl-render

cmake/test-files.txt

@@ -153,4 +153,3 @@ test/util/tile_range.test.cpp
 test/util/timer.test.cpp
 test/util/token.test.cpp
 test/util/url.test.cpp
-

cmake/test.cmake

@@ -21,7 +21,7 @@ target_include_directories(mbgl-test
     PRIVATE src
     PRIVATE test/include
     PRIVATE test/src
-    PRIVATE platform/default
+    PRIVATE platform/default/include
 )
 
 target_link_libraries(mbgl-test PRIVATE

platform/android/config.cmake

@@ -38,7 +38,7 @@ macro(mbgl_platform_core)
     target_sources_from_file(mbgl-core PRIVATE platform/android/core-files.txt)
 
     target_include_directories(mbgl-core
-        PUBLIC platform/default
+        PUBLIC platform/default/include
         PRIVATE platform/android
     )
 
@@ -90,7 +90,7 @@ target_link_libraries(mapbox-gl
 set(MBGL_TEST_TARGET_TYPE "library")
 macro(mbgl_platform_test)
     target_sources(mbgl-test
-        PRIVATE platform/default/mbgl/test/main.cpp
+        PRIVATE platform/default/src/mbgl/test/main.cpp
 
         # Main test entry point
         platform/android/src/test/main.jni.cpp

platform/android/core-files.txt

@@ -1,3 +1,6 @@
+# JNI overrides
+platform/default/include/jni/string_conversion.hpp
+
 # Loop
 platform/android/src/async_task.cpp
 platform/android/src/run_loop.cpp
@@ -12,25 +15,25 @@ platform/android/src/text/local_glyph_rasterizer_jni.hpp
 platform/android/src/logging_android.cpp
 platform/android/src/thread.cpp
 platform/android/src/string_util.cpp
-platform/default/bidi.cpp
-platform/default/thread_local.cpp
+platform/default/src/mbgl/text/bidi.cpp
+platform/default/src/mbgl/util/thread_local.cpp
 platform/android/src/unaccent.cpp
-platform/default/unaccent.hpp
-platform/default/utf.cpp
+platform/default/include/mbgl/text/unaccent.hpp
+platform/default/src/mbgl/util/utf.cpp
 
 # Image handling
-platform/default/png_writer.cpp
+platform/default/src/mbgl/util/png_writer.cpp
 platform/android/src/bitmap.cpp
 platform/android/src/bitmap.hpp
 platform/android/src/bitmap_factory.cpp
 platform/android/src/bitmap_factory.hpp
 platform/android/src/image.cpp
 
 # Thread pool
-platform/default/mbgl/util/shared_thread_pool.cpp
-platform/default/mbgl/util/shared_thread_pool.hpp
-platform/default/mbgl/util/default_thread_pool.cpp
-platform/default/mbgl/util/default_thread_pool.hpp
+platform/default/src/mbgl/util/shared_thread_pool.cpp
+platform/default/include/mbgl/util/shared_thread_pool.hpp
+platform/default/src/mbgl/util/default_thread_pool.cpp
+platform/default/include/mbgl/util/default_thread_pool.hpp
 
 # Rendering
 platform/android/src/android_renderer_backend.cpp
@@ -39,12 +42,12 @@ platform/android/src/android_renderer_frontend.cpp
 platform/android/src/android_renderer_frontend.hpp
 
 # Snapshots (core)
-platform/default/mbgl/gl/headless_backend.cpp
-platform/default/mbgl/gl/headless_backend.hpp
-platform/default/mbgl/gl/headless_frontend.cpp
-platform/default/mbgl/gl/headless_frontend.hpp
-platform/default/mbgl/map/map_snapshotter.cpp
-platform/default/mbgl/map/map_snapshotter.hpp
+platform/default/src/mbgl/gl/headless_backend.cpp
+platform/default/include/mbgl/gl/headless_backend.hpp
+platform/default/src/mbgl/gl/headless_frontend.cpp
+platform/default/include/mbgl/gl/headless_frontend.hpp
+platform/default/src/mbgl/map/map_snapshotter.cpp
+platform/default/include/mbgl/map/map_snapshotter.hpp
 platform/linux/src/headless_backend_egl.cpp
 
 # Conversion C++ -> Java
@@ -74,7 +77,6 @@ platform/android/src/map/image.hpp
 platform/android/src/style/android_conversion.hpp
 platform/android/src/style/value.cpp
 platform/android/src/style/value.hpp
-platform/android/src/style/conversion/url_or_tileset.hpp
 
 # Style
 platform/android/src/style/transition_options.cpp
@@ -160,13 +162,13 @@ platform/android/src/geojson/line_string.hpp
 platform/android/src/geojson/multi_line_string.cpp
 platform/android/src/geojson/multi_line_string.hpp
 platform/android/src/geojson/multi_point.cpp
-platform/android/src/geojson/multi_point.hpp
 platform/android/src/geojson/multi_polygon.cpp
 platform/android/src/geojson/multi_polygon.hpp
 platform/android/src/geojson/point.cpp
 platform/android/src/geojson/point.hpp
 platform/android/src/geojson/polygon.cpp
 platform/android/src/geojson/polygon.hpp
+platform/android/src/geojson/util.hpp
 
 # Geometry
 platform/android/src/geometry/lat_lng.cpp
@@ -191,6 +193,7 @@ platform/android/src/gson/json_primitive.hpp
 # Annotation
 platform/android/src/annotation/marker.cpp
 platform/android/src/annotation/marker.hpp
+platform/android/src/annotation/multi_point.hpp
 platform/android/src/annotation/polygon.cpp
 platform/android/src/annotation/polygon.hpp
 platform/android/src/annotation/polyline.cpp

platform/android/filesource-files.txt

@@ -25,4 +25,4 @@ platform/android/src/offline/offline_region_status.cpp
 platform/android/src/offline/offline_region_status.hpp
 
 # Database
-platform/default/sqlite3.cpp
+platform/default/src/mbgl/storage/sqlite3.cpp

platform/android/src/file_source.cpp

@@ -6,7 +6,7 @@
 #include <mbgl/storage/resource_transform.hpp>
 #include <mbgl/util/logging.hpp>
 
-#include <sqlite3.hpp>
+#include <mbgl/storage/sqlite3.hpp>
 
 #include "asset_manager_file_source.hpp"
 

platform/android/src/jni.cpp

@@ -1,8 +1,6 @@
 #include "jni.hpp"
 
 #include <mbgl/util/logging.hpp>
-#include <src/style/formatted.hpp>
-#include <src/style/formatted_section.hpp>
 
 #include "annotation/marker.hpp"
 #include "annotation/polygon.hpp"
@@ -46,6 +44,8 @@
 #include "style/layers/layer_manager.hpp"
 #include "style/sources/source.hpp"
 #include "style/light.hpp"
+#include "style/formatted.hpp"
+#include "style/formatted_section.hpp"
 #include "snapshotter/map_snapshotter.hpp"
 #include "snapshotter/map_snapshot.hpp"
 #include "text/collator_jni.hpp"

platform/android/src/text/collator.cpp

@@ -2,7 +2,7 @@
 #include <mbgl/text/language_tag.hpp>
 #include <mbgl/util/platform.hpp>
 
-#include <unaccent.hpp>
+#include <mbgl/text/unaccent.hpp>
 
 #include <jni/jni.hpp>
 

platform/android/src/unaccent.cpp

@@ -1,4 +1,4 @@
-#include <unaccent.hpp>
+#include <mbgl/text/unaccent.hpp>
 #include <string>
 #include "attach_env.hpp"
 #include "text/collator_jni.hpp"

platform/darwin/filesource-files.txt

@@ -3,4 +3,4 @@ platform/darwin/src/http_file_source.mm
 platform/darwin/src/MGLLoggingConfiguration.m
 
 # Database
-platform/default/sqlite3.cpp
+platform/default/src/mbgl/storage/sqlite3.cpp

platform/default/sqlite3.hpp → platform/default/include/mbgl/storage/sqlite3.hpp

@@ -72,10 +72,10 @@ void setTempPath(const std::string&);
 class Database {
 private:
     Database(std::unique_ptr<DatabaseImpl>);
-    Database(const Database &) = delete;
-    Database &operator=(const Database &) = delete;
 
 public:
+    Database(const Database &) = delete;
+    Database &operator=(const Database &) = delete;
     static mapbox::util::variant<Database, Exception> tryOpen(const std::string &filename, int flags = 0);
     static Database open(const std::string &filename, int flags = 0);
 
@@ -154,12 +154,11 @@ class Query {
 };
 
 class Transaction {
-private:
+public:
     Transaction(const Transaction&) = delete;
     Transaction(Transaction&&) = delete;
     Transaction& operator=(const Transaction&) = delete;
 
-public:
     enum Mode {
         Deferred,
         Immediate,
@@ -177,5 +176,5 @@ class Transaction {
     bool needRollback = true;
 };
 
-}
-}
+} // namespace sqlite
+} // namespace mapbox

platform/default/mbgl/storage/offline_database.cpp → platform/default/src/mbgl/storage/offline_database.cpp

@@ -1,15 +1,15 @@
 #include <mbgl/storage/offline_database.hpp>
 #include <mbgl/storage/response.hpp>
+#include <mbgl/storage/sqlite3.hpp>
 #include <mbgl/util/compression.hpp>
 #include <mbgl/util/io.hpp>
 #include <mbgl/util/string.hpp>
 #include <mbgl/util/chrono.hpp>
 #include <mbgl/util/logging.hpp>
 
-#include "offline_schema.hpp"
-#include "merge_sideloaded.hpp"
+#include <mbgl/storage/offline_schema.hpp>
+#include <mbgl/storage/merge_sideloaded.hpp>
 
-#include "sqlite3.hpp"
 
 namespace mbgl {