From d1eb4b290a01c626250c3428a0c31225ef8837bb Mon Sep 17 00:00:00 2001 From: Tadej Novak Date: Sat, 30 Sep 2023 22:49:53 +0200 Subject: [PATCH] Rename maplibre-gl-native to maplibre-native and move to vendor --- .github/actions/qt5-build/entrypoint.sh | 6 +- .github/workflows/Android-Qt5.yml | 92 ++++++++++++------------- .github/workflows/CI-cache-cleanup.yml | 4 +- .github/workflows/Linux-Qt5.yml | 50 +++++++------- .github/workflows/Windows-Qt5.yml | 84 +++++++++++----------- .github/workflows/iOS-Qt5.yml | 46 ++++++------- .github/workflows/macOS-Qt5.yml | 56 +++++++-------- .gitmodules | 6 +- README.md | 2 +- dependencies/maplibre-gl-native | 1 - maplibregl.pro | 12 ++-- vendor/maplibre-native | 1 + 12 files changed, 180 insertions(+), 180 deletions(-) delete mode 160000 dependencies/maplibre-gl-native create mode 160000 vendor/maplibre-native diff --git a/.github/actions/qt5-build/entrypoint.sh b/.github/actions/qt5-build/entrypoint.sh index dcee3a6..c228cd7 100755 --- a/.github/actions/qt5-build/entrypoint.sh +++ b/.github/actions/qt5-build/entrypoint.sh @@ -11,12 +11,12 @@ qmake --version if [[ "$1" = "library" ]]; then mkdir build && cd build - cmake ../source/dependencies/maplibre-gl-native/ \ + cmake ../source/vendor/maplibre-native/ \ -G Ninja \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_C_COMPILER_LAUNCHER=ccache \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ - -DCMAKE_INSTALL_PREFIX=../install-qmaplibregl \ + -DCMAKE_INSTALL_PREFIX=../install-maplibre \ -DMBGL_WITH_QT=ON \ -DMBGL_QT_LIBRARY_ONLY=ON \ -DMBGL_QT_STATIC=ON @@ -24,7 +24,7 @@ if [[ "$1" = "library" ]]; then ninja install elif [[ "$1" = "plugin" ]]; then mkdir build && cd build - qmake ../source/ QMAPLIBREGL_PATH=../install-qmaplibregl + qmake ../source/ QMAPLIBRE_PATH=../install-maplibre make -j2 INSTALL_ROOT=../install make install else diff --git a/.github/workflows/Android-Qt5.yml b/.github/workflows/Android-Qt5.yml index 6184614..d946b2f 100644 --- a/.github/workflows/Android-Qt5.yml +++ b/.github/workflows/Android-Qt5.yml @@ -6,7 +6,7 @@ on: branches: - main tags: - - '**' + - "**" paths-ignore: - ".gitignore" - "README.md" @@ -52,7 +52,7 @@ env: jobs: build-core: - name: "Build maplibre-gl-native for ${{ matrix.config.abi }}" + name: "Build maplibre-native for ${{ matrix.config.abi }}" runs-on: ubuntu-22.04 strategy: matrix: @@ -75,14 +75,14 @@ jobs: with: aqtversion: ==3.0.* version: ${{ env.QT_VERSION }} - target: 'android' - arch: 'android' + target: "android" + arch: "android" - name: Set up OpenJDK 11 uses: actions/setup-java@v3 with: - distribution: 'adopt' - java-version: '11' + distribution: "adopt" + java-version: "11" - name: Setup ninja uses: seanmiddleditch/gha-setup-ninja@v3 @@ -90,15 +90,15 @@ jobs: - name: Set up ccache uses: hendrikmuhs/ccache-action@v1 with: - key: Android_maplibre-gl-native_${{ matrix.config.abi }}_legacy + key: Android_maplibre-native_${{ matrix.config.abi }}_legacy append-timestamp: false - - name: Build maplibre-gl-native + - name: Build maplibre-native env: ANDROID_ABI: ${{ matrix.config.abi }} run: | mkdir build && cd build - cmake ../source/dependencies/maplibre-gl-native \ + cmake ../source/vendor/maplibre-native \ -DCMAKE_TOOLCHAIN_FILE="${ANDROID_NDK_ROOT}/build/cmake/android.toolchain.cmake" \ -DANDROID_ABI="${ANDROID_ABI}" \ -DANDROID_CCACHE=ccache \ @@ -109,7 +109,7 @@ jobs: -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ -DCMAKE_CXX_FLAGS_RELEASE=-g0 \ -DCMAKE_FIND_ROOT_PATH="${Qt5_Dir}" \ - -DCMAKE_INSTALL_PREFIX=../install-qmaplibregl \ + -DCMAKE_INSTALL_PREFIX=../install-maplibre \ -DCMAKE_PREFIX_PATH="${Qt5_Dir}" \ -DMBGL_WITH_QT=ON \ -DMBGL_QT_LIBRARY_ONLY=ON \ @@ -120,11 +120,11 @@ jobs: - name: Upload artifacts uses: actions/upload-artifact@v3 with: - name: maplibre-gl-native_Android_${{ matrix.config.abi }} - path: install-qmaplibregl + name: maplibre-native_Android_${{ matrix.config.abi }} + path: install-maplibre prepare-core: - name: "Prepare maplibre-gl-native" + name: "Prepare maplibre-native" runs-on: ubuntu-22.04 needs: build-core @@ -132,39 +132,39 @@ jobs: - name: Download artifacts uses: actions/download-artifact@v3 with: - name: maplibre-gl-native_Android_x86 + name: maplibre-native_Android_x86 path: install-x86 - name: Download artifacts uses: actions/download-artifact@v3 with: - name: maplibre-gl-native_Android_x86_64 + name: maplibre-native_Android_x86_64 path: install-x86_64 - name: Download artifacts uses: actions/download-artifact@v3 with: - name: maplibre-gl-native_Android_armeabi-v7a + name: maplibre-native_Android_armeabi-v7a path: install-armeabi-v7a - name: Download artifacts uses: actions/download-artifact@v3 with: - name: maplibre-gl-native_Android_arm64-v8a + name: maplibre-native_Android_arm64-v8a path: install-arm64-v8a - name: Prepare artifacts run: | - cp -r install-arm64-v8a install-qmaplibregl - cp -r install-armeabi-v7a/lib/* install-qmaplibregl/lib/ - cp -r install-x86/lib/* install-qmaplibregl/lib/ - cp -r install-x86_64/lib/* install-qmaplibregl/lib/ + cp -r install-arm64-v8a install-maplibre + cp -r install-armeabi-v7a/lib/* install-maplibre/lib/ + cp -r install-x86/lib/* install-maplibre/lib/ + cp -r install-x86_64/lib/* install-maplibre/lib/ - name: Upload artifacts uses: actions/upload-artifact@v3 with: - name: maplibre-gl-native_Android - path: install-qmaplibregl + name: maplibre-native_Android + path: install-maplibre build-plugin: name: "Build qt-geoservices-maplibre-gl" @@ -184,13 +184,13 @@ jobs: aqtversion: ==3.0.* version: ${{ env.QT_VERSION }} target: android - arch: 'android' + arch: "android" - name: Set up OpenJDK 11 uses: actions/setup-java@v3 with: - distribution: 'adopt' - java-version: '11' + distribution: "adopt" + java-version: "11" - name: Setup ninja uses: seanmiddleditch/gha-setup-ninja@v3 @@ -204,14 +204,14 @@ jobs: - name: Download artifacts uses: actions/download-artifact@v3 with: - name: maplibre-gl-native_Android - path: install-qmaplibregl + name: maplibre-native_Android + path: install-maplibre - name: Build qt-geoservices-maplibre-gl run: | export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH" mkdir build && cd build - qmake ../source/ QMAPLIBREGL_PATH=../install-qmaplibregl + qmake ../source/ QMAPLIBRE_PATH=../install-maplibre make -j2 INSTALL_ROOT=../install make install @@ -236,20 +236,20 @@ jobs: contents: write steps: - - name: Download artifacts - uses: actions/download-artifact@v3 - with: - name: qt-geoservices-maplibre-gl_Android - - - name: Name tarball - env: - TAG_NAME: ${{ github.ref_name }} - run: | - mv qt-geoservices-maplibre-gl_Android.tar.bz2 qt-geoservices-maplibre-gl_${TAG_NAME}_Qt${QT_VERSION}_Android.tar.bz2 - - - name: Release - uses: ncipollo/release-action@v1 - with: - artifacts: qt-geoservices-maplibre-gl_${{ github.ref_name }}_Qt${{ env.QT_VERSION }}_Android.tar.bz2 - allowUpdates: true - draft: true + - name: Download artifacts + uses: actions/download-artifact@v3 + with: + name: qt-geoservices-maplibre-gl_Android + + - name: Name tarball + env: + TAG_NAME: ${{ github.ref_name }} + run: | + mv qt-geoservices-maplibre-gl_Android.tar.bz2 qt-geoservices-maplibre-gl_${TAG_NAME}_Qt${QT_VERSION}_Android.tar.bz2 + + - name: Release + uses: ncipollo/release-action@v1 + with: + artifacts: qt-geoservices-maplibre-gl_${{ github.ref_name }}_Qt${{ env.QT_VERSION }}_Android.tar.bz2 + allowUpdates: true + draft: true diff --git a/.github/workflows/CI-cache-cleanup.yml b/.github/workflows/CI-cache-cleanup.yml index 15cac45..c602518 100644 --- a/.github/workflows/CI-cache-cleanup.yml +++ b/.github/workflows/CI-cache-cleanup.yml @@ -20,14 +20,14 @@ jobs: - name: Cleanup run: | gh extension install actions/gh-actions-cache - + REPO=${{ github.repository }} BRANCH=refs/pull/${{ github.event.pull_request.number }}/merge echo "Fetching list of cache key" cacheKeysForPR=$(gh actions-cache list -R $REPO -B $BRANCH | cut -f 1 ) - ## Setting this to not fail the workflow while deleting cache keys. + ## Setting this to not fail the workflow while deleting cache keys. set +e echo "Deleting caches..." for cacheKey in $cacheKeysForPR diff --git a/.github/workflows/Linux-Qt5.yml b/.github/workflows/Linux-Qt5.yml index a63d367..9a6e2ed 100644 --- a/.github/workflows/Linux-Qt5.yml +++ b/.github/workflows/Linux-Qt5.yml @@ -6,7 +6,7 @@ on: branches: - main tags: - - '**' + - "**" paths-ignore: - ".gitignore" - "README.md" @@ -50,7 +50,7 @@ env: jobs: build-core: - name: "Build maplibre-gl-native" + name: "Build maplibre-native" runs-on: ubuntu-22.04 steps: @@ -72,10 +72,10 @@ jobs: - name: Set up ccache uses: hendrikmuhs/ccache-action@v1 with: - key: Linux_maplibre-gl-native_legacy + key: Linux_maplibre-native_legacy append-timestamp: false - - name: Build maplibre-gl-native + - name: Build maplibre-native uses: ./source/.github/actions/qt5-build with: build-type: library @@ -83,8 +83,8 @@ jobs: - name: Upload artifacts uses: actions/upload-artifact@v3 with: - name: maplibre-gl-native_Linux - path: install-qmaplibregl + name: maplibre-native_Linux + path: install-maplibre build-plugin: name: "Build qt-geoservices-maplibre-gl" @@ -115,8 +115,8 @@ jobs: - name: Download artifacts uses: actions/download-artifact@v3 with: - name: maplibre-gl-native_Linux - path: install-qmaplibregl + name: maplibre-native_Linux + path: install-maplibre - name: Build qt-geoservices-maplibre-gl uses: ./source/.github/actions/qt5-build @@ -144,20 +144,20 @@ jobs: contents: write steps: - - name: Download artifacts - uses: actions/download-artifact@v3 - with: - name: qt-geoservices-maplibre-gl_Linux - - - name: Name tarball - env: - TAG_NAME: ${{ github.ref_name }} - run: | - mv qt-geoservices-maplibre-gl_Linux.tar.bz2 qt-geoservices-maplibre-gl_${TAG_NAME}_Qt${QT_VERSION}_Linux.tar.bz2 - - - name: Release - uses: ncipollo/release-action@v1 - with: - artifacts: qt-geoservices-maplibre-gl_${{ github.ref_name }}_Qt${{ env.QT_VERSION }}_Linux.tar.bz2 - allowUpdates: true - draft: true + - name: Download artifacts + uses: actions/download-artifact@v3 + with: + name: qt-geoservices-maplibre-gl_Linux + + - name: Name tarball + env: + TAG_NAME: ${{ github.ref_name }} + run: | + mv qt-geoservices-maplibre-gl_Linux.tar.bz2 qt-geoservices-maplibre-gl_${TAG_NAME}_Qt${QT_VERSION}_Linux.tar.bz2 + + - name: Release + uses: ncipollo/release-action@v1 + with: + artifacts: qt-geoservices-maplibre-gl_${{ github.ref_name }}_Qt${{ env.QT_VERSION }}_Linux.tar.bz2 + allowUpdates: true + draft: true diff --git a/.github/workflows/Windows-Qt5.yml b/.github/workflows/Windows-Qt5.yml index 04e3dc3..df4e884 100644 --- a/.github/workflows/Windows-Qt5.yml +++ b/.github/workflows/Windows-Qt5.yml @@ -53,7 +53,7 @@ env: jobs: build-core: - name: "Build maplibre-gl-native for ${{ matrix.config.qtarch }} (${{ matrix.config.build }})" + name: "Build maplibre-native for ${{ matrix.config.qtarch }} (${{ matrix.config.build }})" runs-on: windows-2022 strategy: matrix: @@ -62,13 +62,13 @@ jobs: qtarch: msvc2019_64 compiler: x64 compiler_version: 14.29 - tools: '' + tools: "" build: Release - arch: win64_msvc2019_64 qtarch: msvc2019_64 compiler: x64 compiler_version: 14.29 - tools: '' + tools: "" build: Debug - arch: win64_mingw81 qtarch: mingw81_64 @@ -101,7 +101,7 @@ jobs: - name: Download Qt uses: jurplel/install-qt-action@v3 with: - aqtversion: '==2.1.*' + aqtversion: "==2.1.*" version: ${{ env.QT_VERSION }} target: desktop arch: ${{ matrix.config.arch }} @@ -128,7 +128,7 @@ jobs: key: Windows_qt-geoservices-maplibre-gl_${{ matrix.config.qtarch }}_${{ matrix.config.build }}_legacy append-timestamp: false - - name: Build maplibre-gl-native + - name: Build maplibre-native shell: bash env: BUILD_TYPE: ${{ matrix.config.build }} @@ -137,12 +137,12 @@ jobs: export PATH=$IQTA_TOOLS/$COMPILER_TYPE/bin:$PATH echo "$PATH" mkdir build && cd build - cmake.exe ../source/dependencies/maplibre-gl-native \ + cmake.exe ../source/vendor/maplibre-native \ -G Ninja \ -DCMAKE_BUILD_TYPE="$BUILD_TYPE" \ -DCMAKE_C_COMPILER_LAUNCHER="ccache.exe" \ -DCMAKE_CXX_COMPILER_LAUNCHER="ccache.exe" \ - -DCMAKE_INSTALL_PREFIX="../install-qmaplibregl" \ + -DCMAKE_INSTALL_PREFIX="../install-maplibre" \ -DMBGL_WITH_QT=ON \ -DMBGL_QT_LIBRARY_ONLY=ON \ -DMBGL_QT_STATIC=ON @@ -152,11 +152,11 @@ jobs: - name: Upload artifacts uses: actions/upload-artifact@v3 with: - name: maplibre-gl-native_Windows_${{ matrix.config.qtarch }}_${{ matrix.config.build }} - path: install-qmaplibregl + name: maplibre-native_Windows_${{ matrix.config.qtarch }}_${{ matrix.config.build }} + path: install-maplibre prepare-core: - name: "Prepare maplibre-gl-native" + name: "Prepare maplibre-native" runs-on: windows-latest needs: build-core strategy: @@ -169,26 +169,26 @@ jobs: - name: Download artifacts uses: actions/download-artifact@v3 with: - name: maplibre-gl-native_Windows_${{ matrix.config.qtarch }}_Release + name: maplibre-native_Windows_${{ matrix.config.qtarch }}_Release path: install-Release - name: Download artifacts uses: actions/download-artifact@v3 with: - name: maplibre-gl-native_Windows_${{ matrix.config.qtarch }}_Debug + name: maplibre-native_Windows_${{ matrix.config.qtarch }}_Debug path: install-Debug - name: Prepare artifacts run: | - cp -r install-Release install-qmaplibregl - cp -r install-Debug/lib/* install-qmaplibregl/lib + cp -r install-Release install-maplibre + cp -r install-Debug/lib/* install-maplibre/lib shell: bash - name: Upload artifacts uses: actions/upload-artifact@v3 with: - name: maplibre-gl-native_Windows_${{ matrix.config.qtarch }} - path: install-qmaplibregl + name: maplibre-native_Windows_${{ matrix.config.qtarch }} + path: install-maplibre build-plugin: name: "Build qt-geoservices-maplibre-gl for ${{ matrix.config.qtarch }}" @@ -201,7 +201,7 @@ jobs: qtarch: msvc2019_64 compiler: x64 compiler_version: 14.29 - tools: '' + tools: "" - arch: win64_mingw81 qtarch: mingw81_64 compiler: mingw810_64 @@ -218,7 +218,7 @@ jobs: - name: Download Qt uses: jurplel/install-qt-action@v3 with: - aqtversion: '==2.1.*' + aqtversion: "==2.1.*" version: ${{ env.QT_VERSION }} target: desktop arch: ${{ matrix.config.arch }} @@ -237,8 +237,8 @@ jobs: - name: Download artifacts uses: actions/download-artifact@v3 with: - name: maplibre-gl-native_Windows_${{ matrix.config.qtarch }} - path: install-qmaplibregl + name: maplibre-native_Windows_${{ matrix.config.qtarch }} + path: install-maplibre - name: Build qt-geoservices-maplibre-gl (MSVC) if: matrix.config.arch == 'win64_msvc2019_64' @@ -246,7 +246,7 @@ jobs: mkdir build mkdir install cd build - qmake ../source QMAPLIBREGL_PATH=../install-qmaplibregl + qmake ../source QMAPLIBRE_PATH=../install-maplibre nmake $env:INSTALL_ROOT = "..\install" nmake install @@ -261,7 +261,7 @@ jobs: echo "$PATH" mkdir install mkdir build && cd build - qmake.exe ../source QMAPLIBREGL_PATH=../install-qmaplibregl + qmake.exe ../source QMAPLIBRE_PATH=../install-maplibre mingw32-make.exe INSTALL_ROOT=../install mingw32-make.exe install @@ -296,23 +296,23 @@ jobs: contents: write steps: - - name: Download artifacts - uses: actions/download-artifact@v3 - with: - name: qt-geoservices-maplibre-gl_Windows_${{ matrix.config.qtarch }} - - - name: Make tarball - shell: bash - env: - TAG_NAME: ${{ github.ref_name }} - QT_ARCH: ${{ matrix.config.qtarch }} - TAG_ARCH: ${{ matrix.config.outarch }} - run: | - mv qt-geoservices-maplibre-gl_Windows_${QT_ARCH}.tar.bz2 qt-geoservices-maplibre-gl_${TAG_NAME}_Qt${QT_VERSION}_win64_${TAG_ARCH}.tar.bz2 - - - name: Release - uses: ncipollo/release-action@v1 - with: - artifacts: qt-geoservices-maplibre-gl_${{ github.ref_name }}_Qt${{ env.QT_VERSION }}_win64_${{ matrix.config.outarch }}.tar.bz2 - allowUpdates: true - draft: true + - name: Download artifacts + uses: actions/download-artifact@v3 + with: + name: qt-geoservices-maplibre-gl_Windows_${{ matrix.config.qtarch }} + + - name: Make tarball + shell: bash + env: + TAG_NAME: ${{ github.ref_name }} + QT_ARCH: ${{ matrix.config.qtarch }} + TAG_ARCH: ${{ matrix.config.outarch }} + run: | + mv qt-geoservices-maplibre-gl_Windows_${QT_ARCH}.tar.bz2 qt-geoservices-maplibre-gl_${TAG_NAME}_Qt${QT_VERSION}_win64_${TAG_ARCH}.tar.bz2 + + - name: Release + uses: ncipollo/release-action@v1 + with: + artifacts: qt-geoservices-maplibre-gl_${{ github.ref_name }}_Qt${{ env.QT_VERSION }}_win64_${{ matrix.config.outarch }}.tar.bz2 + allowUpdates: true + draft: true diff --git a/.github/workflows/iOS-Qt5.yml b/.github/workflows/iOS-Qt5.yml index 101e3a1..f42fe83 100644 --- a/.github/workflows/iOS-Qt5.yml +++ b/.github/workflows/iOS-Qt5.yml @@ -52,7 +52,7 @@ env: jobs: build-core: - name: "Build maplibre-gl-native" + name: "Build maplibre-native" runs-on: macos-12 steps: @@ -81,7 +81,7 @@ jobs: - name: Set up ccache uses: hendrikmuhs/ccache-action@v1 with: - key: iOS_maplibre-gl-native_legacy + key: iOS_maplibre-native_legacy append-timestamp: false - name: Use custom version of ccache @@ -90,11 +90,11 @@ jobs: brew unlink ccache brew install ccache --HEAD - - name: Build maplibre-gl-native + - name: Build maplibre-native run: | export CCACHE_LOGFILE=../ccache.log mkdir build && cd build - cmake ../source/dependencies/maplibre-gl-native/ \ + cmake ../source/vendor/maplibre-native/ \ -G"Ninja Multi-Config" \ -DCMAKE_CONFIGURATION_TYPES="Release;Debug" \ -DCMAKE_C_COMPILER_LAUNCHER="ccache" \ @@ -126,7 +126,7 @@ jobs: - name: Upload artifacts uses: actions/upload-artifact@v3 with: - name: maplibre-gl-native_iOS + name: maplibre-native_iOS path: QMapLibreGL_iOS.tar.bz2 build-plugin: @@ -171,7 +171,7 @@ jobs: - name: Download artifacts uses: actions/download-artifact@v3 with: - name: maplibre-gl-native_iOS + name: maplibre-native_iOS - name: Build qt-geoservices-maplibre-gl run: | @@ -204,20 +204,20 @@ jobs: contents: write steps: - - name: Download artifacts - uses: actions/download-artifact@v3 - with: - name: qt-geoservices-maplibre-gl_iOS - - - name: Make tarball - env: - TAG_NAME: ${{ github.ref_name }} - run: | - mv qt-geoservices-maplibre-gl_iOS.tar.bz2 qt-geoservices-maplibre-gl_${TAG_NAME}_Qt${QT_VERSION}_iOS.tar.bz2 - - - name: Release - uses: ncipollo/release-action@v1 - with: - artifacts: qt-geoservices-maplibre-gl_${{ github.ref_name }}_Qt${{ env.QT_VERSION }}_iOS.tar.bz2 - allowUpdates: true - draft: true + - name: Download artifacts + uses: actions/download-artifact@v3 + with: + name: qt-geoservices-maplibre-gl_iOS + + - name: Make tarball + env: + TAG_NAME: ${{ github.ref_name }} + run: | + mv qt-geoservices-maplibre-gl_iOS.tar.bz2 qt-geoservices-maplibre-gl_${TAG_NAME}_Qt${QT_VERSION}_iOS.tar.bz2 + + - name: Release + uses: ncipollo/release-action@v1 + with: + artifacts: qt-geoservices-maplibre-gl_${{ github.ref_name }}_Qt${{ env.QT_VERSION }}_iOS.tar.bz2 + allowUpdates: true + draft: true diff --git a/.github/workflows/macOS-Qt5.yml b/.github/workflows/macOS-Qt5.yml index 4028178..651f860 100644 --- a/.github/workflows/macOS-Qt5.yml +++ b/.github/workflows/macOS-Qt5.yml @@ -6,7 +6,7 @@ on: branches: - main tags: - - '**' + - "**" paths-ignore: - ".gitignore" - "README.md" @@ -52,7 +52,7 @@ env: jobs: build-core: - name: "Build maplibre-gl-native" + name: "Build maplibre-native" runs-on: macos-12 steps: @@ -81,18 +81,18 @@ jobs: - name: Set up ccache uses: hendrikmuhs/ccache-action@v1 with: - key: macOS_maplibre-gl-native_legacy + key: macOS_maplibre-native_legacy append-timestamp: false - - name: Build maplibre-gl-native + - name: Build maplibre-native run: | mkdir build && cd build - cmake ../source/dependencies/maplibre-gl-native/ \ + cmake ../source/vendor/maplibre-native/ \ -G Ninja \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_C_COMPILER_LAUNCHER=ccache \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ - -DCMAKE_INSTALL_PREFIX=../install-qmaplibregl \ + -DCMAKE_INSTALL_PREFIX=../install-maplibre \ -DCMAKE_OSX_DEPLOYMENT_TARGET=10.13 \ -DMBGL_WITH_QT=ON \ -DMBGL_QT_LIBRARY_ONLY=ON \ @@ -103,8 +103,8 @@ jobs: - name: Upload artifacts uses: actions/upload-artifact@v3 with: - name: maplibre-gl-native_macOS - path: install-qmaplibregl + name: maplibre-native_macOS + path: install-maplibre build-plugin: name: "Build qt-geoservices-maplibre-gl" @@ -142,14 +142,14 @@ jobs: - name: Download artifacts uses: actions/download-artifact@v3 with: - name: maplibre-gl-native_macOS - path: install-qmaplibregl + name: maplibre-native_macOS + path: install-maplibre - name: Build qt-geoservices-maplibre-gl run: | export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH" mkdir build && cd build - qmake ../source/ QMAPLIBREGL_PATH=../install-qmaplibregl + qmake ../source/ QMAPLIBRE_PATH=../install-maplibre make -j2 INSTALL_ROOT=../install make install @@ -174,20 +174,20 @@ jobs: contents: write steps: - - name: Download artifacts - uses: actions/download-artifact@v3 - with: - name: qt-geoservices-maplibre-gl_macOS - - - name: Name tarball - env: - TAG_NAME: ${{ github.ref_name }} - run: | - mv qt-geoservices-maplibre-gl_macOS.tar.bz2 qt-geoservices-maplibre-gl_${TAG_NAME}_Qt${QT_VERSION}_macOS.tar.bz2 - - - name: Release - uses: ncipollo/release-action@v1 - with: - artifacts: qt-geoservices-maplibre-gl_${{ github.ref_name }}_Qt${{ env.QT_VERSION }}_macOS.tar.bz2 - allowUpdates: true - draft: true + - name: Download artifacts + uses: actions/download-artifact@v3 + with: + name: qt-geoservices-maplibre-gl_macOS + + - name: Name tarball + env: + TAG_NAME: ${{ github.ref_name }} + run: | + mv qt-geoservices-maplibre-gl_macOS.tar.bz2 qt-geoservices-maplibre-gl_${TAG_NAME}_Qt${QT_VERSION}_macOS.tar.bz2 + + - name: Release + uses: ncipollo/release-action@v1 + with: + artifacts: qt-geoservices-maplibre-gl_${{ github.ref_name }}_Qt${{ env.QT_VERSION }}_macOS.tar.bz2 + allowUpdates: true + draft: true diff --git a/.gitmodules b/.gitmodules index 720f60b..bb7f6de 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ -[submodule "dependencies/maplibre-gl-native"] - path = dependencies/maplibre-gl-native - url = https://github.com/maplibre/maplibre-gl-native.git +[submodule "vendor/maplibre-native"] + path = vendor/maplibre-native + url = https://github.com/maplibre/maplibre-native.git diff --git a/README.md b/README.md index ba91c63..a01a9f4 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ Then the plugin is built separately. To build the plugin run in a separate build directory: ```shell -qmake ../maplibre-native-qt QMAPLIBREGL_PATH=../install-qmaplibregl +qmake ../maplibre-native-qt QMAPLIBRE_PATH=../install-maplibre make make install ``` diff --git a/dependencies/maplibre-gl-native b/dependencies/maplibre-gl-native deleted file mode 160000 index 0f568a5..0000000 --- a/dependencies/maplibre-gl-native +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0f568a5f2ebb5460b5e46b18ca02e87c5a795681 diff --git a/maplibregl.pro b/maplibregl.pro index 86ce860..093829c 100644 --- a/maplibregl.pro +++ b/maplibregl.pro @@ -40,16 +40,16 @@ qtConfig(system-zlib) { load(qt_build_paths) -!isEmpty(QMAPLIBREGL_PATH) { - message("QMapLibreGL path: $$QMAPLIBREGL_PATH") +!isEmpty(MAPLIBRE_PATH) { + message("MapLibre path: $$MAPLIBRE_PATH") - INCLUDEPATH += $$QMAPLIBREGL_PATH/include - LIBS += -L$$QMAPLIBREGL_PATH/lib + INCLUDEPATH += $$MAPLIBRE_PATH/include + LIBS += -L$$MAPLIBRE_PATH/lib linux:!android { - LIBS += -L$$QMAPLIBREGL_PATH/lib64 + LIBS += -L$$MAPLIBRE_PATH/lib64 } } else { - message("QMapLibreGL installed with Qt") + message("MapLibre installed with Qt") } LIBS += -lQMapLibreGL$$qtPlatformTargetSuffix() diff --git a/vendor/maplibre-native b/vendor/maplibre-native new file mode 160000 index 0000000..6888bae --- /dev/null +++ b/vendor/maplibre-native @@ -0,0 +1 @@ +Subproject commit 6888bae19015c417485ab3e8a9326425f24f02ca