From 183a1ab4a31798e7967658fcb1c8ee8b2d50113d Mon Sep 17 00:00:00 2001
From: Julien Rebetez <julien.rebetez@gmail.com>
Date: Sat, 12 Nov 2022 16:07:23 +0100
Subject: [PATCH] justfile: add targets for toolchains (#208)

* Add proper just task dependencies

* Add targets for apple and android

Co-authored-by: Maximilian Ammann <max@maxammann.org>
---
 justfile | 39 ++++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/justfile b/justfile
index 3476229c..9d052393 100644
--- a/justfile
+++ b/justfile
@@ -14,23 +14,23 @@ export RUST_BACKTRACE := "1"
 stable-toolchain:
   rustup toolchain install $STABLE_TOOLCHAIN
 
-stable-override-toolchain:
+stable-override-toolchain: stable-toolchain
   rustup override set $STABLE_TOOLCHAIN
 
-stable-targets *FLAGS:
+stable-targets *FLAGS: stable-toolchain
   rustup toolchain install $STABLE_TOOLCHAIN --target {{FLAGS}}
 
-stable-install-clippy:
+stable-install-clippy: stable-toolchain
   rustup component add clippy --toolchain $STABLE_TOOLCHAIN
 
 
 nightly-toolchain:
   rustup toolchain install $NIGHTLY_TOOLCHAIN
 
-nightly-override-toolchain:
+nightly-override-toolchain: nightly-toolchain
   rustup override set $NIGHTLY_TOOLCHAIN
 
-nightly-targets *FLAGS:
+nightly-targets *FLAGS: nightly-toolchain
   rustup toolchain install $NIGHTLY_TOOLCHAIN --target {{FLAGS}}
 
 nightly-install-rustfmt: nightly-toolchain
@@ -39,11 +39,11 @@ nightly-install-rustfmt: nightly-toolchain
 nightly-install-src: nightly-toolchain
   rustup component add rust-src --toolchain $NIGHTLY_TOOLCHAIN
 
-nightly-install-clippy:
+nightly-install-clippy: stable-toolchain
   rustup component add clippy --toolchain $NIGHTLY_TOOLCHAIN
 
 
-fixup:
+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
@@ -88,7 +88,7 @@ web-install PROJECT:
 # Example: just web-lib build-webgl
 # Example: just web-lib watch
 # Example: just web-lib watch-webgl
-web-lib TARGET *FLAGS: nightly-toolchain (web-install "lib")
+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}}
 
 # Example: just web-demo start
@@ -96,7 +96,7 @@ web-lib TARGET *FLAGS: nightly-toolchain (web-install "lib")
 web-demo TARGET *FLAGS: (web-install "demo")
   cd web/demo && npm run {{TARGET}} -- {{FLAGS}}
 
-web-test FEATURES: nightly-toolchain
+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
 
 #profile-bench:
@@ -104,14 +104,16 @@ web-test FEATURES: nightly-toolchain
 
 build-android: build-android-lib build-android-demo
 
-build-android-lib: nightly-toolchain print-android-env
-  export RUSTUP_TOOLCHAIN=$NIGHTLY_TOOLCHAIN && cd android/gradle && ./gradlew :lib:assembleDebug
+ensure-android-toolchain: nightly-toolchain (nightly-targets "x86_64-linux-android" "aarch64-linux-android" "i686-linux-android")
 
-build-android-demo: nightly-toolchain print-android-env
-  export RUSTUP_TOOLCHAIN=$NIGHTLY_TOOLCHAIN && cd android/gradle && ./gradlew :demo:assembleDebug
+build-android-lib: ensure-android-toolchain print-android-env
+  cd android/gradle && ./gradlew :lib:assembleDebug
 
-install-android-demo: nightly-toolchain print-android-env
-  export RUSTUP_TOOLCHAIN=$NIGHTLY_TOOLCHAIN && cd android/gradle && ./gradlew :demo:installDebug
+build-android-demo: ensure-android-toolchain print-android-env
+  cd android/gradle && ./gradlew :demo:assembleDebug
+
+install-android-demo: ensure-android-toolchain print-android-env
+  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
@@ -131,7 +133,9 @@ PROJECT_DIR := "./apple/xcode/maplibre-rs.xcodeproj"
 BINARY_NAME := "maplibre_rs"
 BUILD_DIR := "./apple/build"
 
-xcodebuild-archive ARCH PLATFORM:
+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}}" \
@@ -177,9 +181,6 @@ xcodebuild-xcframework:
   echo "$framework_args" | xargs xcodebuild -create-xcframework -output "$XC_FRAMEWORK_PATH"
   cat "$XC_FRAMEWORK_PATH/Info.plist"
 
-book-serve:
-  mdbook serve docs
-
 # language=bash
 extract-tiles:
   #!/usr/bin/env bash