pkg/apple-sdk: do not git clone anymore

pkg/apple-sdk/build.zig

@@ -3,139 +3,11 @@ const std = @import("std");
 pub fn build(b: *std.Build) !void {
     const target = b.standardTargetOptions(.{});
     const optimize = b.standardOptimizeOption(.{});
-
+    _ = target;
-    const lib = b.addStaticLibrary(.{
+    _ = optimize;
-        .name = "stub",
-        .target = target,
-        .optimize = optimize,
-    });
-    lib.linkLibC();
-    lib.addCSourceFiles(&.{"stub.c"}, &.{});
-    try addPaths(b, lib);
-
-    b.installArtifact(lib);
 }
 
-/// Add the necessary paths to the given compilation step for the Xcode SDK.
-///
-/// This is required to workaround a Zig issue where we can't depend directly
-/// on the hexops/xcode-frameworks repository: https://github.com/ziglang/zig/pull/15382
-///
-/// This is copied and adapted from hexops/mach. I modified it slightly
-/// for my own personal taste (nothing wrong with theirs!), but the logic
-/// is effectively identical.
 pub fn addPaths(b: *std.Build, step: *std.build.CompileStep) !void {
-    // branch: mach
+    _ = b;
-    try ensureGitRepoCloned(
+    @import("macos_sdk").addPaths(step);
-        b.allocator,
-        // WARNING: forked temporarily for https://github.com/hexops/xcode-frameworks/issues/4
-        "https://github.com/mitchellh/xcode-frameworks",
-        "983deb1ab8d03861db30ea297cc78e6d121da4db",
-        xSdkPath("/zig-cache/xcode_frameworks"),
-    );
-
-    // https://github.com/ziglang/zig/issues/17358
-    if (step.target.isNative()) b.sysroot = xSdkPath("/zig-cache/xcode_frameworks");
-
-    step.addSystemFrameworkPath(.{ .path = xSdkPath("/zig-cache/xcode_frameworks/Frameworks") });
-    step.addSystemIncludePath(.{ .path = xSdkPath("/zig-cache/xcode_frameworks/include") });
-    step.addLibraryPath(.{ .path = xSdkPath("/zig-cache/xcode_frameworks/lib") });
-}
-
-fn ensureGitRepoCloned(
-    allocator: std.mem.Allocator,
-    clone_url: []const u8,
-    revision: []const u8,
-    dir: []const u8,
-) !void {
-    if (envVarIsTruthy(allocator, "NO_ENSURE_SUBMODULES") or
-        envVarIsTruthy(allocator, "NO_ENSURE_GIT")) return;
-
-    ensureGit(allocator);
-
-    if (std.fs.openDirAbsolute(dir, .{})) |_| {
-        const current_revision = try currentGitRevision(allocator, dir);
-        if (!std.mem.eql(u8, current_revision, revision)) {
-            // Reset to the desired revision
-            exec(
-                allocator,
-                &[_][]const u8{ "git", "fetch" },
-                dir,
-            ) catch |err| std.debug.print(
-                "warning: failed to 'git fetch' in {s}: {s}\n",
-                .{ dir, @errorName(err) },
-            );
-            try exec(allocator, &[_][]const u8{ "git", "checkout", "--quiet", "--force", revision }, dir);
-            try exec(allocator, &[_][]const u8{ "git", "submodule", "update", "--init", "--recursive" }, dir);
-        }
-        return;
-    } else |err| return switch (err) {
-        error.FileNotFound => {
-            std.log.info("cloning required dependency..\ngit clone {s} {s}..\n", .{ clone_url, dir });
-            try exec(allocator, &[_][]const u8{ "git", "clone", "-c", "core.longpaths=true", clone_url, dir }, ".");
-            try exec(allocator, &[_][]const u8{ "git", "checkout", "--quiet", "--force", revision }, dir);
-            try exec(allocator, &[_][]const u8{ "git", "submodule", "update", "--init", "--recursive" }, dir);
-            return;
-        },
-        else => err,
-    };
-}
-
-fn exec(
-    allocator: std.mem.Allocator,
-    argv: []const []const u8,
-    cwd: []const u8,
-) !void {
-    var child = std.ChildProcess.init(argv, allocator);
-    child.cwd = cwd;
-    _ = try child.spawnAndWait();
-}
-
-fn currentGitRevision(allocator: std.mem.Allocator, cwd: []const u8) ![]const u8 {
-    const result = try std.ChildProcess.exec(.{
-        .allocator = allocator,
-        .argv = &.{ "git", "rev-parse", "HEAD" },
-        .cwd = cwd,
-    });
-    allocator.free(result.stderr);
-    if (result.stdout.len > 0) return result.stdout[0 .. result.stdout.len - 1]; // trim newline
-    return result.stdout;
-}
-
-fn ensureGit(allocator: std.mem.Allocator) void {
-    const argv = &[_][]const u8{ "git", "--version" };
-    const result = std.ChildProcess.exec(.{
-        .allocator = allocator,
-        .argv = argv,
-        .cwd = ".",
-    }) catch { // e.g. FileNotFound
-        std.log.err("mach: error: 'git --version' failed. Is git not installed?", .{});
-        std.process.exit(1);
-    };
-    defer {
-        allocator.free(result.stderr);
-        allocator.free(result.stdout);
-    }
-    if (result.term.Exited != 0) {
-        std.log.err("mach: error: 'git --version' failed. Is git not installed?", .{});
-        std.process.exit(1);
-    }
-}
-
-fn envVarIsTruthy(allocator: std.mem.Allocator, name: []const u8) bool {
-    if (std.process.getEnvVarOwned(allocator, name)) |truthy| {
-        defer allocator.free(truthy);
-        if (std.mem.eql(u8, truthy, "true")) return true;
-        return false;
-    } else |_| {
-        return false;
-    }
-}
-
-fn xSdkPath(comptime suffix: []const u8) []const u8 {
-    if (suffix[0] != '/') @compileError("suffix must be an absolute path");
-    return comptime blk: {
-        const root_dir = std.fs.path.dirname(@src().file) orelse ".";
-        break :blk root_dir ++ suffix;
-    };
 }

pkg/apple-sdk/build.zig.zon

@@ -0,0 +1,10 @@
+.{
+    .name = "apple-sdk",
+    .version = "0.1.0",
+    .dependencies = .{
+        .macos_sdk = .{
+            .url = "https://github.com/mitchellh/zig-build-macos-sdk/archive/166ff65bb7688c0a08c4ea98166ec8300aa34128.tar.gz",
+            .hash = "1220bfe1b32491a3448dff55c1dc0c12aa573f1e5bdb0a962bfbadaaa59e4833798b",
+        },
+    },
+}

pkg/apple-sdk/stub.c

@@ -1 +0,0 @@
-// Blank on purpose