Unify build modes and outputs

Author: ItsMeSamey

README.md

@@ -109,13 +109,21 @@ Build release binaries for all supported targets:
 zig build build-all-targets
 ```
 
-Artifacts are written to `release/all-targets/` as `codex-manager-<os>-<arch>`.
+Artifacts are written to `zig-out/bin/` as `codex-manager-<os>-<arch>`.
 
 Target set depends on host OS:
 - Linux host: Linux + Windows targets
 - macOS host: macOS targets
 - Windows host: Windows targets
 
+To include macOS cross-builds from Linux, provide a macOS SDK path:
+
+```bash
+MACOS_SDK_ROOT=/path/to/MacOSX.sdk zig build build-all-targets
+```
+
+This is required because `zig-webui` links macOS frameworks (`Cocoa`, `WebKit`) for macOS targets.
+
 Binary output:
 
 - Linux/macOS: `zig-out/bin/codex-manager`

build-all-targets.sh

@@ -1,8 +1,40 @@
 const std = @import("std");
+const builtin = @import("builtin");
+
+fn addMatrixInstallCommand(
+    b: *std.Build,
+    step: *std.Build.Step,
+    target_triple: []const u8,
+    install_name: []const u8,
+    maybe_sysroot: ?[]const u8,
+) void {
+    var argv = std.ArrayList([]const u8).empty;
+    defer argv.deinit(b.allocator);
+
+    argv.appendSlice(b.allocator, &.{
+        "zig",
+        "build",
+        "install",
+        "--prefix",
+        "zig-out",
+        "-Doptimize=ReleaseFast",
+    }) catch @panic("OOM");
+
+    if (maybe_sysroot) |sysroot| {
+        argv.appendSlice(b.allocator, &.{ "--sysroot", sysroot }) catch @panic("OOM");
+    }
+
+    argv.append(b.allocator, b.fmt("-Dtarget={s}", .{target_triple})) catch @panic("OOM");
+    argv.append(b.allocator, b.fmt("-Dmatrix_name={s}", .{install_name})) catch @panic("OOM");
+
+    const cmd = b.addSystemCommand(argv.items);
+    step.dependOn(&cmd.step);
+}
 
 pub fn build(b: *std.Build) void {
     const target = b.standardTargetOptions(.{});
     const optimize = b.standardOptimizeOption(.{});
+    const matrix_name = b.option([]const u8, "matrix_name", "Override installed binary name");
 
     const frontend_install = b.addSystemCommand(&.{
         "bash",
@@ -58,7 +90,11 @@ pub fn build(b: *std.Build) void {
     });
     exe.step.dependOn(&frontend_build.step);
 
-    b.installArtifact(exe);
+    const install_artifact = b.addInstallArtifact(exe, .{
+        .dest_sub_path = matrix_name,
+        .pdb_dir = if (matrix_name == null) .default else .disabled,
+    });
+    b.getInstallStep().dependOn(&install_artifact.step);
 
     const dev_step = b.step("dev", "Build frontend and run Codex Manager in dev mode");
     const run_cmd = b.addRunArtifact(exe);
@@ -80,14 +116,93 @@ pub fn build(b: *std.Build) void {
     const test_step = b.step("test", "Run backend Zig tests");
     test_step.dependOn(&run_backend_tests.step);
 
-    const build_all_targets_cmd = b.addSystemCommand(&.{
-        "bash",
-        "-lc",
-        "./build-all-targets.sh",
-    });
     const build_all_targets_step = b.step(
         "build-all-targets",
-        "Compile release binaries for all supported targets",
+        "Compile release binaries for supported target matrix into zig-out/bin",
     );
-    build_all_targets_step.dependOn(&build_all_targets_cmd.step);
+
+    switch (builtin.os.tag) {
+        .linux => {
+            addMatrixInstallCommand(
+                b,
+                build_all_targets_step,
+                "x86_64-linux-gnu",
+                "codex-manager-linux-x86_64",
+                null,
+            );
+            addMatrixInstallCommand(
+                b,
+                build_all_targets_step,
+                "aarch64-linux-gnu",
+                "codex-manager-linux-aarch64",
+                null,
+            );
+            addMatrixInstallCommand(
+                b,
+                build_all_targets_step,
+                "x86_64-windows-gnu",
+                "codex-manager-windows-x86_64",
+                null,
+            );
+            addMatrixInstallCommand(
+                b,
+                build_all_targets_step,
+                "aarch64-windows-gnu",
+                "codex-manager-windows-aarch64",
+                null,
+            );
+
+            if (b.graph.env_map.get("MACOS_SDK_ROOT")) |macos_sdk_root| {
+                if (macos_sdk_root.len > 0) {
+                    addMatrixInstallCommand(
+                        b,
+                        build_all_targets_step,
+                        "x86_64-macos",
+                        "codex-manager-macos-x86_64",
+                        macos_sdk_root,
+                    );
+                    addMatrixInstallCommand(
+                        b,
+                        build_all_targets_step,
+                        "aarch64-macos",
+                        "codex-manager-macos-aarch64",
+                        macos_sdk_root,
+                    );
+                }
+            }
+        },
+        .macos => {
+            addMatrixInstallCommand(
+                b,
+                build_all_targets_step,
+                "x86_64-macos",
+                "codex-manager-macos-x86_64",
+                null,
+            );
+            addMatrixInstallCommand(
+                b,
+                build_all_targets_step,
+                "aarch64-macos",
+                "codex-manager-macos-aarch64",
+                null,
+            );
+        },
+        .windows => {
+            addMatrixInstallCommand(
+                b,
+                build_all_targets_step,
+                "x86_64-windows-gnu",
+                "codex-manager-windows-x86_64",
+                null,
+            );
+            addMatrixInstallCommand(
+                b,
+                build_all_targets_step,
+                "aarch64-windows-gnu",
+                "codex-manager-windows-aarch64",
+                null,
+            );
+        },
+        else => {},
+    }
 }

build.zig

@@ -12,7 +12,6 @@
     .paths = .{
         "build.zig",
         "build.zig.zon",
-        "build-all-targets.sh",
         "main.zig",
         "frontend",
         "src",