zig/mach
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

glfw: move git check

Browse source
This commit is contained in:
d3m1gd 2022-05-29 19:39:31 +07:00 • committed by Stephen Gutekanst
parent 866acd5535
commit 25022a1471
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
glfw/system_sdk.zig
View file

@ -201,6 +201,8 @@ fn determineSdkRoot(allocator: std.mem.Allocator, org: []const u8, name: []const
else => |e| return e, else => |e| return e,
} }
ensureGit(allocator);
// If the SDK exists, return it. Otherwise, clone it. // If the SDK exists, return it. Otherwise, clone it.
if (std.fs.openDirAbsolute(sdk_root_dir, .{})) { if (std.fs.openDirAbsolute(sdk_root_dir, .{})) {
const current_revision = try getCurrentGitRevision(allocator, sdk_root_dir); const current_revision = try getCurrentGitRevision(allocator, sdk_root_dir);
@ -216,7 +218,6 @@ fn determineSdkRoot(allocator: std.mem.Allocator, org: []const u8, name: []const
return sdk_root_dir; return sdk_root_dir;
} else |err| return switch (err) { } else |err| return switch (err) {
error.FileNotFound => { error.FileNotFound => {
ensureGit(allocator);
std.log.info("cloning required sdk..\ngit clone https://github.com/{s}/{s} '{s}'..\n", .{ org, name, sdk_root_dir }); std.log.info("cloning required sdk..\ngit clone https://github.com/{s}/{s} '{s}'..\n", .{ org, name, sdk_root_dir });
if (std.mem.startsWith(u8, name, "sdk-macos-")) { if (std.mem.startsWith(u8, name, "sdk-macos-")) {
if (!try confirmAppleSDKAgreement(allocator)) @panic("cannot continue"); if (!try confirmAppleSDKAgreement(allocator)) @panic("cannot continue");