Add native macOS arm64 setup distribution

.github/workflows/build.yml

@@ -46,3 +46,18 @@ jobs:
 
       - name: Test
         run: dotnet test translator/Translator.sln -c Release --no-build --verbosity normal
+
+  macos-setup:
+    name: macOS arm64 setup package
+    runs-on: macos-14
+    steps:
+      - uses: actions/checkout@v7
+        with:
+          persist-credentials: false
+
+      - uses: actions/setup-dotnet@v6
+        with:
+          dotnet-version: '8.0.x'
+
+      - name: Build and smoke-test setup archive
+        run: bash Launcher/package-macos-setup.sh --output-dir Launcher/dist

.github/workflows/package.yml

@@ -1,9 +1,7 @@
 name: Package installers
 
-# Builds the per-platform installer/setup tool (WiiCompiled-Setup.exe /
-# WiiCompiled-Setup-x86_64.AppImage) via Launcher/Build-Installer.ps1 and
-# Launcher/build-appimage.sh respectively - the same scripts a maintainer runs by hand today to
-# produce a GitHub Release asset. This does NOT build the actual translated game executable:
+# Builds the per-platform installer/setup tools (WiiCompiled-Setup.exe,
+# WiiCompiled-Setup-<arch>.AppImage, and WiiCompiled-Setup-macos-arm64.zip). This does NOT build the actual translated game executable:
 # that step requires the end user's own Mario Kart Wii dump (Assets/main.dol, Assets/StaticR.rel),
 # which is proprietary and not present in this repository or in CI.
 on:
@@ -90,14 +88,36 @@ jobs:
           if-no-files-found: error
           archive: false
 
+  macos-setup:
+    name: macOS setup (arm64)
+    runs-on: macos-14
+    steps:
+      - uses: actions/checkout@v7
+        with:
+          persist-credentials: false
+
+      - uses: actions/setup-dotnet@v6
+        with:
+          dotnet-version: '8.0.x'
+
+      - name: Build and smoke-test setup archive
+        run: bash Launcher/package-macos-setup.sh --output-dir Launcher/dist
+
+      - uses: actions/upload-artifact@v7
+        with:
+          name: WiiCompiled-Setup-macos-arm64
+          path: Launcher/dist/WiiCompiled-Setup-macos-arm64.zip
+          if-no-files-found: error
+          archive: false
+
   # Publishes the packaged installers as a GitHub Release whenever a v* tag is pushed. Wheel Wizard
   # discovers updates from these releases, so the contract it relies on is enforced here: a full
   # (non-prerelease) release whose tag is v<semver>, carrying an asset named exactly
   # WiiCompiled-Setup.exe, produced by a setup host that reports that same version.
   release:
     name: Publish GitHub Release
     if: startsWith(github.ref, 'refs/tags/v')
-    needs: [linux-appimage, windows-installer, recompilation]
+    needs: [linux-appimage, windows-installer, macos-setup, recompilation]
     runs-on: ubuntu-latest
     permissions:
       contents: write
@@ -141,7 +161,7 @@ jobs:
           set -euo pipefail
           ls -lR artifacts
           assets=()
-          for name in WiiCompiled-Setup.exe WiiCompiled-Setup-x86_64.AppImage WiiCompiled-Setup-aarch64.AppImage; do
+          for name in WiiCompiled-Setup.exe WiiCompiled-Setup-x86_64.AppImage WiiCompiled-Setup-aarch64.AppImage WiiCompiled-Setup-macos-arm64.zip; do
             found="$(find artifacts -type f -name "$name" | head -n 1)"
             [ -n "$found" ] && [ -s "$found" ] || { echo "::error::missing release asset $name"; exit 1; }
             assets+=("$found")

Launcher/WiiCompiled.Setup.Common/NodToolProvider.cs

@@ -8,9 +8,8 @@ namespace WiiCompiled.Setup.Common;
 /// caller can supply one directly; otherwise this downloads the matching prebuilt release binary
 /// from encounter/nod and caches it at Launcher/artifacts/nodtool[.exe].
 ///
