mirror of
https://github.com/maplibre/maplibre-rs.git
synced 2025-12-08 19:05:57 +00:00
Merge pull request #280 from nyurik/fmt-just
Format justfile using just's own --fmt
This commit is contained in:
Yuri Astrakhan
GitHub
commit
a6bd26ad9c
208
justfile
208
justfile
@ -4,99 +4,96 @@
|
||||
|
||||
set shell := ["bash", "-c"]
|
||||
|
||||
export NIGHTLY_TOOLCHAIN := "nightly-2023-03-29" # Also change the version in android/gradle/lib/build.gradle
|
||||
export STABLE_TOOLCHAIN := "1.65"
|
||||
# Also change the version in android/gradle/lib/build.gradle
|
||||
|
||||
export NIGHTLY_TOOLCHAIN := "nightly-2023-03-29"
|
||||
export STABLE_TOOLCHAIN := "1.65"
|
||||
export CARGO_TERM_COLOR := "always"
|
||||
export RUST_BACKTRACE := "1"
|
||||
|
||||
|
||||
stable-toolchain:
|
||||
rustup toolchain install $STABLE_TOOLCHAIN
|
||||
rustup toolchain install $STABLE_TOOLCHAIN
|
||||
|
||||
stable-override-toolchain: stable-toolchain
|
||||
rustup override set $STABLE_TOOLCHAIN
|
||||
rustup override set $STABLE_TOOLCHAIN
|
||||
|
||||
stable-targets *FLAGS: stable-toolchain
|
||||
rustup toolchain install $STABLE_TOOLCHAIN --target {{FLAGS}}
|
||||
rustup toolchain install $STABLE_TOOLCHAIN --target {{ FLAGS }}
|
||||
|
||||
stable-install-clippy: stable-toolchain
|
||||
rustup component add clippy --toolchain $STABLE_TOOLCHAIN
|
||||
|
||||
rustup component add clippy --toolchain $STABLE_TOOLCHAIN
|
||||
|
||||
nightly-toolchain:
|
||||
rustup toolchain install $NIGHTLY_TOOLCHAIN
|
||||
rustup toolchain install $NIGHTLY_TOOLCHAIN
|
||||
|
||||
nightly-override-toolchain: nightly-toolchain
|
||||
rustup override set $NIGHTLY_TOOLCHAIN
|
||||
rustup override set $NIGHTLY_TOOLCHAIN
|
||||
|
||||
nightly-targets *FLAGS: nightly-toolchain
|
||||
rustup toolchain install $NIGHTLY_TOOLCHAIN --target {{FLAGS}}
|
||||
# We sometimes build the stdlib with nightly
|
||||
rustup component add rust-src --toolchain $NIGHTLY_TOOLCHAIN
|
||||
rustup toolchain install $NIGHTLY_TOOLCHAIN --target {{ FLAGS }}
|
||||
# We sometimes build the stdlib with nightly
|
||||
rustup component add rust-src --toolchain $NIGHTLY_TOOLCHAIN
|
||||
|
||||
nightly-install-rustfmt: nightly-toolchain
|
||||
rustup component add rustfmt --toolchain $NIGHTLY_TOOLCHAIN
|
||||
rustup component add rustfmt --toolchain $NIGHTLY_TOOLCHAIN
|
||||
|
||||
nightly-install-clippy: stable-toolchain
|
||||
rustup component add clippy --toolchain $NIGHTLY_TOOLCHAIN
|
||||
|
||||
rustup component add clippy --toolchain $NIGHTLY_TOOLCHAIN
|
||||
|
||||
fixup: nightly-toolchain
|
||||
cargo clippy --allow-dirty --no-deps -p maplibre --fix
|
||||
cargo clippy --allow-dirty --no-deps -p maplibre-winit --fix
|
||||
cargo clippy --allow-dirty --no-deps -p maplibre-demo --fix
|
||||
cargo clippy --allow-dirty --no-deps -p benchmarks --fix
|
||||
# Web
|
||||
RUSTUP_TOOLCHAIN=$NIGHTLY_TOOLCHAIN cargo clippy --allow-dirty --no-deps -p web --target wasm32-unknown-unknown --fix
|
||||
RUSTUP_TOOLCHAIN=$NIGHTLY_TOOLCHAIN RUSTFLAGS='-C target-feature=+atomics,+bulk-memory,+mutable-globals --cfg=web_sys_unstable_apis' cargo clippy --allow-dirty --no-deps -p web --target wasm32-unknown-unknown --fix -Z build-std=std,panic_abort
|
||||
RUSTUP_TOOLCHAIN=$NIGHTLY_TOOLCHAIN cargo clippy --allow-dirty --no-deps -p maplibre --target wasm32-unknown-unknown --fix
|
||||
RUSTUP_TOOLCHAIN=$NIGHTLY_TOOLCHAIN cargo clippy --allow-dirty --no-deps -p maplibre-winit --target wasm32-unknown-unknown --fix
|
||||
# Android
|
||||
env "AR_x86_64-linux-android=$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar" "CC_x86_64-linux-android=$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android30-clang" RUSTUP_TOOLCHAIN=$NIGHTLY_TOOLCHAIN cargo clippy --allow-dirty --no-deps -p maplibre --target x86_64-linux-android --fix
|
||||
env "AR_x86_64-linux-android=$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar" "CC_x86_64-linux-android=$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android30-clang" RUSTUP_TOOLCHAIN=$NIGHTLY_TOOLCHAIN cargo clippy --allow-dirty --no-deps -p maplibre-winit --target x86_64-linux-android --fix
|
||||
env "AR_x86_64-linux-android=$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar" "CC_x86_64-linux-android=$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android30-clang" RUSTUP_TOOLCHAIN=$NIGHTLY_TOOLCHAIN cargo clippy --allow-dirty --no-deps -p maplibre-android --target x86_64-linux-android --fix
|
||||
# macOS/iOS
|
||||
RUSTFLAGS="--cfg no_pendantic_os_check" cargo clippy --allow-dirty --no-deps -p apple --fix
|
||||
# TODO check maplibre and maplibre-winit for apple targets
|
||||
cargo clippy --allow-dirty --no-deps -p maplibre --fix
|
||||
cargo clippy --allow-dirty --no-deps -p maplibre-winit --fix
|
||||
cargo clippy --allow-dirty --no-deps -p maplibre-demo --fix
|
||||
cargo clippy --allow-dirty --no-deps -p benchmarks --fix
|
||||
# Web
|
||||
RUSTUP_TOOLCHAIN=$NIGHTLY_TOOLCHAIN cargo clippy --allow-dirty --no-deps -p web --target wasm32-unknown-unknown --fix
|
||||
RUSTUP_TOOLCHAIN=$NIGHTLY_TOOLCHAIN RUSTFLAGS='-C target-feature=+atomics,+bulk-memory,+mutable-globals --cfg=web_sys_unstable_apis' cargo clippy --allow-dirty --no-deps -p web --target wasm32-unknown-unknown --fix -Z build-std=std,panic_abort
|
||||
RUSTUP_TOOLCHAIN=$NIGHTLY_TOOLCHAIN cargo clippy --allow-dirty --no-deps -p maplibre --target wasm32-unknown-unknown --fix
|
||||
RUSTUP_TOOLCHAIN=$NIGHTLY_TOOLCHAIN cargo clippy --allow-dirty --no-deps -p maplibre-winit --target wasm32-unknown-unknown --fix
|
||||
# Android
|
||||
env "AR_x86_64-linux-android=$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar" "CC_x86_64-linux-android=$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android30-clang" RUSTUP_TOOLCHAIN=$NIGHTLY_TOOLCHAIN cargo clippy --allow-dirty --no-deps -p maplibre --target x86_64-linux-android --fix
|
||||
env "AR_x86_64-linux-android=$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar" "CC_x86_64-linux-android=$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android30-clang" RUSTUP_TOOLCHAIN=$NIGHTLY_TOOLCHAIN cargo clippy --allow-dirty --no-deps -p maplibre-winit --target x86_64-linux-android --fix
|
||||
env "AR_x86_64-linux-android=$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar" "CC_x86_64-linux-android=$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android30-clang" RUSTUP_TOOLCHAIN=$NIGHTLY_TOOLCHAIN cargo clippy --allow-dirty --no-deps -p maplibre-android --target x86_64-linux-android --fix
|
||||
# macOS/iOS
|
||||
RUSTFLAGS="--cfg no_pendantic_os_check" cargo clippy --allow-dirty --no-deps -p apple --fix
|
||||
# TODO check maplibre and maplibre-winit for apple targets
|
||||
|
||||
check PROJECT ARCH: stable-install-clippy
|
||||
cargo clippy --no-deps -p {{PROJECT}} --target {{ARCH}}
|
||||
cargo clippy --no-deps -p {{ PROJECT }} --target {{ ARCH }}
|
||||
|
||||
nightly-check PROJECT ARCH FEATURES: nightly-toolchain nightly-install-clippy
|
||||
export RUSTUP_TOOLCHAIN=$NIGHTLY_TOOLCHAIN && cargo clippy --no-deps -p {{PROJECT}} --features "{{FEATURES}}" --target {{ARCH}}
|
||||
export RUSTUP_TOOLCHAIN=$NIGHTLY_TOOLCHAIN && cargo clippy --no-deps -p {{ PROJECT }} --features "{{ FEATURES }}" --target {{ ARCH }}
|
||||
|
||||
test PROJECT ARCH:
|
||||
cargo test -p {{PROJECT}} --target {{ARCH}}
|
||||
cargo test -p {{ PROJECT }} --target {{ ARCH }}
|
||||
|
||||
benchmark:
|
||||
cargo criterion -p benchmarks
|
||||
cargo criterion -p benchmarks
|
||||
|
||||
fmt: nightly-install-rustfmt
|
||||
export RUSTUP_TOOLCHAIN=$NIGHTLY_TOOLCHAIN && cargo fmt
|
||||
export RUSTUP_TOOLCHAIN=$NIGHTLY_TOOLCHAIN && cargo fmt
|
||||
{{ just_executable() }} --fmt --unstable
|
||||
|
||||
fmt-check: nightly-install-rustfmt
|
||||
export RUSTUP_TOOLCHAIN=$NIGHTLY_TOOLCHAIN && cargo fmt -- --check
|
||||
|
||||
|
||||
export RUSTUP_TOOLCHAIN=$NIGHTLY_TOOLCHAIN && cargo fmt -- --check
|
||||
|
||||
web-install PROJECT:
|
||||
cd web/{{PROJECT}} && npm install
|
||||
cd web/{{ PROJECT }} && npm install
|
||||
|
||||
# Example: just web-lib build
|
||||
# Example: just web-lib build-webgl
|
||||
# Example: just web-lib watch
|
||||
|
||||
# Example: just web-lib watch-webgl
|
||||
web-lib TARGET *FLAGS: nightly-toolchain (nightly-targets "wasm32-unknown-unknown") (web-install "lib")
|
||||
export RUSTUP_TOOLCHAIN=$NIGHTLY_TOOLCHAIN && cd web/lib && npm run {{TARGET}} -- {{FLAGS}}
|
||||
export RUSTUP_TOOLCHAIN=$NIGHTLY_TOOLCHAIN && cd web/lib && npm run {{ TARGET }} -- {{ FLAGS }}
|
||||
|
||||
# Example: just web-demo start
|
||||
# Example: just web-demo build
|
||||
# Examples: just web-demo start or just web-demo build
|
||||
web-demo TARGET *FLAGS: (web-install "demo")
|
||||
cd web/demo && npm run {{TARGET}} -- {{FLAGS}}
|
||||
cd web/demo && npm run {{ TARGET }} -- {{ FLAGS }}
|
||||
|
||||
web-test FEATURES: nightly-toolchain (nightly-targets "wasm32-unknown-unknown")
|
||||
export RUSTUP_TOOLCHAIN=$NIGHTLY_TOOLCHAIN && cargo test -p web --features "{{FEATURES}}" --target wasm32-unknown-unknown
|
||||
export RUSTUP_TOOLCHAIN=$NIGHTLY_TOOLCHAIN && cargo test -p web --features "{{ FEATURES }}" --target wasm32-unknown-unknown
|
||||
|
||||
#profile-bench:
|
||||
# cargo flamegraph --bench render -- --bench
|
||||
@ -106,24 +103,24 @@ build-android: build-android-lib build-android-demo
|
||||
ensure-android-toolchain: nightly-toolchain (nightly-targets "x86_64-linux-android" "aarch64-linux-android" "i686-linux-android")
|
||||
|
||||
build-android-lib: ensure-android-toolchain print-android-env
|
||||
cd android/gradle && ./gradlew :lib:assembleDebug
|
||||
cd android/gradle && ./gradlew :lib:assembleDebug
|
||||
|
||||
build-android-demo: ensure-android-toolchain print-android-env
|
||||
cd android/gradle && ./gradlew :demo:assembleDebug
|
||||
cd android/gradle && ./gradlew :demo:assembleDebug
|
||||
|
||||
install-android-demo: ensure-android-toolchain print-android-env
|
||||
cd android/gradle && ./gradlew :demo:installDebug
|
||||
cd android/gradle && ./gradlew :demo:installDebug
|
||||
|
||||
test-android TARGET: nightly-toolchain print-android-env
|
||||
export RUSTUP_TOOLCHAIN=$NIGHTLY_TOOLCHAIN && cargo test -p maplibre-android --target {{TARGET}} -Z build-std=std,panic_abort
|
||||
export RUSTUP_TOOLCHAIN=$NIGHTLY_TOOLCHAIN && cargo test -p maplibre-android --target {{ TARGET }} -Z build-std=std,panic_abort
|
||||
|
||||
# language=bash
|
||||
print-android-env:
|
||||
#!/usr/bin/env bash
|
||||
set -euxo pipefail
|
||||
echo "ANDROID_HOME: $ANDROID_HOME"
|
||||
echo "ANDROID_SDK_ROOT: $ANDROID_SDK_ROOT"
|
||||
echo "ANDROID_NDK_ROOT: $ANDROID_NDK_ROOT"
|
||||
#!/usr/bin/env bash
|
||||
set -euxo pipefail
|
||||
echo "ANDROID_HOME: $ANDROID_HOME"
|
||||
echo "ANDROID_SDK_ROOT: $ANDROID_SDK_ROOT"
|
||||
echo "ANDROID_NDK_ROOT: $ANDROID_NDK_ROOT"
|
||||
|
||||
INNER_FRAMEWORK_PATH := "Products/Library/Frameworks/maplibre_rs.framework"
|
||||
XC_FRAMEWORK_DIRECTORY := "./apple/MapLibreRs/"
|
||||
@ -135,66 +132,65 @@ BUILD_DIR := "./apple/build"
|
||||
ensure-apple-toolchain: stable-toolchain (stable-targets "aarch64-apple-darwin" "x86_64-apple-darwin" "aarch64-apple-ios" "aarch64-apple-ios-sim")
|
||||
|
||||
xcodebuild-archive ARCH PLATFORM: ensure-apple-toolchain
|
||||
xcodebuild ARCHS="{{ARCH}}" archive -project "{{PROJECT_DIR}}" \
|
||||
-scheme "maplibre-rs" \
|
||||
-destination "generic/platform={{PLATFORM}}" \
|
||||
-archivePath "{{BUILD_DIR}}/{{ARCH}}-apple-{{PLATFORM}}"
|
||||
xcodebuild ARCHS="{{ ARCH }}" archive -project "{{ PROJECT_DIR }}" \
|
||||
-scheme "maplibre-rs" \
|
||||
-destination "generic/platform={{ PLATFORM }}" \
|
||||
-archivePath "{{ BUILD_DIR }}/{{ ARCH }}-apple-{{ PLATFORM }}"
|
||||
|
||||
# language=bash
|
||||
xcodebuild-archive-fat EXISTING_ARCH EXISTING_PLATFORM ARCH: (xcodebuild-archive ARCH EXISTING_PLATFORM)
|
||||
#!/usr/bin/env bash
|
||||
set -euxo pipefail
|
||||
archive="{{BUILD_DIR}}/{{ARCH}}-apple-{{EXISTING_PLATFORM}}.xcarchive"
|
||||
existing_archive="{{BUILD_DIR}}/{{EXISTING_ARCH}}-apple-{{EXISTING_PLATFORM}}.xcarchive"
|
||||
fat_archive="{{BUILD_DIR}}/{{EXISTING_ARCH}}-{{ARCH}}-apple-{{EXISTING_PLATFORM}}.xcarchive"
|
||||
#!/usr/bin/env bash
|
||||
set -euxo pipefail
|
||||
archive="{{ BUILD_DIR }}/{{ ARCH }}-apple-{{ EXISTING_PLATFORM }}.xcarchive"
|
||||
existing_archive="{{ BUILD_DIR }}/{{ EXISTING_ARCH }}-apple-{{ EXISTING_PLATFORM }}.xcarchive"
|
||||
fat_archive="{{ BUILD_DIR }}/{{ EXISTING_ARCH }}-{{ ARCH }}-apple-{{ EXISTING_PLATFORM }}.xcarchive"
|
||||
|
||||
cp -R "$existing_archive" "$fat_archive"
|
||||
inner="$archive/{{INNER_FRAMEWORK_PATH}}"
|
||||
existing_inner="$existing_archive/{{INNER_FRAMEWORK_PATH}}"
|
||||
fat_inner="$fat_archive/{{INNER_FRAMEWORK_PATH}}"
|
||||
|
||||
target_binary="$fat_inner/$(readlink -n "$fat_inner/{{BINARY_NAME}}")"
|
||||
lipo -create "$existing_inner/{{BINARY_NAME}}" \
|
||||
"$inner/{{BINARY_NAME}}" \
|
||||
-output "$target_binary"
|
||||
cp -R $inner/Modules/{{BINARY_NAME}}.swiftmodule/* \
|
||||
"$fat_inner/Modules/{{BINARY_NAME}}.swiftmodule/"
|
||||
|
||||
cp -R "$existing_archive" "$fat_archive"
|
||||
inner="$archive/{{ INNER_FRAMEWORK_PATH }}"
|
||||
existing_inner="$existing_archive/{{ INNER_FRAMEWORK_PATH }}"
|
||||
fat_inner="$fat_archive/{{ INNER_FRAMEWORK_PATH }}"
|
||||
|
||||
target_binary="$fat_inner/$(readlink -n "$fat_inner/{{ BINARY_NAME }}")"
|
||||
lipo -create "$existing_inner/{{ BINARY_NAME }}" \
|
||||
"$inner/{{ BINARY_NAME }}" \
|
||||
-output "$target_binary"
|
||||
cp -R $inner/Modules/{{ BINARY_NAME }}.swiftmodule/* \
|
||||
"$fat_inner/Modules/{{ BINARY_NAME }}.swiftmodule/"
|
||||
|
||||
xcodebuild-clean:
|
||||
rm -rf {{BUILD_DIR}}/*.xcarchive
|
||||
rm -rf {{XC_FRAMEWORK_DIRECTORY}}/*.xcframework
|
||||
rm -rf {{ BUILD_DIR }}/*.xcarchive
|
||||
rm -rf {{ XC_FRAMEWORK_DIRECTORY }}/*.xcframework
|
||||
|
||||
# language=bash
|
||||
xcodebuild-xcframework:
|
||||
#!/usr/bin/env bash
|
||||
set -euxo pipefail
|
||||
tuples=(
|
||||
"arm64,iOS"
|
||||
"arm64,iOS Simulator"
|
||||
"arm64-x86_64,macOS"
|
||||
)
|
||||
framework_args=$(for i in "${tuples[@]}"; do IFS=","; set -- $i; echo -n "-framework \"{{BUILD_DIR}}/$1-apple-$2.xcarchive/{{INNER_FRAMEWORK_PATH}}\" "; done)
|
||||
echo "framework_args: $framework_args"
|
||||
echo "XC_FRAMEWORK_PATH: $XC_FRAMEWORK_PATH"
|
||||
echo "$framework_args" | xargs xcodebuild -create-xcframework -output "$XC_FRAMEWORK_PATH"
|
||||
cat "$XC_FRAMEWORK_PATH/Info.plist"
|
||||
#!/usr/bin/env bash
|
||||
set -euxo pipefail
|
||||
tuples=(
|
||||
"arm64,iOS"
|
||||
"arm64,iOS Simulator"
|
||||
"arm64-x86_64,macOS"
|
||||
)
|
||||
framework_args=$(for i in "${tuples[@]}"; do IFS=","; set -- $i; echo -n "-framework \"{{ BUILD_DIR }}/$1-apple-$2.xcarchive/{{ INNER_FRAMEWORK_PATH }}\" "; done)
|
||||
echo "framework_args: $framework_args"
|
||||
echo "XC_FRAMEWORK_PATH: $XC_FRAMEWORK_PATH"
|
||||
echo "$framework_args" | xargs xcodebuild -create-xcframework -output "$XC_FRAMEWORK_PATH"
|
||||
cat "$XC_FRAMEWORK_PATH/Info.plist"
|
||||
|
||||
# language=bash
|
||||
extract-tiles:
|
||||
#!/usr/bin/env bash
|
||||
set -euxo pipefail
|
||||
if ! command -v tilelive-copy &> /dev/null
|
||||
then
|
||||
echo "tilelive-copy could not be found. Install it with 'yarn global add @mapbox/tilelive @mapbox/mbtiles'"
|
||||
exit 1
|
||||
fi
|
||||
# Bounds copied from https://boundingbox.klokantech.com/
|
||||
tilelive-copy \
|
||||
--minzoom=12 --maxzoom=12 \
|
||||
--bounds="11.395769,48.083436,11.618242,48.220866" \
|
||||
test-data/europe_germany-2020-02-13-openmaptiles-v3.12.1.mbtiles test-data/munich-12.mbtiles
|
||||
tilelive-copy \
|
||||
--minzoom=15 --maxzoom=15 \
|
||||
--bounds="11.395769,48.083436,11.618242,48.220866" \
|
||||
test-data/europe_germany-2020-02-13-openmaptiles-v3.12.1.mbtiles test-data/munich-15.mbtiles
|
||||
#!/usr/bin/env bash
|
||||
set -euxo pipefail
|
||||
if ! command -v tilelive-copy &> /dev/null
|
||||
then
|
||||
echo "tilelive-copy could not be found. Install it with 'yarn global add @mapbox/tilelive @mapbox/mbtiles'"
|
||||
exit 1
|
||||
fi
|
||||
# Bounds copied from https://boundingbox.klokantech.com/
|
||||
tilelive-copy \
|
||||
--minzoom=12 --maxzoom=12 \
|
||||
--bounds="11.395769,48.083436,11.618242,48.220866" \
|
||||
test-data/europe_germany-2020-02-13-openmaptiles-v3.12.1.mbtiles test-data/munich-12.mbtiles
|
||||
tilelive-copy \
|
||||
--minzoom=15 --maxzoom=15 \
|
||||
--bounds="11.395769,48.083436,11.618242,48.220866" \
|
||||
test-data/europe_germany-2020-02-13-openmaptiles-v3.12.1.mbtiles test-data/munich-15.mbtiles
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user