@zackees/soldr 0.7.103 → 0.8.0

package/README.md

@@ -128,7 +128,9 @@ soldr cargo build --target aarch64-pc-windows-msvc
 
 The canonical multi-platform GitHub Actions tutorial lives in [`zackees/setup-soldr#90`](https://github.com/zackees/setup-soldr/issues/90).
 
-For Linux → Windows cross-compilation (GNU via `cargo-zigbuild`, MSVC via `cargo-xwin`), see [docs/CROSS_COMPILE.md](./docs/CROSS_COMPILE.md).
+For Linux → Windows cross-compilation (GNU via `cargo-zigbuild`, MSVC via
+`cargo-xwin`) and explicit Windows x64 GNU builds via managed MinGW-w64 GCC,
+see [docs/CROSS_COMPILE.md](./docs/CROSS_COMPILE.md).
 
 ### CI cache lineage
 
@@ -329,7 +331,7 @@ If you also have many separate test binaries, consider consolidating them under
 - **Pre-built first**: Download a pre-built binary before compiling from source. Fall back gracefully.
 - **Cargo-compatible**: soldr preserves normal cargo arguments instead of forcing a separate workflow.
 - **Cross-platform**: Linux, macOS, Windows (x86_64 + aarch64).
-- **MSVC by default on Windows**: Always targets `x86_64-pc-windows-msvc` (or `aarch64-pc-windows-msvc`) unless the active project explicitly selects another target in `.cargo/config.toml`, `.cargo/config`, or `rust-toolchain.toml`. MSVC links against `vcruntime140.dll` which ships with every modern Windows install. The GNU target requires shipping `libgcc_s_seh-1.dll` and `libwinpthread-1.dll` with every binary, which is extra baggage for no benefit. This matches the Rust ecosystem default: rustup, cargo-binstall, and nearly all published release binaries target MSVC. crgx gets this wrong by baking the target at compile time, causing it to look for GNU binaries when compiled under MSYS2.
+- **MSVC by default on Windows**: Always targets `x86_64-pc-windows-msvc` (or `aarch64-pc-windows-msvc`) unless the active project explicitly selects another target in `.cargo/config.toml`, `.cargo/config`, or `rust-toolchain.toml`. MSVC links against `vcruntime140.dll` which ships with every modern Windows install. The GNU target requires shipping `libgcc_s_seh-1.dll` and `libwinpthread-1.dll` with every binary, which is extra baggage for most projects; when a project explicitly needs `x86_64-pc-windows-gnu`, `soldr prepare --target x86_64-pc-windows-gnu` provisions managed MinGW-w64 GCC on Windows x64. This matches the Rust ecosystem default: rustup, cargo-binstall, and nearly all published release binaries target MSVC. crgx gets this wrong by baking the target at compile time, causing it to look for GNU binaries when compiled under MSYS2.
 
 ## Architecture
 

package/bin/soldr.js

@@ -21,25 +21,8 @@ if (!fs.existsSync(binaryPath)) {
   process.exit(1);
 }
 
-// Wire the bundled zccache trio (zccache, zccache-daemon, zccache-fp,
-// shipped alongside soldr in `bin/native/` since the combined-archive
-// release format landed) into soldr's local-zccache resolution path.
-// Soldr's ZccacheResolver checks SOLDR_ZCCACHE_LOCAL_DIR ahead of the
-// pinned and managed-download chain, so this turns the bundled
-// binaries into the active zccache automatically — no manual env
-// setup, no managed fetch over the network. Users who explicitly set
-// the env var themselves keep their override.
 const exeExt = process.platform === "win32" ? ".exe" : "";
 const childEnv = { ...process.env };
-const zccacheLocalDirEnv = zccacheContract.CONTRACT.zccache.local_dir_env;
-if (
-  !childEnv[zccacheLocalDirEnv] &&
-  zccacheContract.ZCCACHE_BUNDLED_BINARIES.every((baseName) =>
-    fs.existsSync(path.join(nativeDir, `${baseName}${exeExt}`)),
-  )
-) {
-  childEnv[zccacheLocalDirEnv] = nativeDir;
-}
 
 // Same wiring for the bundled crgx binary (shipped alongside soldr
 // since the crgx-bundling follow-up to the combined-archive release

package/contracts/zccache-integration-guardrails.v1.json

@@ -77,9 +77,8 @@
       "gate": "hard",
       "covers": [
         "SOLDR_TEST_ZCCACHE_BIN override",
-        "SOLDR_ZCCACHE_LOCAL_DIR override",
-        "pinned managed runtime",
-        "managed cached/runtime fallback",
+        "embedded soldr/soldr-daemon runtime",
+        "managed cache directory selection",
         "system fallback diagnostics"
       ],
       "test_files": [
@@ -221,7 +220,7 @@
       "gate": "hard",
       "covers": [
         "release archive manifest",
-        "zccache binary trio",
+        "embedded zccache runtime",
         "crgx binary",
         "setup-soldr manifest validation",
         "npm bundled contract files"

package/contracts/zccache-runtime.v1.json

@@ -9,6 +9,9 @@
     "sha256_algorithm": "sha256",
     "required_binaries": [
       "soldr",
+      "soldr-daemon",
+      "soldr-shim",
+      "soldr-clang-shim",
       "crgx",
       "cargo-chef"
     ],
@@ -16,7 +19,7 @@
   },
   "zccache": {
     "embedded": true,
-    "note": "zccache ships as a compiled-in soldr `[[bin]]` (soldr#1368); no managed download.",
+    "note": "zccache is embedded into soldr/soldr-daemon (soldr#1368); no standalone zccache binaries are bundled or downloaded.",
     "cache_dir_env": "ZCCACHE_CACHE_DIR"
   },
   "crgx": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zackees/soldr",
-  "version": "0.7.103",
+  "version": "0.8.0",
   "description": "Instant Rust tools and builds from one command.",
   "license": "BSD-3-Clause",
   "homepage": "https://github.com/zackees/soldr",

package/scripts/install.js

@@ -14,12 +14,11 @@ const PACKAGE_ROOT = path.resolve(__dirname, "..");
 const PACKAGE_JSON = require(path.join(PACKAGE_ROOT, "package.json"));
 
 // Every release ships a single .tar.zst per target that bundles soldr
-// alongside its matching-target zccache trio (zccache, zccache-daemon,
-// zccache-fp), same-target crgx, and same-target cargo-chef. One fetch
-// installs everything, and `bin/soldr.js` wires SOLDR_ZCCACHE_LOCAL_DIR,
-// SOLDR_CRGX_LOCAL_DIR, and SOLDR_CARGO_CHEF_LOCAL_DIR
-// to the install dir so soldr's runtime resolver finds the sibling binaries
-// without going through the managed-download path.
+// alongside soldr-owned sidecars, same-target crgx, and same-target
+// cargo-chef. One fetch installs everything, and `bin/soldr.js` wires
+// SOLDR_CRGX_LOCAL_DIR and SOLDR_CARGO_CHEF_LOCAL_DIR to the install dir
+// so soldr's runtime resolver finds those bundled tools without going
+// through the managed-download path.
 const ARCHIVE_EXT = zccacheContract.ARCHIVE_EXT;
 
 const TARGETS = {
@@ -35,9 +34,8 @@ const TARGETS = {
 
 // Files we expect to find at the root of every extracted release
 // archive. Names line up with what `release-auto.yml`'s
-// `Fetch matched zccache release`, `Stage soldr binary`, and
-// `Build crgx from pinned source`, and `Build cargo-chef from pinned
-// source` steps drop into `dist/package/`
+// `Stage soldr release binaries`, `Build crgx from pinned source`, and
+// `Build cargo-chef from pinned source` steps drop into `dist/package/`
 // before the tar.zst is built. `.exe` suffix is appended at install
 // time based on `target.binary`.
 const BUNDLED_BINARIES = zccacheContract.RELEASE_BUNDLED_BINARIES;
@@ -250,9 +248,9 @@ async function install() {
     fs.rmSync(nativeDir, { recursive: true, force: true });
     fs.mkdirSync(nativeDir, { recursive: true });
 
-    // Copy every bundled binary so soldr's runtime resolver can find
-    // its sibling zccache via SOLDR_ZCCACHE_LOCAL_DIR, crgx via
-    // SOLDR_CRGX_LOCAL_DIR, and cargo-chef via SOLDR_CARGO_CHEF_LOCAL_DIR.
+    // Copy every bundled binary so soldr has its sidecars and can find
+    // crgx via SOLDR_CRGX_LOCAL_DIR and cargo-chef via
+    // SOLDR_CARGO_CHEF_LOCAL_DIR.
     // `bin/soldr.js` wires these env vars before exec. The archive
     // layout is flat: all bundled binaries live at the archive root.
     const binaryExt = target.binary.endsWith(".exe") ? ".exe" : "";
@@ -298,7 +296,7 @@ async function install() {
     fs.copyFileSync(manifestSrc, path.join(nativeDir, zccacheContract.MANIFEST_NAME));
 
     console.log(
-      `soldr: installed ${target.triple} (soldr + zccache trio + crgx + cargo-chef) into ${nativeDir}`,
+      `soldr: installed ${target.triple} (soldr + sidecars + crgx + cargo-chef) into ${nativeDir}`,
     );
   } finally {
     fs.rmSync(tmp, { recursive: true, force: true });

package/scripts/test-npm-package.js

@@ -128,8 +128,8 @@ assert.deepStrictEqual(
   install.BUNDLED_BINARIES,
   zccacheContract.RELEASE_BUNDLED_BINARIES,
 );
-// zccache is compiled into soldr (soldr#1368) — the standalone trio is no
-// longer bundled or downloaded.
+// zccache is embedded into soldr/soldr-daemon; no standalone zccache
+// binaries are bundled or downloaded.
 assert.deepStrictEqual(zccacheContract.ZCCACHE_BUNDLED_BINARIES, []);
 assert.strictEqual(zccacheContract.CRGX_BUNDLED_BINARY, "crgx");
 assert.strictEqual(zccacheContract.CARGO_CHEF_BUNDLED_BINARY, "cargo-chef");
@@ -165,15 +165,20 @@ for (const [key, target] of Object.entries(install.TARGETS || {})) {
   );
 }
 
-// BUNDLED_BINARIES must include soldr, crgx, and cargo-chef. zccache is
-// compiled into soldr (soldr#1368), so the standalone trio is no longer
-// bundled. Locks the per-archive layout contract so a future bundling
-// refactor can't quietly drop a binary.
+// BUNDLED_BINARIES must include soldr, soldr-owned sidecars, crgx, and
+// cargo-chef. It must not require standalone zccache binaries.
 assert.ok(
   Array.isArray(install.BUNDLED_BINARIES),
   "install.BUNDLED_BINARIES must be exported as an array",
 );
-for (const required of ["soldr", "crgx", "cargo-chef"]) {
+for (const required of [
+  "soldr",
+  "soldr-daemon",
+  "soldr-shim",
+  "soldr-clang-shim",
+  "crgx",
+  "cargo-chef",
+]) {
   assert.ok(
     install.BUNDLED_BINARIES.includes(required),
     `BUNDLED_BINARIES must include "${required}" (got ${JSON.stringify(install.BUNDLED_BINARIES)})`,

package/scripts/zccache-contract.js

@@ -13,10 +13,10 @@ const ARCHIVE_EXT = CONTRACT.release_archive.extension;
 const MANIFEST_NAME = CONTRACT.release_archive.manifest_name;
 const MANIFEST_MIN_SCHEMA_VERSION = CONTRACT.release_archive.manifest_min_schema_version;
 const RELEASE_BUNDLED_BINARIES = Object.freeze([...CONTRACT.release_archive.required_binaries]);
-// zccache is compiled into soldr (soldr#1368); no standalone zccache
-// binaries are bundled or downloaded, so this list is empty.
+// zccache is embedded into soldr/soldr-daemon; no standalone zccache
+// binaries are bundled or downloaded.
 const ZCCACHE_BUNDLED_BINARIES = Object.freeze([
-  ...(CONTRACT.zccache.required_binaries || []),
+  ...((CONTRACT.zccache && CONTRACT.zccache.required_binaries) || []),
 ]);
 const CRGX_BUNDLED_BINARY = CONTRACT.crgx.required_binaries[0];
 const CARGO_CHEF_BUNDLED_BINARY = CONTRACT.cargo_chef.required_binaries[0];
@@ -30,6 +30,9 @@ function releaseBinaryNames(platform = process.platform) {
 }
 
 function zccacheTargetForSoldrTarget(soldrTarget) {
+  if (CONTRACT.zccache && CONTRACT.zccache.embedded === true) {
+    return soldrTarget;
+  }
   if (!soldrTarget.includes("-unknown-linux-")) {
     return soldrTarget;
   }
@@ -46,6 +49,12 @@ function collectManifestBinaries(manifest) {
   if (manifest.soldr && manifest.soldr.binary && manifest.soldr.sha256) {
     binaries.set(manifest.soldr.binary, manifest.soldr.sha256);
   }
+  const soldrSidecars = (manifest.soldr && manifest.soldr.sidecars) || [];
+  for (const entry of soldrSidecars) {
+    if (entry && entry.name && entry.sha256) {
+      binaries.set(entry.name, entry.sha256);
+    }
+  }
   const zccacheBinaries = (manifest.zccache && manifest.zccache.binaries) || [];
   for (const entry of zccacheBinaries) {
     if (entry && entry.name && entry.sha256) {
@@ -79,8 +88,10 @@ function validateReleaseManifest(manifest, options) {
   if (!manifest.soldr || manifest.soldr.target !== soldrTarget) {
     throw new Error(`release manifest soldr.target must be ${soldrTarget}`);
   }
-  // zccache is compiled into soldr (soldr#1368) — no standalone zccache
-  // block is required in the release manifest anymore.
+  const expectedZccacheTarget = zccacheTargetForSoldrTarget(soldrTarget);
+  if (!manifest.zccache || manifest.zccache.target !== expectedZccacheTarget) {
+    throw new Error(`release manifest zccache.target must be ${expectedZccacheTarget}`);
+  }
   if (!manifest.crgx || manifest.crgx.target !== soldrTarget) {
     throw new Error(`release manifest crgx.target must be ${soldrTarget}`);
   }