fix(vdisplay): stop the suite reporting ok for tests that never ran, and let clippy see the KWin backends
Three coverage holes, all of the same shape — a gate that looks green because
nothing is behind it.
The Windows half (~3,400 lines) had no executed tests. Its only two `#[test]`s
opened with `if env::var("PUNKTFUNK_PF_VDISPLAY_LIVE").is_err() { return; }`, so
without the hardware they passed without running, and no CI job compiled the
crate's test targets at all — `-p punktfunk-host` builds pf-vdisplay as a
dependency, which never reaches a `#[cfg(test)]` module. Both live tests are
`#[ignore]`d now (an unrun hardware test should say `ignored`), and windows-host.yml
gains the `--all-targets` lint plus a real test step. The link question that keeps
the host and pf-encode on clippy-only does not apply: pf-encode is `default = []`
and nothing here turns on nvenc/amf-qsv/qsv. Settled on the runner to the same
standard as pf-capture's step — 46 passed, 2 ignored.
`#![allow(clippy::all, ...)]` at the top of kwin.rs and kwin_output_mgmt.rs was
meant for wayland-scanner output, but the generated modules already carry their own
copy of that attribute — so the file-level one was only ever silencing 2,366 lines
of hand-written backend, with `clippy::correctness` (deny-by-default) among the
casualties. Dropping it found a dead match arm in the `kde_output_configuration_v2`
dispatch; that one is now exhaustive on purpose, so a re-vendored XML that adds an
event fails the build instead of dropping it silently. (The sibling `_ => {}` in the
DeviceMode dispatch is NOT dead — `ModeEvent::Removed` really does reach it and get
swallowed, which is a separate defect.)
`dead_code` is now enforced on Linux, where ~10k of the ~17k lines live, instead of
allowed crate-wide behind a rationale that had stopped being true. It turned up no
genuinely dead code: four items, every one live from tests or another platform, now
annotated with which. One deserved the comment most — `Entry::keepalive` is "never
read" because it is an RAII guard whose `Drop` releases the compositor output, so
deleting it as unused would release every pooled display the moment it was created.
Two tests were not testing what they claimed. `another_uids_socket_is_ignored`
asserted the sway-socket ownership guard but never reached it — `find_sway_socket`
filters on the `sway-ipc.<uid>.` filename prefix first, so the foreign-uid file was
rejected by name and the assertion held even with `md.uid() != uid` deleted. It is
renamed to what it does cover, and the real leg is a new `#[ignore]`d root test that
chowns a correctly-named socket (querying with a non-matching pid, or the exact-path
shortcut would return before the guard and make it vacuous all over again). And
proc.rs's tests were ungated while the module is compiled everywhere, so they would
have gone red on Windows the first time anyone ran them: `#[cfg(all(test, unix))]`
now, with a `cmd /c` twin that does run there.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
This commit is contained in:
Claude Opus 5
+4
-197
@@ -1,198 +1,5 @@
|
||||
#!/usr/bin/env bash
|
||||
#
|
||||
# Type-check and lint punktfunk's WINDOWS-only Rust from a Linux dev box.
|
||||
#
|
||||
# scripts/wincheck.sh # clippy -D warnings, the default
|
||||
# scripts/wincheck.sh check # cargo check instead
|
||||
# scripts/wincheck.sh clippy --fix # extra args are passed through to cargo
|
||||
#
|
||||
# Linux CI never compiles `#[cfg(target_os = "windows")]` code, so a Windows-side edit is otherwise
|
||||
# unverifiable until the Windows CI job runs (minutes) or someone tests on a real box. This gets the
|
||||
# same answer in ~1 s warm, against the WORKING TREE — the generated workspace symlinks each `src`
|
||||
# at the real crate directory, so there is nothing to keep in sync and no copies to go stale.
|
||||
#
|
||||
# WHY A SEPARATE WORKSPACE — the obvious in-tree command
|
||||
#
|
||||
# cargo check --target x86_64-pc-windows-msvc -p pf-capture
|
||||
#
|
||||
# fails, and NOT because of the Windows code: it dies in build scripts that compile C for the
|
||||
# target. `audiopus_sys` first (cmake wants a Visual Studio generator), then `ring` (needs an MSVC C
|
||||
# compiler plus the Windows SDK headers; clang-cl and lld-link exist locally but there is no SDK).
|
||||
# Both enter the graph through `punktfunk-core`'s `quic` feature. Stubbing opus with a fake
|
||||
# `opus.pc` gets past audiopus but not ring.
|
||||
#
|
||||
# The whole Windows capture stack uses exactly FOUR items from punktfunk-core — `quic::HdrMeta`,
|
||||
# `Mode`, `CompositorPref` and its `as_str`, all plain data (re-verify with:
|
||||
# `grep -rho 'punktfunk_core::[A-Za-z_:]*' crates/pf-{capture,frame,win-display,vdisplay}/src | sort -u`).
|
||||
# So this script generates a ~50-line stub core carrying just those, and rustls/ring/opus never
|
||||
# enter the graph at all. Every path dep that is NOT a generated member points at the REAL crate by
|
||||
# absolute path, so their own relative deps and `version.workspace` inheritance still resolve.
|
||||
#
|
||||
# pf-encode is stubbed for the same reason and needs the same care: pf-vdisplay's admission gate
|
||||
# calls exactly ONE item from it (`can_open_another_session`, admission.rs), but the real crate
|
||||
# drags ffmpeg-sys — whose build script wants a Windows FFmpeg tree this box does not have. The
|
||||
# stub is a `cfg(windows) -> bool`; if admission ever consults a second encoder fact, mirror it
|
||||
# here or the cross-check stops covering that call.
|
||||
#
|
||||
# Note: `cargo fmt` needs none of this — rustfmt follows `mod`/`#[path]` without evaluating cfg, so
|
||||
# it already reaches Windows-only files. Mechanical edits can be normalised with plain `cargo fmt`.
|
||||
set -euo pipefail
|
||||
|
||||
REPO="$(cd "$(dirname "$(readlink -f "$0")")/.." && pwd)"
|
||||
OUT="${WINCHECK_DIR:-$REPO/target/wincheck}"
|
||||
TARGET=x86_64-pc-windows-msvc
|
||||
|
||||
# The generated members: crates whose Windows code we lint, plus the stub core they share. A path
|
||||
# dep naming one of these must stay RELATIVE (resolving to the generated member); anything else is
|
||||
# rewritten to the real crate. Getting that backwards silently drags the real punktfunk-core — and
|
||||
# with it ring and opus — back in through pf-frame, which is the entire thing this avoids.
|
||||
MEMBERS_RE='punktfunk-core|pf-encode|pf-frame|pf-win-display|pf-capture|pf-vdisplay'
|
||||
REAL_MEMBERS=(pf-frame pf-win-display pf-capture pf-vdisplay)
|
||||
|
||||
cmd="${1:-clippy}"
|
||||
[ $# -gt 0 ] && shift
|
||||
case "$cmd" in
|
||||
check | clippy) ;;
|
||||
*)
|
||||
echo "usage: $(basename "$0") [check|clippy] [extra cargo args...]" >&2
|
||||
exit 2
|
||||
;;
|
||||
esac
|
||||
|
||||
if ! rustc --print target-list | grep -qx "$TARGET"; then
|
||||
echo "wincheck: rustc does not know $TARGET" >&2
|
||||
exit 1
|
||||
fi
|
||||
if ! rustup target list --installed 2>/dev/null | grep -qx "$TARGET"; then
|
||||
echo "wincheck: target $TARGET not installed for the active toolchain — run:" >&2
|
||||
echo " rustup target add $TARGET" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
rm -rf "$OUT"
|
||||
mkdir -p "$OUT"
|
||||
|
||||
# Mirror the real [workspace.package] so the members' `version.workspace = true` resolves.
|
||||
{
|
||||
echo '# GENERATED by scripts/wincheck.sh — do not edit; re-run the script.'
|
||||
echo '[workspace]'
|
||||
echo 'resolver = "2"'
|
||||
echo 'members = ["punktfunk-core", "pf-encode", "pf-frame", "pf-win-display", "pf-capture", "pf-vdisplay"]'
|
||||
echo
|
||||
echo '[workspace.package]'
|
||||
sed -n '/^\[workspace\.package\]/,/^$/p' "$REPO/Cargo.toml" | sed '1d;/^$/d'
|
||||
} > "$OUT/Cargo.toml"
|
||||
|
||||
mkdir -p "$OUT/punktfunk-core/src"
|
||||
cat > "$OUT/punktfunk-core/Cargo.toml" <<'EOF'
|
||||
# GENERATED by scripts/wincheck.sh — a STUB, not the real crate.
|
||||
[package]
|
||||
name = "punktfunk-core"
|
||||
version.workspace = true
|
||||
edition = "2021"
|
||||
rust-version.workspace = true
|
||||
|
||||
[features]
|
||||
default = []
|
||||
# Present so dependents' `features = ["quic"]` resolves; carries no quinn/rustls/opus.
|
||||
quic = []
|
||||
EOF
|
||||
|
||||
# Field layout and derives must match the real definitions, or the cross-check goes stale exactly
|
||||
# where it matters (the capture code builds HdrMeta literally and compares Modes).
|
||||
cat > "$OUT/punktfunk-core/src/lib.rs" <<'EOF'
|
||||
//! GENERATED by scripts/wincheck.sh — a STUB of punktfunk-core carrying only the two items the
|
||||
//! Windows capture stack uses. Mirrors crates/punktfunk-core: `Mode` from config.rs, `HdrMeta`
|
||||
//! from quic/datagram.rs. If either grows a field, mirror it here.
|
||||
|
||||
/// Mirrors `punktfunk_core::Mode`.
|
||||
#[repr(C)]
|
||||
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
|
||||
pub struct Mode {
|
||||
pub width: u32,
|
||||
pub height: u32,
|
||||
pub refresh_hz: u32,
|
||||
}
|
||||
|
||||
/// Mirrors `punktfunk_core::CompositorPref` (config.rs). pf-vdisplay matches on every variant and
|
||||
/// calls `as_str`, so both the variant set and the strings must stay in step with the real enum.
|
||||
#[derive(Clone, Copy, Debug, PartialEq, Eq, Default)]
|
||||
pub enum CompositorPref {
|
||||
#[default]
|
||||
Auto,
|
||||
Kwin,
|
||||
Wlroots,
|
||||
Mutter,
|
||||
Gamescope,
|
||||
}
|
||||
|
||||
impl CompositorPref {
|
||||
pub fn as_str(self) -> &'static str {
|
||||
match self {
|
||||
CompositorPref::Auto => "auto",
|
||||
CompositorPref::Kwin => "kwin",
|
||||
CompositorPref::Wlroots => "wlroots",
|
||||
CompositorPref::Mutter => "mutter",
|
||||
CompositorPref::Gamescope => "gamescope",
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub mod quic {
|
||||
/// Mirrors `punktfunk_core::quic::HdrMeta`.
|
||||
#[derive(Clone, Copy, Debug, PartialEq, Eq, Default)]
|
||||
pub struct HdrMeta {
|
||||
pub display_primaries: [[u16; 2]; 3],
|
||||
pub white_point: [u16; 2],
|
||||
pub max_display_mastering_luminance: u32,
|
||||
pub min_display_mastering_luminance: u32,
|
||||
pub max_cll: u16,
|
||||
pub max_fall: u16,
|
||||
}
|
||||
}
|
||||
EOF
|
||||
|
||||
mkdir -p "$OUT/pf-encode/src"
|
||||
cat > "$OUT/pf-encode/Cargo.toml" <<'EOF'
|
||||
# GENERATED by scripts/wincheck.sh — a STUB, not the real crate.
|
||||
[package]
|
||||
name = "pf-encode"
|
||||
version.workspace = true
|
||||
edition = "2021"
|
||||
rust-version.workspace = true
|
||||
EOF
|
||||
|
||||
cat > "$OUT/pf-encode/src/lib.rs" <<'EOF'
|
||||
//! GENERATED by scripts/wincheck.sh — a STUB of pf-encode carrying only the one item pf-vdisplay's
|
||||
//! admission gate uses. The real crate pulls ffmpeg-sys, whose build script needs a Windows FFmpeg
|
||||
//! tree; nothing in the display path needs the encoder itself, only this predicate.
|
||||
|
||||
/// Mirrors `pf_encode::can_open_another_session` (lib.rs, `#[cfg(target_os = "windows")]`).
|
||||
#[cfg(target_os = "windows")]
|
||||
pub fn can_open_another_session() -> bool {
|
||||
true
|
||||
}
|
||||
EOF
|
||||
|
||||
for name in "${REAL_MEMBERS[@]}"; do
|
||||
mkdir -p "$OUT/$name"
|
||||
# Park the member paths behind a sentinel first: a plain self-substitution would be a no-op and
|
||||
# the next rule would rewrite them to absolute along with everything else.
|
||||
{
|
||||
echo "# GENERATED by scripts/wincheck.sh from crates/$name/Cargo.toml — src/ is a symlink."
|
||||
sed -E "s#path = \"\.\./($MEMBERS_RE)\"#path = \"@@M@@\1\"#g; \
|
||||
s#path = \"\.\./([A-Za-z0-9_-]+)\"#path = \"$REPO/crates/\1\"#g; \
|
||||
s#path = \"@@M@@#path = \"../#g" "$REPO/crates/$name/Cargo.toml"
|
||||
} > "$OUT/$name/Cargo.toml"
|
||||
ln -sfn "$REPO/crates/$name/src" "$OUT/$name/src"
|
||||
done
|
||||
|
||||
cd "$OUT"
|
||||
for name in "${REAL_MEMBERS[@]}"; do
|
||||
echo "=== $cmd $name ($TARGET) ==="
|
||||
if [ "$cmd" = clippy ]; then
|
||||
cargo clippy --target "$TARGET" -p "$name" --all-targets "$@" -- -D warnings
|
||||
else
|
||||
cargo check --target "$TARGET" -p "$name" --all-targets "$@"
|
||||
fi
|
||||
done
|
||||
# Compat shim: this script was renamed to xcheck.sh when it learned to cross-check the LINUX
|
||||
# backends too (pf-vdisplay's five compositor backends are as invisible to a Mac as the Windows
|
||||
# half is). Forwards to the windows half, which is all this name ever meant.
|
||||
exec "$(dirname "$(readlink -f "$0")")/xcheck.sh" windows "$@"
|
||||
|
||||
Executable
+237
@@ -0,0 +1,237 @@
|
||||
#!/usr/bin/env bash
|
||||
#
|
||||
# Type-check and lint punktfunk's PLATFORM-GATED Rust from a dev box that is neither platform.
|
||||
#
|
||||
# scripts/xcheck.sh # windows, clippy -D warnings — the default
|
||||
# scripts/xcheck.sh linux # the Linux backends instead
|
||||
# scripts/xcheck.sh windows check # cargo check instead of clippy
|
||||
# scripts/xcheck.sh linux clippy --fix # extra args are passed through to cargo
|
||||
#
|
||||
# (`scripts/wincheck.sh` is a compat shim for the windows half — this script's former name.)
|
||||
#
|
||||
# CI compiles each platform's `#[cfg(target_os = ...)]` code only on that platform, so a Windows- or
|
||||
# Linux-side edit made on a Mac is otherwise unverifiable until that CI job runs (minutes) or someone
|
||||
# tests on a real box. This gets the same answer in ~1 s warm, against the WORKING TREE — the
|
||||
# generated workspace symlinks each crate's real directory contents, so there is nothing to keep in
|
||||
# sync and no copies to go stale.
|
||||
#
|
||||
# Coverage is deliberately asymmetric. Windows lints pf-frame, pf-win-display, pf-capture and
|
||||
# pf-vdisplay; Linux lints pf-vdisplay only, because pf-capture's Linux half needs `pipewire`, whose
|
||||
# build script wants libpipewire via pkg-config. pf-frame and pf-win-display stay generated MEMBERS
|
||||
# for both targets even when nothing lints them: demote either to a real path dep and its
|
||||
# punktfunk-core dependency resolves to the REAL crate, dragging ring and opus back into the graph —
|
||||
# the exact thing the stub exists to prevent.
|
||||
#
|
||||
# WHY A SEPARATE WORKSPACE — the obvious in-tree command
|
||||
#
|
||||
# cargo check --target x86_64-pc-windows-msvc -p pf-capture
|
||||
#
|
||||
# fails, and NOT because of the Windows code: it dies in build scripts that compile C for the
|
||||
# target. `audiopus_sys` first (cmake wants a Visual Studio generator), then `ring` (needs an MSVC C
|
||||
# compiler plus the Windows SDK headers; clang-cl and lld-link exist locally but there is no SDK).
|
||||
# Both enter the graph through `punktfunk-core`'s `quic` feature. Stubbing opus with a fake
|
||||
# `opus.pc` gets past audiopus but not ring.
|
||||
#
|
||||
# The whole Windows capture stack uses exactly FOUR items from punktfunk-core — `quic::HdrMeta`,
|
||||
# `Mode`, `CompositorPref` and its `as_str`, all plain data (re-verify with:
|
||||
# `grep -rho 'punktfunk_core::[A-Za-z_:]*' crates/pf-{capture,frame,win-display,vdisplay}/src | sort -u`).
|
||||
# So this script generates a ~50-line stub core carrying just those, and rustls/ring/opus never
|
||||
# enter the graph at all. Every path dep that is NOT a generated member points at the REAL crate by
|
||||
# absolute path, so their own relative deps and `version.workspace` inheritance still resolve.
|
||||
#
|
||||
# pf-encode is stubbed for the same reason and needs the same care: pf-vdisplay's admission gate
|
||||
# calls exactly ONE item from it (`can_open_another_session`, admission.rs), but the real crate
|
||||
# drags ffmpeg-sys — whose build script wants a Windows FFmpeg tree this box does not have. The
|
||||
# stub is a `cfg(windows) -> bool`; if admission ever consults a second encoder fact, mirror it
|
||||
# here or the cross-check stops covering that call.
|
||||
#
|
||||
# Note: `cargo fmt` needs none of this — rustfmt follows `mod`/`#[path]` without evaluating cfg, so
|
||||
# it already reaches Windows-only files. Mechanical edits can be normalised with plain `cargo fmt`.
|
||||
set -euo pipefail
|
||||
|
||||
REPO="$(cd "$(dirname "$(readlink -f "$0")")/.." && pwd)"
|
||||
|
||||
plat="${1:-windows}"
|
||||
case "$plat" in
|
||||
windows | linux) shift || true ;;
|
||||
# No platform given: the first arg (if any) is the cargo subcommand. Default to windows, which is
|
||||
# what this script did under its former name.
|
||||
*) plat=windows ;;
|
||||
esac
|
||||
|
||||
case "$plat" in
|
||||
windows)
|
||||
TARGET=x86_64-pc-windows-msvc
|
||||
LINT=(pf-frame pf-win-display pf-capture pf-vdisplay)
|
||||
;;
|
||||
linux)
|
||||
TARGET=x86_64-unknown-linux-gnu
|
||||
# pf-capture is absent on purpose — see the header (libpipewire).
|
||||
LINT=(pf-vdisplay)
|
||||
;;
|
||||
esac
|
||||
OUT="${XCHECK_DIR:-${WINCHECK_DIR:-$REPO/target/xcheck-$plat}}"
|
||||
|
||||
# The generated members: every crate we lint on EITHER target, plus the two stubs they share. A path
|
||||
# dep naming one of these must stay RELATIVE (resolving to the generated member); anything else is
|
||||
# rewritten to the real crate. Getting that backwards silently drags the real punktfunk-core — and
|
||||
# with it ring and opus — back in through pf-frame, which is the entire thing this avoids.
|
||||
MEMBERS_RE='punktfunk-core|pf-encode|pf-frame|pf-win-display|pf-capture|pf-vdisplay'
|
||||
REAL_MEMBERS=(pf-frame pf-win-display pf-capture pf-vdisplay)
|
||||
|
||||
cmd="${1:-clippy}"
|
||||
[ $# -gt 0 ] && shift
|
||||
case "$cmd" in
|
||||
check | clippy) ;;
|
||||
*)
|
||||
echo "usage: $(basename "$0") [windows|linux] [check|clippy] [extra cargo args...]" >&2
|
||||
exit 2
|
||||
;;
|
||||
esac
|
||||
|
||||
if ! rustc --print target-list | grep -qx "$TARGET"; then
|
||||
echo "xcheck: rustc does not know $TARGET" >&2
|
||||
exit 1
|
||||
fi
|
||||
if ! rustup target list --installed 2>/dev/null | grep -qx "$TARGET"; then
|
||||
echo "xcheck: target $TARGET not installed for the active toolchain — run:" >&2
|
||||
echo " rustup target add $TARGET" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
rm -rf "$OUT"
|
||||
mkdir -p "$OUT"
|
||||
|
||||
# Mirror the real [workspace.package] so the members' `version.workspace = true` resolves.
|
||||
{
|
||||
echo '# GENERATED by scripts/xcheck.sh — do not edit; re-run the script.'
|
||||
echo '[workspace]'
|
||||
echo 'resolver = "2"'
|
||||
echo 'members = ["punktfunk-core", "pf-encode", "pf-frame", "pf-win-display", "pf-capture", "pf-vdisplay"]'
|
||||
echo
|
||||
echo '[workspace.package]'
|
||||
sed -n '/^\[workspace\.package\]/,/^$/p' "$REPO/Cargo.toml" | sed '1d;/^$/d'
|
||||
} > "$OUT/Cargo.toml"
|
||||
|
||||
mkdir -p "$OUT/punktfunk-core/src"
|
||||
cat > "$OUT/punktfunk-core/Cargo.toml" <<'EOF'
|
||||
# GENERATED by scripts/xcheck.sh — a STUB, not the real crate.
|
||||
[package]
|
||||
name = "punktfunk-core"
|
||||
version.workspace = true
|
||||
edition = "2021"
|
||||
rust-version.workspace = true
|
||||
|
||||
[features]
|
||||
default = []
|
||||
# Present so dependents' `features = ["quic"]` resolves; carries no quinn/rustls/opus.
|
||||
quic = []
|
||||
EOF
|
||||
|
||||
# Field layout and derives must match the real definitions, or the cross-check goes stale exactly
|
||||
# where it matters (the capture code builds HdrMeta literally and compares Modes).
|
||||
cat > "$OUT/punktfunk-core/src/lib.rs" <<'EOF'
|
||||
//! GENERATED by scripts/xcheck.sh — a STUB of punktfunk-core carrying only the two items the
|
||||
//! Windows capture stack uses. Mirrors crates/punktfunk-core: `Mode` from config.rs, `HdrMeta`
|
||||
//! from quic/datagram.rs. If either grows a field, mirror it here.
|
||||
|
||||
/// Mirrors `punktfunk_core::Mode`.
|
||||
#[repr(C)]
|
||||
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
|
||||
pub struct Mode {
|
||||
pub width: u32,
|
||||
pub height: u32,
|
||||
pub refresh_hz: u32,
|
||||
}
|
||||
|
||||
/// Mirrors `punktfunk_core::CompositorPref` (config.rs). pf-vdisplay matches on every variant and
|
||||
/// calls `as_str`, so both the variant set and the strings must stay in step with the real enum.
|
||||
#[derive(Clone, Copy, Debug, PartialEq, Eq, Default)]
|
||||
pub enum CompositorPref {
|
||||
#[default]
|
||||
Auto,
|
||||
Kwin,
|
||||
Wlroots,
|
||||
Mutter,
|
||||
Gamescope,
|
||||
}
|
||||
|
||||
impl CompositorPref {
|
||||
pub fn as_str(self) -> &'static str {
|
||||
match self {
|
||||
CompositorPref::Auto => "auto",
|
||||
CompositorPref::Kwin => "kwin",
|
||||
CompositorPref::Wlroots => "wlroots",
|
||||
CompositorPref::Mutter => "mutter",
|
||||
CompositorPref::Gamescope => "gamescope",
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub mod quic {
|
||||
/// Mirrors `punktfunk_core::quic::HdrMeta`.
|
||||
#[derive(Clone, Copy, Debug, PartialEq, Eq, Default)]
|
||||
pub struct HdrMeta {
|
||||
pub display_primaries: [[u16; 2]; 3],
|
||||
pub white_point: [u16; 2],
|
||||
pub max_display_mastering_luminance: u32,
|
||||
pub min_display_mastering_luminance: u32,
|
||||
pub max_cll: u16,
|
||||
pub max_fall: u16,
|
||||
}
|
||||
}
|
||||
EOF
|
||||
|
||||
mkdir -p "$OUT/pf-encode/src"
|
||||
cat > "$OUT/pf-encode/Cargo.toml" <<'EOF'
|
||||
# GENERATED by scripts/xcheck.sh — a STUB, not the real crate.
|
||||
[package]
|
||||
name = "pf-encode"
|
||||
version.workspace = true
|
||||
edition = "2021"
|
||||
rust-version.workspace = true
|
||||
EOF
|
||||
|
||||
cat > "$OUT/pf-encode/src/lib.rs" <<'EOF'
|
||||
//! GENERATED by scripts/xcheck.sh — a STUB of pf-encode carrying only the one item pf-vdisplay's
|
||||
//! admission gate uses. The real crate pulls ffmpeg-sys, whose build script needs a Windows FFmpeg
|
||||
//! tree; nothing in the display path needs the encoder itself, only this predicate.
|
||||
|
||||
/// Mirrors `pf_encode::can_open_another_session` (lib.rs, `#[cfg(target_os = "windows")]`).
|
||||
#[cfg(target_os = "windows")]
|
||||
pub fn can_open_another_session() -> bool {
|
||||
true
|
||||
}
|
||||
EOF
|
||||
|
||||
for name in "${REAL_MEMBERS[@]}"; do
|
||||
mkdir -p "$OUT/$name"
|
||||
# Park the member paths behind a sentinel first: a plain self-substitution would be a no-op and
|
||||
# the next rule would rewrite them to absolute along with everything else.
|
||||
{
|
||||
echo "# GENERATED by scripts/xcheck.sh from crates/$name/Cargo.toml — contents are symlinks."
|
||||
sed -E "s#path = \"\.\./($MEMBERS_RE)\"#path = \"@@M@@\1\"#g; \
|
||||
s#path = \"\.\./([A-Za-z0-9_-]+)\"#path = \"$REPO/crates/\1\"#g; \
|
||||
s#path = \"@@M@@#path = \"../#g" "$REPO/crates/$name/Cargo.toml"
|
||||
} > "$OUT/$name/Cargo.toml"
|
||||
# Symlink EVERY entry, not just src/: pf-vdisplay's `wayland_scanner::generate_interfaces!` reads
|
||||
# `protocols/*.xml` relative to CARGO_MANIFEST_DIR, which is this generated member. Without the
|
||||
# protocols dir the proc macro panics and every generated Wayland type resolves to nothing — ~20
|
||||
# cascading errors that look like a code problem and are not.
|
||||
for entry in "$REPO/crates/$name"/*; do
|
||||
case "$(basename "$entry")" in
|
||||
Cargo.toml | target) continue ;;
|
||||
esac
|
||||
ln -sfn "$entry" "$OUT/$name/$(basename "$entry")"
|
||||
done
|
||||
done
|
||||
|
||||
cd "$OUT"
|
||||
for name in "${LINT[@]}"; do
|
||||
echo "=== $cmd $name ($TARGET) ==="
|
||||
if [ "$cmd" = clippy ]; then
|
||||
cargo clippy --target "$TARGET" -p "$name" --all-targets "$@" -- -D warnings
|
||||
else
|
||||
cargo check --target "$TARGET" -p "$name" --all-targets "$@"
|
||||
fi
|
||||
done
|
||||
Reference in New Issue
Block a user