-/// Shared by: WiiCompiled.Setup.Linux/DiscTool.cs (falls back to this at end-user install time on
-/// a plain git checkout), and WiiCompiled.Setup.Common.Cli (invoked once at packaging time by both
-/// build-appimage.sh and Build-Installer.ps1 to acquire the copy each bundles).
+/// Shared by the Linux/macOS setup hosts (which fall back to this at end-user install time on a
+/// plain git checkout), and WiiCompiled.Setup.Common.Cli (invoked at packaging time).
 /// </summary>
 public static class NodToolProvider
 {
@@ -56,6 +55,14 @@ private static string AssetName()
                 var other => throw new PlatformNotSupportedException($"No prebuilt nodtool release for Windows {other}"),
             };
         }
+        if (OperatingSystem.IsMacOS())
+        {
+            return RuntimeInformation.OSArchitecture switch
+            {
+                Architecture.Arm64 => "nodtool-macos-arm64",
+                var other => throw new PlatformNotSupportedException($"No prebuilt nodtool release for macOS {other}"),
+            };
+        }
         return RuntimeInformation.OSArchitecture switch
         {
             Architecture.X64 => "nodtool-linux-x86_64",

Launcher/WiiCompiled.Setup.Linux/BuildRunner.cs

@@ -3,7 +3,7 @@
 namespace WiiCompiled.Setup.Linux;
 
 /// <summary>
-/// Invokes Launcher/local-build.sh and turns its stdout into progress reports. Replaces
+/// Invokes the native platform build script and turns its stdout into progress reports. Replaces
 /// LocalBuildService.cs's hardcoded Windows PowerShell 5.1 invocation - there is no PowerShell
 /// dependency here at all, just bash.
 /// </summary>
@@ -17,8 +17,13 @@ public static async Task RunAsync(
         IInstallReporter reporter,
         CancellationToken cancellationToken)
     {
-        var script = Path.Combine(workspace, "Launcher", "local-build.sh");
-        if (!File.Exists(script)) throw new FileNotFoundException("local-build.sh is missing", script);
+        var macOS = OperatingSystem.IsMacOS();
+        if (macOS && sysroot is not null)
+            throw new ArgumentException("--sysroot is not supported by the macOS build.");
+
+        var script = Path.Combine(workspace, "Launcher",
+            macOS ? "local-build-macos.command" : "local-build.sh");
+        if (!File.Exists(script)) throw new FileNotFoundException($"{Path.GetFileName(script)} is missing", script);
 
         var startInfo = new ProcessStartInfo("bash")
         {
@@ -36,8 +41,6 @@ public static async Task RunAsync(
         }
         if (!string.IsNullOrEmpty(retroDir))
         {
-            // Still forwarded to local-build.sh under its own internal name -
-            // --retro-rewind-package-dir - matching LocalBuild.ps1's own -RetroRewindPackageDirectory.
             startInfo.ArgumentList.Add("--retro-rewind-package-dir"); startInfo.ArgumentList.Add(retroDir);
         }
         if (!string.IsNullOrEmpty(retroWfcOfflineDir))
@@ -50,37 +53,51 @@ public static async Task RunAsync(
         {
             startInfo.ArgumentList.Add("--translator-bin"); startInfo.ArgumentList.Add(translatorBin);
         }
-        // Forwarded by AppRun so the AppImage's bundled clang/lld (see prepare-portable-clang.sh)
-        // is used instead of local-build.sh's own default of whatever clang is on $PATH.
-        if (!string.IsNullOrEmpty(ccBin))
-        {
-            startInfo.ArgumentList.Add("--cc"); startInfo.ArgumentList.Add(ccBin);
-        }
-        if (!string.IsNullOrEmpty(cxxBin))
-        {
-            startInfo.ArgumentList.Add("--cxx"); startInfo.ArgumentList.Add(cxxBin);
-        }
-        if (!string.IsNullOrEmpty(fuseLd))
-        {
-            startInfo.ArgumentList.Add("--fuse-ld"); startInfo.ArgumentList.Add(fuseLd);
-        }
-        if (!string.IsNullOrEmpty(cmakeBin))
-        {
-            startInfo.ArgumentList.Add("--cmake"); startInfo.ArgumentList.Add(cmakeBin);
-        }
-        if (!string.IsNullOrEmpty(ninjaBin))
-        {
-            startInfo.ArgumentList.Add("--ninja"); startInfo.ArgumentList.Add(ninjaBin);
-        }
-        // Forwarded by AppRun so the AppImage's bundled precompiled aurora/third-party package (see
-        // Prepare-NativePrebuilt.sh) is used instead of local-build.sh compiling aurora-main itself.
-        if (!string.IsNullOrEmpty(nativePrebuiltDir))
+        if (macOS)
         {
-            startInfo.ArgumentList.Add("--native-prebuilt-dir"); startInfo.ArgumentList.Add(nativePrebuiltDir);
+            if (!string.IsNullOrEmpty(cmakeBin))
+            {
+                startInfo.ArgumentList.Add("--cmake"); startInfo.ArgumentList.Add(cmakeBin);
+            }
+            if (!string.IsNullOrEmpty(ninjaBin))
+            {
+                startInfo.ArgumentList.Add("--ninja"); startInfo.ArgumentList.Add(ninjaBin);
+            }
         }
-        if (!string.IsNullOrEmpty(sysroot))
+        else
         {
-            startInfo.ArgumentList.Add("--sysroot"); startInfo.ArgumentList.Add(sysroot);
+            // Forwarded by AppRun so the AppImage's bundled clang/lld (see prepare-portable-tools.sh)
+            // is used instead of local-build.sh's own default of whatever clang is on $PATH.
+            if (!string.IsNullOrEmpty(ccBin))
+            {
+                startInfo.ArgumentList.Add("--cc"); startInfo.ArgumentList.Add(ccBin);
+            }
+            if (!string.IsNullOrEmpty(cxxBin))
+            {
+                startInfo.ArgumentList.Add("--cxx"); startInfo.ArgumentList.Add(cxxBin);
+            }
+            if (!string.IsNullOrEmpty(fuseLd))
+            {
+                startInfo.ArgumentList.Add("--fuse-ld"); startInfo.ArgumentList.Add(fuseLd);
+            }
+            if (!string.IsNullOrEmpty(cmakeBin))
+            {
+                startInfo.ArgumentList.Add("--cmake"); startInfo.ArgumentList.Add(cmakeBin);
+            }
+            if (!string.IsNullOrEmpty(ninjaBin))
+            {
+                startInfo.ArgumentList.Add("--ninja"); startInfo.ArgumentList.Add(ninjaBin);
+            }
+            // Forwarded by AppRun so the AppImage's bundled precompiled aurora/third-party package
+            // is used instead of local-build.sh compiling aurora-main itself.
+            if (!string.IsNullOrEmpty(nativePrebuiltDir))
+            {
+                startInfo.ArgumentList.Add("--native-prebuilt-dir"); startInfo.ArgumentList.Add(nativePrebuiltDir);
+            }
+            if (!string.IsNullOrEmpty(sysroot))
+            {
+                startInfo.ArgumentList.Add("--sysroot"); startInfo.ArgumentList.Add(sysroot);
+            }
         }
 
         using var process = new Process { StartInfo = startInfo };
@@ -105,7 +122,7 @@ public static async Task RunAsync(
 
         if (process.ExitCode != 0)
         {
-            throw new InvalidOperationException($"local-build.sh failed (exit {process.ExitCode}). See diagnostics above.");
+            throw new InvalidOperationException($"{Path.GetFileName(script)} failed (exit {process.ExitCode}). See diagnostics above.");
         }
     }
 

Launcher/WiiCompiled.Setup.Linux/Models.cs

@@ -19,10 +19,13 @@ internal sealed class ProductInstallRecord
     public string DolSha256 { get; set; } = "";
     public string RelSha256 { get; set; } = "";
     public string BuiltUtc { get; set; } = "";
+    public string? RetroRewindDirectory { get; set; }
+    public bool UsesRetroWfcPayload { get; set; }
+    public string? CodePulSha256 { get; set; }
 }
 
 /// <summary>
-/// The whole flat state document this tool keeps at ~/.local/share/WiiCompiled/install-state.json.
+/// The whole flat per-user state document this tool keeps.
 /// Deliberately not a fingerprint tree: local-build.sh already does its own incremental-rebuild
 /// caching, so this only needs to remember where things were installed and what they were built
 /// against, not decide when to rebuild.