0.10.0: dist-apk and dist-apple read the staged closure; dmg, aab and setup formats; rules-metal (mcpp#634) (#24)

The plugin half of mcpp#634, measured on the released mcpp 2026.9.14.2 (run 34831041382).

Author: Sunrisepeak

.github/scripts/mcpp-under-review.sh

@@ -0,0 +1,66 @@
+#!/usr/bin/env bash
+# The mcpp a job's steps run, when that is not the released one.
+#
+# `MCPP_SOURCE_REF` names a branch or tag of mcpp-community/mcpp. Empty, the
+# steps run the release `MCPP_VERSION` names, which the step before this one
+# fetched into `$MCPP`. Set, this script builds mcpp at that reference with the
+# released mcpp and points `$MCPP` at the result, so that a change to the engine
+# is measured against this collection before either is released.
+#
+# A SCRIPT, NOT A STEP COPIED INTO EACH JOB. Two copies drift, and a job that
+# installs mcpp without this channel builds manifests written for the engine
+# under review with the released engine, which accepts a key it does not know
+# and proceeds without the semantics the key asks for.
+#
+# WHAT THIS SCRIPT WRITES IS NOT EVIDENCE THAT IT TOOK EFFECT. `GITHUB_ENV`
+# governs the steps that follow, so the job's next step compares what `$MCPP`
+# names and prints with what this script built.
+#
+# Environment: MCPP (the released mcpp), MCPP_SOURCE_REF, RUNNER_TEMP, GITHUB_ENV.
+set -euo pipefail
+
+: "${MCPP:?the released mcpp, which the step before this one fetches}"
+: "${GITHUB_ENV:?}"
+: "${RUNNER_TEMP:?}"
+
+echo "MCPP_RELEASED=$MCPP" >> "$GITHUB_ENV"
+if [ -z "${MCPP_SOURCE_REF:-}" ]; then
+    echo "MCPP_SOURCE_REF is empty: the steps run the released $("$MCPP" --version | head -1)"
+    exit 0
+fi
+
+# In Git Bash on Windows `RUNNER_TEMP` is a Windows path (`D:\a\_temp`), and the
+# binary path this script exports is used by bash in every later step, so the
+# directory is spelled in bash's own syntax.
+temp="$RUNNER_TEMP"
+if command -v cygpath > /dev/null; then temp=$(cygpath -u "$temp"); fi
+src="$temp/mcpp-src"
+rm -rf "$src"
+git clone --quiet --depth 1 --branch "$MCPP_SOURCE_REF" \
+    https://github.com/mcpp-community/mcpp.git "$src"
+echo "READING source: mcpp-community/mcpp $MCPP_SOURCE_REF at $(git -C "$src" rev-parse HEAD)"
+
+# The clone's `.xlings.json` pins the mcpp that builds mcpp in that repository's
+# own CI, and the pin does not move with this job's release: a build inside the
+# checkout obeys it and installs a version this job did not choose. Removed, the
+# released mcpp above builds the source.
+rm -f "$src/.xlings.json"
+
+(cd "$src" && "$MCPP" build)
+
+# A fresh clone holds no earlier build, so what remains is this build's product;
+# the count is asserted rather than assumed.
+built=$(find "$src/target" -type f \( -name mcpp -o -name mcpp.exe \))
+count=$(printf '%s\n' "$built" | grep -c . || true)
+if [ "$count" != 1 ]; then
+    echo "::error::expected one mcpp binary from $MCPP_SOURCE_REF, found $count"
+    printf '%s\n' "$built" | sed 's/^/    /'
+    exit 1
+fi
+version=$("$built" --version | head -1)
+echo "READING under review: $version at $built"
+{
+    echo "MCPP=$built"
+    echo "MCPP_UNDER_REVIEW=$built"
+    echo "MCPP_UNDER_REVIEW_VERSION=$version"
+} >> "$GITHUB_ENV"

.github/workflows/ci.yml

@@ -1,7 +1,7 @@
 [package]
 name        = "plugins"
 namespace   = "mcpp"
-version     = "0.9.3"
+version     = "0.10.0"
 description = "Official mcpp build plugins: rule packages under mcpp.rules.*, build-time utilities under mcpp.tools.*, each member selected by a feature"
 license     = "Apache-2.0"
 authors     = ["mcpp-community"]
@@ -84,6 +84,16 @@ implies           = ["surface"]
 rule_module       = "mcpp.rules.cuda"
 device_extensions = [".cu"]
 
+# `.metal` shaders become Metal libraries through `xcrun metal` and `xcrun
+# metallib`, the toolchain Xcode carries. No payload is declared, for the reason
+# `dist-apple` gives for `codesign`: Xcode is not redistributable, so the rule
+# locates the toolchain and refuses naming the command that found nothing.
+[features.rules-metal]
+sources           = ["rules/metal.cppm"]
+implies           = ["surface"]
+rule_module       = "mcpp.rules.metal"
+device_extensions = [".metal"]
+
 [features.rules-hip]
 sources           = ["rules/hip.cppm"]
 implies           = ["surface"]
@@ -388,12 +398,28 @@ implies           = ["surface"]
 # The per-host table stays the right shape only at the top level, where
 # platform keys select the HOST rather than restating a predicate the
 # section has already applied.
+#
+# 5.0.2-1, NOT 5.0.2, BECAUSE `--format setup` NEEDS THE EXTENSION. The recipe
+# revision adds `WixToolset.BootstrapperApplications.wixext` beside the tool,
+# and a bundle with WiX's stock bootstrapper application is refused without it
+# (WIX0200). An installation made under 5.0.2 keeps the payloads it fetched,
+# because xlings does not re-run the install hook of an installed version, so
+# the pin names the revision rather than the release.
 [target.windows.feature-xlings.dist-wix]
-"xim:wix" = "5.0.2"
+"xim:wix" = "5.0.2-1"
 
-# `dist-apple` declares no payload for `codesign`: it is part of Xcode, which is
-# not redistributable, so the member locates it and says where it looked. The
-# open-source `rcodesign` is the package that would replace that lookup.
+# `dist-apple` declares no payload for `codesign`, `ditto` or `hdiutil`: they are
+# part of macOS and Xcode, which are not redistributable, so the member runs the
+# system's. The open-source `rcodesign` is the package that would replace the
+# `codesign` lookup.
+#
+# THE RUNNER IS A PAYLOAD, AND ONLY `mcpp run` NEEDS IT. `mcpp run --format app`
+# on macOS reaches the bundle through the runner named `app` this member
+# supplies, `macapp-run`, which executes the bundle's executable in the
+# foreground so that its output and exit status are the program's. `when =
+# "run"` keeps a build or a pack from installing it.
+[target.'cfg(os = "macos")'.feature-xlings.dist-apple]
+"xim:macapp-run" = { version = "0.1.0", when = "run" }
 
 # ── The environment `dist-apk` needs ───────────────────────────────────────
 #
@@ -405,7 +431,7 @@ implies           = ["surface"]
 # is downloaded" shape the accelerator rules use, applied to the target axis
 # instead.
 #
-# FOUR PACKAGES, EACH OWNED BY A DIFFERENT HALF OF THE PIPELINE. `aapt2`,
+# FOUR OF THE FIVE PACKAGES, EACH OWNED BY A DIFFERENT HALF OF THE PIPELINE. `aapt2`,
 # `zipalign`, and the `apksigner`/`d8` wrappers all live in one archive
 # (`xim:android-build-tools`); `android.jar` is versioned by API level on its
 # own (`xim:android-platform`) because that is the number a project pins, not
@@ -430,11 +456,17 @@ implies           = ["surface"]
 # directory this entry resolves to (`api_level_from_platform_dir`), so an
 # alias that silently failed to resolve would surface as a build-time
 # refusal rather than a wrong number, but there is no reason to court it.
+#
+# `xim:bundletool` BUILDS `--format aab`. It is installed with the other four
+# for the reason `dist-appimage` gives above: provisioning runs before the
+# build program learns `--format`, so the format cannot gate a download. Its
+# launcher runs the JDK it was installed against, which is the one pinned here.
 [target.'cfg(env = "android")'.feature-xlings.dist-apk]
 "xim:android-build-tools"     = ">=37.0.0"
 "xim:android-platform"        = "36-r2"
 "xim:jdk-temurin"             = "25.0.4+7"
 "xim:android-debug-keystore"  = "1.0.0"
+"xim:bundletool"              = "1.18.3"
 
 [targets.plugins]
 kind = "lib"