tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[general] moving ios and android project under ./platform folder

Browse Source
This commit is contained in:
Petr Pokorny
2020-12-20 12:38:56 +01:00
parent 8e759a51e4
commit 41f0be34e7
9877 changed files with 141 additions and 2889 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@@ -55,3 +55,6 @@
[submodule "platform/ios/platform/darwin/docs/theme"] [submodule "platform/ios/platform/darwin/docs/theme"]
path = platform/ios/platform/darwin/docs/theme path = platform/ios/platform/darwin/docs/theme
url = https://github.com/mapbox/jazzy-theme.git url = https://github.com/mapbox/jazzy-theme.git
[submodule "platform/android/vendor/mapbox-events-android"]
path = platform/android/vendor/mapbox-events-android
url = https://github.com/mapbox/mapbox-events-android.git

0
mapbox-gl-native/ARCHITECTURE.md → ARCHITECTURE.md
View File

0
mapbox-gl-native/CHANGELOG.md → CHANGELOG.md
View File

0
mapbox-gl-native/CMakeLists.txt → CMakeLists.txt
View File

0
mapbox-gl-native-ios/CODE-OF-CONDUCT.md → CODE-OF-CONDUCT.md
View File

0
mapbox-gl-native-ios/CONTRIBUTING.md → CONTRIBUTING.md
View File

0
mapbox-gl-native/DEVELOPING.md → DEVELOPING.md
View File

0
mapbox-gl-native/LICENSE.mbgl-core.md → LICENSE.mbgl-core.md
View File

0
mapbox-gl-native/LICENSE.md → LICENSE.md
View File

30
README.md
View File

