mirror of
https://github.com/LGUG2Z/komorebi.git
synced 2026-11-16 05:41:16 +01:00
komorebic-linux, komorebi-client-linux, komorebic-macos, komorebi-client-macos and komorebi-bar-macos were #[path] includes of the unified komorebic, komorebi-client and komorebi-bar modules, kept only so the old package names kept building. The unified packages are the only ones now, so the five directories and their workspace members are gone (Cargo.lock loses their dependency entries). Things that named the old packages follow: the clarify entries of the two per-tree deny.toml files, tools/fast-check, tools/mac-check.sh and tools/kde-closure-check (it now walks komorebic and komorebi-client), and the doc comment of komorebic/src/main.rs. komorebi-for-kde/nix/root-crates.json gains komorebic, komorebi-client and crates/komorebi-version, because those are root crates the KDE build depends on now. komorebi-for-mac/komorebi/src/pan.rs read its transcripts from the deleted komorebic/fixtures; they are byte-identical to the root komorebic/fixtures, so the three paths point there. Not touched here (done in the flake and justfile revisions of this stack): the nix flakes and justfiles of the trees, which still name the removed packages, and docs/dev. Verified: Windows cargo clippy --locked --all-targets -D warnings (default members) passes; KDE cargo test -p komorebi -p komorebic -p komorebi-client -p komorebi-linux passes; macOS cargo check --target aarch64-apple-darwin (fake CC) of komorebi, komorebi-macos, komorebic, komorebi-client, komorebi-bar passes; tools/kde-closure-check passes. The nix flakes were not run.
24 lines
1.3 KiB
Bash
Executable File
24 lines
1.3 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
# usage: tools/mac-check.sh [extra cargo args]
|
|
# Type-check of the macOS code on Linux (target aarch64-apple-darwin) through the fake C compiler
|
|
# tools/cc-fake.sh. Cannot link or run anything. Same command as the macOS step of tools/fast-check, but
|
|
# unconditional. Run from anywhere inside the repository; uses FAST_CHECK_SCRATCH like fast-check.
|
|
set -euo pipefail
|
|
S="${FAST_CHECK_SCRATCH:-${XDG_CACHE_HOME:-$HOME/.cache}/komorebi-fast-check}"
|
|
HERE="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")"
|
|
ROOT="$(jj root 2>/dev/null || git rev-parse --show-toplevel)"
|
|
cd "$ROOT"
|
|
# merged root workspace (one Cargo.toml for the three platforms) or the old separate komorebi-for-mac workspace
|
|
if [ -f komorebi-for-kde/Cargo.toml ]; then
|
|
cd komorebi-for-mac
|
|
PKGS=(--workspace)
|
|
else
|
|
PKGS=(-p komorebi -p komorebi-macos -p komorebic -p komorebi-client -p komorebi-bar)
|
|
fi
|
|
export CARGO_TARGET_DIR="$S/target-fast-mac" COMMIT_HASH="${COMMIT_HASH:-dev}"
|
|
export CC_aarch64_apple_darwin="$HERE/cc-fake.sh" AR_aarch64_apple_darwin=ar
|
|
PKG_CONFIG_PATH="$(nix build --no-link --print-out-paths nixpkgs#openssl.dev)/lib/pkgconfig"
|
|
export PKG_CONFIG_PATH
|
|
exec nix shell nixpkgs#gcc nixpkgs#pkg-config nixpkgs#openssl.dev -c \
|
|
cargo check --target aarch64-apple-darwin "${PKGS[@]}" --all-targets "$@"
|