@@ -6,10 +6,10 @@ For iOS and Android
| SDK | Build | Build status | | SDK | Build | Build status |
|---------------------------------------------------------------|---------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| |---------------------------------------------------------------|---------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| [Mapbox Maps SDK for iOS](mapbox-gl-native-ios/platform/ios/) | CI | [![Github Action build status](https://github.com/maptiler/maplibre-gl-native/workflows/ios-ci/badge.svg)](https://github.com/maptiler/maplibre-gl-native/workflows/ios-ci) | | [Mapbox Maps SDK for iOS](platform/ios/) | CI | [![Github Action build status](https://github.com/maptiler/maplibre-gl-native/workflows/ios-ci/badge.svg)](https://github.com/maptiler/maplibre-gl-native/workflows/ios-ci) |
| [Mapbox Maps SDK for iOS](mapbox-gl-native-ios/platform/ios/) | Release | [![Github Action build status](https://github.com/maptiler/maplibre-gl-native/workflows/ios-release/badge.svg)](https://github.com/maptiler/maplibre-gl-native/workflows/ios-release) | | [Mapbox Maps SDK for iOS](platform/ios/) | Release | [![Github Action build status](https://github.com/maptiler/maplibre-gl-native/workflows/ios-release/badge.svg)](https://github.com/maptiler/maplibre-gl-native/workflows/ios-release) |
| [Mapbox Maps SDK for Android](mapbox-gl-native-android/) | CI | [![Github Action build status](https://github.com/maptiler/maplibre-gl-native/workflows/android-ci/badge.svg)](https://github.com/maptiler/maplibre-gl-native/workflows/android-ci) | | [Mapbox Maps SDK for Android](platform/android/) | CI | [![Github Action build status](https://github.com/maptiler/maplibre-gl-native/workflows/android-ci/badge.svg)](https://github.com/maptiler/maplibre-gl-native/workflows/android-ci) |
| [Mapbox Maps SDK for Android](mapbox-gl-native-iandroid/) | Release | [![Github Action build status](https://github.com/maptiler/maplibre-gl-native/workflows/android-release/badge.svg)](https://github.com/maptiler/maplibre-gl-native/workflows/android-release) | | [Mapbox Maps SDK for Android](platform/android/) | Release | [![Github Action build status](https://github.com/maptiler/maplibre-gl-native/workflows/android-release/badge.svg)](https://github.com/maptiler/maplibre-gl-native/workflows/android-release) |
## Installation ## Installation
@@ -57,40 +57,40 @@ You can also download pre-build from releases in this repository.
### Source code checkout ### Source code checkout
```bash ```bash
git clone --recurse-submodules https://github.com/maptiler/mapbox-gl-mobile.git git clone --recurse-submodules https://github.com/maptiler/maplibre-gl-native.git
``` ```
### Build ### Build
#### Android #### Android
> Make sure you have set Android SDK path in mapbox-gl-native-android/local.properties, variable sdk.dir > Make sure you have set Android SDK path in platform/android/local.properties, variable sdk.dir
```bash ```bash
cd mapbox-gl-native-android cd platform/android
BUILDTYPE=Release make apackage BUILDTYPE=Release make apackage
``` ```
Binaries are produced in `mapbox-gl-native-android/MapboxGLAndroidSDK/build/outputs/aar/MapboxGLAndroidSDK-release.aar` Binaries are produced in `platform/android/MapboxGLAndroidSDK/build/outputs/aar/MapboxGLAndroidSDK-release.aar`
Please refer to [Mapbox Maps SDK for Android](mapbox-gl-native-android/) for detailed instructions. Please refer to [Mapbox Maps SDK for Android](platform/android/) for detailed instructions.
#### iOS #### iOS
```bash ```bash
cd mapbox-gl-native-ios cd platform/ios
make xcframework BUILDTYPE=Release make xcframework BUILDTYPE=Release
``` ```
The packaging script will produce a `build/ios/pkg/dynamic` The packaging script will produce a `platform/ios/build/ios/pkg/dynamic`
Please refer to [Mapbox Maps SDK for iOS](mapbox-gl-native-ios/platform/ios/) for detailed instructions. Please refer to [Mapbox Maps SDK for iOS](platform/ios/platform/ios/) for detailed instructions.
#### MacOS #### MacOS
```bash ```bash
cd mapbox-gl-native-ios cd platform/ios
make xpackage make xpackage
``` ```
This produces a `Mapbox.framework` in the `build/macos/pkg/` folder. This produces a `Mapbox.framework` in the `platform/ios/build/macos/pkg/` folder.
Please refer to [Mapbox Maps SDK for macos](mapbox-gl-native-ios/platform/macos/) for detailed instructions. Please refer to [Mapbox Maps SDK for macos](platform/ios/platform/macos/) for detailed instructions.

0
mapbox-gl-native/appveyor.yml → appveyor.yml
View File

0
mapbox-gl-native/benchmark/CMakeLists.txt → benchmark/CMakeLists.txt
View File

0
mapbox-gl-native/benchmark/android/README.md → benchmark/android/README.md
View File

0
mapbox-gl-native/benchmark/android/app/build.gradle → benchmark/android/app/build.gradle
View File

0
mapbox-gl-native/benchmark/android/app/src/androidTest/java/android/app/NativeActivityTest.java → benchmark/android/app/src/androidTest/java/android/app/NativeActivityTest.java
View File

0
mapbox-gl-native/benchmark/android/app/src/androidTest/java/android/app/TestState.java → benchmark/android/app/src/androidTest/java/android/app/TestState.java
View File

0
mapbox-gl-native/benchmark/android/app/src/main/AndroidManifest.xml → benchmark/android/app/src/main/AndroidManifest.xml
View File

0
mapbox-gl-native/benchmark/android/app/src/main/assets/to_zip.txt → benchmark/android/app/src/main/assets/to_zip.txt
View File

0
mapbox-gl-native/benchmark/android/app/src/main/res/mipmap-hdpi/ic_launcher.png → benchmark/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

0
mapbox-gl-native/benchmark/android/app/src/main/res/mipmap-mdpi/ic_launcher.png → benchmark/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

0
mapbox-gl-native/benchmark/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png → benchmark/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.7 KiB

After

Width:  |  Height:  |  Size: 4.7 KiB

0
mapbox-gl-native/benchmark/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png → benchmark/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.5 KiB

After

Width:  |  Height:  |  Size: 7.5 KiB

0
mapbox-gl-native/benchmark/android/app/src/main/res/values/strings.xml → benchmark/android/app/src/main/res/values/strings.xml
View File

0
mapbox-gl-native/benchmark/android/build.gradle → benchmark/android/build.gradle
View File

0
mapbox-gl-native/benchmark/android/gradle.properties → benchmark/android/gradle.properties
View File

0
mapbox-gl-native/benchmark/android/gradle/wrapper/gradle-wrapper.jar → benchmark/android/gradle/wrapper/gradle-wrapper.jar vendored
View File

0
mapbox-gl-native/benchmark/android/gradle/wrapper/gradle-wrapper.properties → benchmark/android/gradle/wrapper/gradle-wrapper.properties vendored
View File

0
mapbox-gl-native/benchmark/android/gradlew → benchmark/android/gradlew vendored
View File

0
mapbox-gl-native/benchmark/android/gradlew.bat → benchmark/android/gradlew.bat vendored
View File

0
mapbox-gl-native/benchmark/android/settings.gradle → benchmark/android/settings.gradle
View File

0
mapbox-gl-native/benchmark/api/query.benchmark.cpp → benchmark/api/query.benchmark.cpp
View File

0
mapbox-gl-native/benchmark/api/render.benchmark.cpp → benchmark/api/render.benchmark.cpp
View File

0
mapbox-gl-native/benchmark/fixtures/api/cache.db → benchmark/fixtures/api/cache.db
View File

0
mapbox-gl-native/benchmark/fixtures/api/default_marker.png → benchmark/fixtures/api/default_marker.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1010 B

After

Width:  |  Height:  |  Size: 1010 B

0
mapbox-gl-native/benchmark/fixtures/api/style.json → benchmark/fixtures/api/style.json
View File

0
mapbox-gl-native/benchmark/fixtures/api/style_formatted_labels.json → benchmark/fixtures/api/style_formatted_labels.json
View File

0
mapbox-gl-native/benchmark/function/camera_function.benchmark.cpp → benchmark/function/camera_function.benchmark.cpp
View File

0
mapbox-gl-native/benchmark/function/composite_function.benchmark.cpp → benchmark/function/composite_function.benchmark.cpp
View File

0
mapbox-gl-native/benchmark/function/source_function.benchmark.cpp → benchmark/function/source_function.benchmark.cpp
View File

0
mapbox-gl-native/benchmark/include/mbgl/benchmark.hpp → benchmark/include/mbgl/benchmark.hpp
View File

0
mapbox-gl-native/benchmark/ios/BenchmarkApp_iphoneos13.2-arm64e-debug.xctestrun → benchmark/ios/BenchmarkApp_iphoneos13.2-arm64e-debug.xctestrun
View File

0
mapbox-gl-native/benchmark/ios/BenchmarkApp_iphoneos13.2-arm64e-release.xctestrun → benchmark/ios/BenchmarkApp_iphoneos13.2-arm64e-release.xctestrun
View File

0
mapbox-gl-native/benchmark/ios/Info.plist → benchmark/ios/Info.plist
View File

0
mapbox-gl-native/benchmark/ios/README.md → benchmark/ios/README.md
View File

0
mapbox-gl-native/benchmark/ios/codesigning/BenchmarkApp.app.xcent.template → benchmark/ios/codesigning/BenchmarkApp.app.xcent.template
View File

0
mapbox-gl-native/benchmark/ios/codesigning/BenchmarkAppTests.xctest.xcent.template → benchmark/ios/codesigning/BenchmarkAppTests.xctest.xcent.template
View File

0
mapbox-gl-native/benchmark/ios/codesigning/XCTAutomationSupport.framework.xcent.template → benchmark/ios/codesigning/XCTAutomationSupport.framework.xcent.template
View File

0
mapbox-gl-native/benchmark/ios/codesigning/XCTest.framework.xcent.template → benchmark/ios/codesigning/XCTest.framework.xcent.template
View File

0
mapbox-gl-native/benchmark/ios/codesigning/codesign_all.sh → benchmark/ios/codesigning/codesign_all.sh
View File

0
mapbox-gl-native/benchmark/ios/codesigning/generate-entitlements.swift → benchmark/ios/codesigning/generate-entitlements.swift
View File

0
mapbox-gl-native/benchmark/ios/codesigning/libXCTestSwiftSupport.dylib.xcent.template → benchmark/ios/codesigning/libXCTestSwiftSupport.dylib.xcent.template
View File

0
mapbox-gl-native/benchmark/ios/fastlane/Appfile → benchmark/ios/fastlane/Appfile
View File

0
mapbox-gl-native/benchmark/ios/fastlane/Matchfile → benchmark/ios/fastlane/Matchfile
View File

0
mapbox-gl-native/benchmark/ios/iosTestRunner.h → benchmark/ios/iosTestRunner.h
View File

0
mapbox-gl-native/benchmark/ios/ios_test_runner.cpp → benchmark/ios/ios_test_runner.cpp
View File

0
mapbox-gl-native/benchmark/ios/tests/Info.plist → benchmark/ios/tests/Info.plist
View File

0
mapbox-gl-native/benchmark/parse/filter.benchmark.cpp → benchmark/parse/filter.benchmark.cpp
View File

0
mapbox-gl-native/benchmark/parse/tile_mask.benchmark.cpp → benchmark/parse/tile_mask.benchmark.cpp
View File

0
mapbox-gl-native/benchmark/parse/vector_tile.benchmark.cpp → benchmark/parse/vector_tile.benchmark.cpp
View File

0
mapbox-gl-native/benchmark/src/mbgl/benchmark/benchmark.cpp → benchmark/src/mbgl/benchmark/benchmark.cpp
View File

0
mapbox-gl-native/benchmark/src/mbgl/benchmark/stub_geometry_tile_feature.hpp → benchmark/src/mbgl/benchmark/stub_geometry_tile_feature.hpp
View File

0
mapbox-gl-native/benchmark/storage/offline_database.benchmark.cpp → benchmark/storage/offline_database.benchmark.cpp
View File

0
mapbox-gl-native/benchmark/util/dtoa.benchmark.cpp → benchmark/util/dtoa.benchmark.cpp
View File

0
mapbox-gl-native/benchmark/util/tilecover.benchmark.cpp → benchmark/util/tilecover.benchmark.cpp
View File

0
mapbox-gl-native/bin/CMakeLists.txt → bin/CMakeLists.txt
View File

0
mapbox-gl-native/bin/cache.cpp → bin/cache.cpp
View File

0
mapbox-gl-native/bin/offline.cpp → bin/offline.cpp
View File

0
mapbox-gl-native/bin/offline.sh → bin/offline.sh
View File

0
mapbox-gl-native/bin/render.cpp → bin/render.cpp
View File

0
mapbox-gl-native/circle.yml → circle.yml
View File

0
mapbox-gl-native-ios/cloudformation/ci.template.js → cloudformation/ci.template.js
View File

0
mapbox-gl-native/codecov.yml → codecov.yml
View File

0
mapbox-gl-native/expression-test/CMakeLists.txt → expression-test/CMakeLists.txt
View File

0
mapbox-gl-native/expression-test/expression_test_logger.cpp → expression-test/expression_test_logger.cpp
View File

0
mapbox-gl-native/expression-test/expression_test_logger.hpp → expression-test/expression_test_logger.hpp
View File

0
mapbox-gl-native/expression-test/expression_test_parser.cpp → expression-test/expression_test_parser.cpp
View File

0
mapbox-gl-native/expression-test/expression_test_parser.hpp → expression-test/expression_test_parser.hpp
View File

0
mapbox-gl-native/expression-test/expression_test_runner.cpp → expression-test/expression_test_runner.cpp
View File

0
mapbox-gl-native/expression-test/expression_test_runner.hpp → expression-test/expression_test_runner.hpp
View File

0
mapbox-gl-native/expression-test/filesystem.hpp → expression-test/filesystem.hpp
View File

0
mapbox-gl-native/expression-test/main.cpp → expression-test/main.cpp
View File

0
mapbox-gl-native/expression-test/test_runner_common.cpp → expression-test/test_runner_common.cpp
View File

0
mapbox-gl-native/expression-test/test_runner_common.hpp → expression-test/test_runner_common.hpp
View File

0
mapbox-gl-native/include/mbgl/actor/actor.hpp → include/mbgl/actor/actor.hpp
View File

0
mapbox-gl-native/include/mbgl/actor/actor_ref.hpp → include/mbgl/actor/actor_ref.hpp
View File

0
mapbox-gl-native/include/mbgl/actor/aspiring_actor.hpp → include/mbgl/actor/aspiring_actor.hpp
View File

0
mapbox-gl-native/include/mbgl/actor/established_actor.hpp → include/mbgl/actor/established_actor.hpp
View File

0
mapbox-gl-native/include/mbgl/actor/mailbox.hpp → include/mbgl/actor/mailbox.hpp
View File

0
mapbox-gl-native/include/mbgl/actor/message.hpp → include/mbgl/actor/message.hpp
View File

0
mapbox-gl-native/include/mbgl/actor/scheduler.hpp → include/mbgl/actor/scheduler.hpp
View File

0
mapbox-gl-native/include/mbgl/annotation/annotation.hpp → include/mbgl/annotation/annotation.hpp
View File

0
mapbox-gl-native/include/mbgl/gfx/backend.hpp → include/mbgl/gfx/backend.hpp
View File

0
mapbox-gl-native/include/mbgl/gfx/backend_scope.hpp → include/mbgl/gfx/backend_scope.hpp
View File

0
mapbox-gl-native/include/mbgl/gfx/renderable.hpp → include/mbgl/gfx/renderable.hpp
View File

0
mapbox-gl-native/include/mbgl/gfx/renderer_backend.hpp → include/mbgl/gfx/renderer_backend.hpp
View File

0
mapbox-gl-native/include/mbgl/gfx/rendering_stats.hpp → include/mbgl/gfx/rendering_stats.hpp
View File

0
mapbox-gl-native/include/mbgl/gl/custom_layer.hpp → include/mbgl/gl/custom_layer.hpp
View File

0
mapbox-gl-native/include/mbgl/gl/custom_layer_factory.hpp → include/mbgl/gl/custom_layer_factory.hpp
View File

0
mapbox-gl-native/include/mbgl/gl/renderable_resource.hpp → include/mbgl/gl/renderable_resource.hpp
View File

0
mapbox-gl-native/include/mbgl/gl/renderer_backend.hpp → include/mbgl/gl/renderer_backend.hpp
View File

Some files were not shown because too many files have changed in this diff Show More