Skip to content

update to 0.16.0 #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Squibid wants to merge 1 commit into
base: main
Choose a base branch
from
+81 −77
Open

update to 0.16.0 #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
zig-out
zig-pkg
.zig-cache
129 changes: 65 additions & 64 deletions build.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ pub fn build(b: *std.Build) !void {
// default on APPLE targets
switch (target.result.os.tag) {
.macos => {
lib.linkSystemLibrary("iconv");
lib.root_module.linkSystemLibrary("iconv", .{});
features.addValues(.{
.GIT_USE_ICONV = 1,
.GIT_USE_STAT_MTIMESPEC = 1,
Expand Down Expand Up @@ -76,12 +76,13 @@ pub fn build(b: *std.Build) !void {
) orelse if (target.result.os.tag == .macos) .securetransport else .mbedtls;

if (target.result.os.tag == .windows) {
lib.linkSystemLibrary("winhttp");
lib.linkSystemLibrary("rpcrt4");
lib.linkSystemLibrary("crypt32");
lib.linkSystemLibrary("ole32");
lib.linkSystemLibrary("ws2_32");
lib.linkSystemLibrary("secur32");

lib.root_module.linkSystemLibrary("winhttp", .{});
lib.root_module.linkSystemLibrary("rpcrt4", .{});
lib.root_module.linkSystemLibrary("crypt32", .{});
lib.root_module.linkSystemLibrary("ole32", .{});
lib.root_module.linkSystemLibrary("ws2_32", .{});
lib.root_module.linkSystemLibrary("secur32", .{});

features.addValues(.{
.GIT_HTTPS = 1,
Expand All @@ -93,13 +94,13 @@ pub fn build(b: *std.Build) !void {
.GIT_IO_WSAPOLL = 1,
});

lib.addWin32ResourceFile(.{ .file = libgit_src.path("src/libgit2/git2.rc") });
lib.addCSourceFiles(.{ .root = libgit_root, .files = &util_win32_sources, .flags = &flags });
lib.root_module.addWin32ResourceFile(.{ .file = libgit_src.path("src/libgit2/git2.rc") });
lib.root_module.addCSourceFiles(.{ .root = libgit_root, .files = &util_win32_sources, .flags = &flags });
} else {
switch (tls_backend) {
.securetransport => {
lib.linkFramework("Security");
lib.linkFramework("CoreFoundation");
lib.root_module.linkFramework("Security", .{});
lib.root_module.linkFramework("CoreFoundation", .{});
features.addValues(.{
.GIT_HTTPS = 1,
.GIT_SECURE_TRANSPORT = 1,
Expand All @@ -117,7 +118,7 @@ pub fn build(b: *std.Build) !void {
.target = target,
.optimize = optimize,
});
if (tls_dep) |tls| lib.linkLibrary(tls.artifact("openssl"));
if (tls_dep) |tls| lib.root_module.linkLibrary(tls.artifact("openssl"));
features.addValues(.{
.GIT_HTTPS = 1,
.GIT_OPENSSL = 1,
Expand All @@ -135,7 +136,7 @@ pub fn build(b: *std.Build) !void {
.target = target,
.optimize = optimize,
});
if (tls_dep) |tls| lib.linkLibrary(tls.artifact("mbedtls"));
if (tls_dep) |tls| lib.root_module.linkLibrary(tls.artifact("mbedtls"));
features.addValues(.{
.GIT_HTTPS = 1,
.GIT_MBEDTLS = 1,
Expand All @@ -161,7 +162,7 @@ pub fn build(b: *std.Build) !void {
.link_libc = true,
}),
});
ntlm.addIncludePath(libgit_src.path("deps/ntlmclient"));
ntlm.root_module.addIncludePath(libgit_src.path("deps/ntlmclient"));
maybeAddTlsIncludes(ntlm, tls_dep, tls_backend);

const ntlm_cflags = .{
Expand All @@ -174,7 +175,7 @@ pub fn build(b: *std.Build) !void {
.securetransport => "-DCRYPT_COMMONCRYPTO",
},
};
ntlm.addCSourceFiles(.{
ntlm.root_module.addCSourceFiles(.{
.root = libgit_root,
.files = switch (tls_backend) {
.openssl => &.{"deps/ntlmclient/crypt_openssl.c"},
Expand All @@ -183,23 +184,23 @@ pub fn build(b: *std.Build) !void {
},
.flags = &ntlm_cflags,
});
ntlm.addCSourceFiles(.{
ntlm.root_module.addCSourceFiles(.{
.root = libgit_root,
.files = &ntlm_sources,
.flags = &(ntlm_cflags ++ .{"-Wno-deprecated"}),
});

lib.linkLibrary(ntlm);
lib.addAfterIncludePath(libgit_src.path("deps/ntlmclient")); // avoid aliasing ntlmclient/util.h and src/util/util.h
lib.root_module.linkLibrary(ntlm);
lib.root_module.addAfterIncludePath(libgit_src.path("deps/ntlmclient")); // avoid aliasing ntlmclient/util.h and src/util/util.h
features.addValues(.{ .GIT_NTLM = 1 });
}

lib.addCSourceFiles(.{
lib.root_module.addCSourceFiles(.{
.root = libgit_root,
.files = &util_unix_sources,
.flags = &flags,
});
lib.addCSourceFiles(.{
lib.root_module.addCSourceFiles(.{
.root = libgit_root,
.files = switch (tls_backend) {
.openssl => &.{"src/util/hash/openssl.c"},
Expand All @@ -211,7 +212,7 @@ pub fn build(b: *std.Build) !void {
}

// SHA1 collisiondetect
lib.addCSourceFiles(.{
lib.root_module.addCSourceFiles(.{
.root = libgit_root,
.files = &util_sha1dc_sources,
.flags = &(flags ++ .{
Expand All @@ -222,7 +223,7 @@ pub fn build(b: *std.Build) !void {
});

if (b.option(bool, "enable-ssh", "Enable SSH support") orelse false) {
lib.linkSystemLibrary("ssh2");
lib.root_module.linkSystemLibrary("ssh2", .{});
features.addValues(.{
.GIT_SSH = 1,
.GIT_SSH_LIBSSH2 = 1,
Expand All @@ -241,15 +242,15 @@ pub fn build(b: *std.Build) !void {
.link_libc = true,
}),
});
llhttp.addIncludePath(libgit_src.path("deps/llhttp"));
llhttp.addCSourceFiles(.{
llhttp.root_module.addIncludePath(libgit_src.path("deps/llhttp"));
llhttp.root_module.addCSourceFiles(.{
.root = libgit_root,
.files = &llhttp_sources,
.flags = &.{ "-Wno-unused-parameter", "-Wno-missing-declarations" },
});

lib.addIncludePath(libgit_src.path("deps/llhttp"));
lib.linkLibrary(llhttp);
lib.root_module.addIncludePath(libgit_src.path("deps/llhttp"));
lib.root_module.linkLibrary(llhttp);
features.addValues(.{ .GIT_HTTPPARSER_BUILTIN = 1 });
}
if (target.result.os.tag != .macos) {
Expand Down Expand Up @@ -277,8 +278,8 @@ pub fn build(b: *std.Build) !void {
.PCREGREP_BUFSIZE = null,
},
));
pcre.addIncludePath(libgit_src.path("deps/pcre"));
pcre.addCSourceFiles(.{
pcre.root_module.addIncludePath(libgit_src.path("deps/pcre"));
pcre.root_module.addCSourceFiles(.{
.root = libgit_root,
.files = &pcre_sources,
.flags = &.{
Expand All @@ -288,8 +289,8 @@ pub fn build(b: *std.Build) !void {
},
});

lib.addIncludePath(libgit_src.path("deps/pcre"));
lib.linkLibrary(pcre);
lib.root_module.addIncludePath(libgit_src.path("deps/pcre"));
lib.root_module.linkLibrary(pcre);
features.addValues(.{ .GIT_REGEX_BUILTIN = 1 });
}
{
Expand All @@ -303,8 +304,8 @@ pub fn build(b: *std.Build) !void {
.link_libc = true,
}),
});
zlib.addIncludePath(libgit_src.path("deps/zlib"));
zlib.addCSourceFiles(.{
zlib.root_module.addIncludePath(libgit_src.path("deps/zlib"));
zlib.root_module.addCSourceFiles(.{
.root = libgit_root,
.files = &zlib_sources,
.flags = &.{
Expand All @@ -318,20 +319,20 @@ pub fn build(b: *std.Build) !void {
},
});

lib.addIncludePath(libgit_src.path("deps/zlib"));
lib.linkLibrary(zlib);
lib.root_module.addIncludePath(libgit_src.path("deps/zlib"));
lib.root_module.linkLibrary(zlib);
features.addValues(.{ .GIT_COMPRESSION_ZLIB = 1 });
}
// xdiff
{
// Bundled xdiff dependency relies on libgit2 headers & utils, so we
// just add the source files directly instead of making a static lib step.
lib.addCSourceFiles(.{
lib.root_module.addCSourceFiles(.{
.root = libgit_root,
.files = &xdiff_sources,
.flags = &.{ "-Wno-sign-compare", "-Wno-unused-parameter" },
});
lib.addIncludePath(libgit_src.path("deps/xdiff"));
lib.root_module.addIncludePath(libgit_src.path("deps/xdiff"));
}

switch (target.result.ptrBitWidth()) {
Expand All @@ -340,14 +341,14 @@ pub fn build(b: *std.Build) !void {
else => |size| std.debug.panic("Unsupported architecture ({d}bit)", .{size}),
}

lib.addConfigHeader(features);
lib.root_module.addConfigHeader(features);

lib.addIncludePath(libgit_src.path("src/libgit2"));
lib.addIncludePath(libgit_src.path("src/util"));
lib.addIncludePath(libgit_src.path("include"));
lib.root_module.addIncludePath(libgit_src.path("src/libgit2"));
lib.root_module.addIncludePath(libgit_src.path("src/util"));
lib.root_module.addIncludePath(libgit_src.path("include"));

lib.addCSourceFiles(.{ .root = libgit_root, .files = &libgit_sources, .flags = &flags });
lib.addCSourceFiles(.{ .root = libgit_root, .files = &util_sources, .flags = &flags });
lib.root_module.addCSourceFiles(.{ .root = libgit_root, .files = &libgit_sources, .flags = &flags });
lib.root_module.addCSourceFiles(.{ .root = libgit_root, .files = &util_sources, .flags = &flags });

lib.installHeadersDirectory(libgit_src.path("include"), "", .{});
b.installArtifact(lib);
Expand All @@ -363,19 +364,19 @@ pub fn build(b: *std.Build) !void {
}),
});

cli.addConfigHeader(features);
cli.addIncludePath(libgit_src.path("src/util"));
cli.addIncludePath(libgit_src.path("src/cli"));
cli.root_module.addConfigHeader(features);
cli.root_module.addIncludePath(libgit_src.path("src/util"));
cli.root_module.addIncludePath(libgit_src.path("src/cli"));
maybeAddTlsIncludes(cli, tls_dep, tls_backend);

cli.linkLibrary(lib);
cli.addCSourceFiles(.{
cli.root_module.linkLibrary(lib);
cli.root_module.addCSourceFiles(.{
.root = libgit_root,
.files = &cli_sources,
// @Todo: see above
// .flags = &.{"-std=c90"},
});
cli.addCSourceFiles(.{
cli.root_module.addCSourceFiles(.{
.root = libgit_root,
.files = if (target.result.os.tag == .windows)
&.{"src/cli/win32/sighandler.c"}
Expand Down Expand Up @@ -404,8 +405,8 @@ pub fn build(b: *std.Build) !void {
}),
});

exe.addIncludePath(libgit_src.path("examples"));
exe.addCSourceFiles(.{
exe.root_module.addIncludePath(libgit_src.path("examples"));
exe.root_module.addCSourceFiles(.{
.root = libgit_root,
.files = &example_sources,
.flags = &.{
Expand All @@ -415,7 +416,7 @@ pub fn build(b: *std.Build) !void {
});

maybeAddTlsIncludes(exe, tls_dep, tls_backend);
exe.linkLibrary(lib);
exe.root_module.linkLibrary(lib);

// independent install step so you can easily access the binary
const examples_install = b.addInstallArtifact(exe, .{});
Expand Down Expand Up @@ -450,33 +451,33 @@ pub fn build(b: *std.Build) !void {
.link_libc = true,
}),
});
runner.addIncludePath(clar_suite);
runner.addIncludePath(clar_src);
runner.addIncludePath(libgit_src.path("tests/libgit2"));
runner.root_module.addIncludePath(clar_suite);
runner.root_module.addIncludePath(clar_src);
runner.root_module.addIncludePath(libgit_src.path("tests/libgit2"));

runner.addConfigHeader(features);
runner.addIncludePath(libgit_src.path("src/util"));
runner.addIncludePath(libgit_src.path("src/libgit2"));
runner.root_module.addConfigHeader(features);
runner.root_module.addIncludePath(libgit_src.path("src/util"));
runner.root_module.addIncludePath(libgit_src.path("src/libgit2"));

runner.addIncludePath(libgit_src.path("deps/zlib"));
runner.addIncludePath(libgit_src.path("deps/xdiff"));
runner.addIncludePath(libgit_src.path("deps/pcre"));
runner.root_module.addIncludePath(libgit_src.path("deps/zlib"));
runner.root_module.addIncludePath(libgit_src.path("deps/xdiff"));
runner.root_module.addIncludePath(libgit_src.path("deps/pcre"));
maybeAddTlsIncludes(runner, tls_dep, tls_backend);

runner.linkLibrary(lib);
runner.root_module.linkLibrary(lib);

const runner_flags = &.{
"-DCLAR_FIXTURE_PATH", // See clar_fix step below
"-DCLAR_TMPDIR=\"libgit2_tests\"",
"-DCLAR_WIN32_LONGPATHS",
"-DGIT_DEPRECATE_HARD",
};
runner.addCSourceFiles(.{
runner.root_module.addCSourceFiles(.{
.root = libgit_src.path("tests/libgit2/"),
.files = &libgit2_test_sources,
.flags = runner_flags,
});
runner.addCSourceFiles(.{
runner.root_module.addCSourceFiles(.{
.root = clar_src,
.files = &clar_sources,
.flags = runner_flags,
Expand Down Expand Up @@ -601,7 +602,7 @@ fn maybeAddTlsIncludes(
.openssl => "openssl",
.mbedtls => "mbedtls",
};
compile.addIncludePath(tls.artifact(name).getEmittedIncludeTree());
compile.root_module.addIncludePath(tls.artifact(name).getEmittedIncludeTree());
}
}

Expand Down
6 changes: 3 additions & 3 deletions build.zig.zon
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
.{
.name = .libgit2,
.version = "1.9.0",
.minimum_zig_version = "0.15.2",
.minimum_zig_version = "0.16.0",
.fingerprint = 0x7f0051374dea2cba,
.dependencies = .{
.libgit2 = .{
.url = "https://github.com/libgit2/libgit2/archive/refs/tags/v1.9.0.tar.gz",
.hash = "N-V-__8AAJbmLwHHxHDWkz0i6WIR6FpNe6tXSLzaPuWtvBBg",
},
.openssl = .{
.url = "git+https://github.com/allyourcodebase/openssl.git#cad7ccba47e42fa608ca655ec14ae33202df86e1",
.hash = "openssl-3.3.2-TC9C3Wa3ZACgB1hZbrLOQCK9XccIBaW_F3imFfIeYP06",
.url = "git+https://github.com/allyourcodebase/openssl.git#0ac677650d43eadf669067d050992118b13338d2",
.hash = "openssl-3.3.2-TC9C3Ze3ZABaKR5hc8KRnRPhTClKrKQKqTnXTUYkvmSR",
.lazy = true,
},
.mbedtls = .{
Expand Down
22 changes: 12 additions & 10 deletions build/ClarTestStep.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ pub fn create(owner: *std.Build, name: []const u8, runner: *Step.Compile) *ClarT
.makeFn = make,
}),
.runner = runner,
.args = .{},
.args = .empty,
};
runner.getEmittedBin().addStepDependencies(&clar.step);
return clar;
Expand Down Expand Up @@ -60,15 +60,17 @@ fn make(step: *Step, options: Step.MakeOptions) !void {
}

{
var child: std.process.Child = .init(argv_list.items, arena);
child.stdin_behavior = .Ignore;
child.stdout_behavior = .Pipe;
child.stderr_behavior = .Inherit;

try child.spawn();
var threaded: std.Io.Threaded = .init_single_threaded;
Copy link
Copy Markdown
Author

@Squibid Squibid Apr 15, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't see a way to get a std.Io from Build or Step, but there's a chance I could've missed something.

const io = threaded.io();
var child = try std.process.spawn(io, .{
.argv = argv_list.items,
.stdin = .ignore,
.stdout = .pipe,
.stderr = .inherit,
});

var reader_buf: [1024]u8 = undefined;
var file_reader = child.stdout.?.readerStreaming(&reader_buf);
var file_reader = child.stdout.?.readerStreaming(io, &reader_buf);
const r = &file_reader.interface;

var parser: TapParser = .default;
Expand Down Expand Up @@ -99,8 +101,8 @@ fn make(step: *Step, options: Step.MakeOptions) !void {
error.StreamTooLong => return error.TapLineTooLong,
}

const term = try child.wait();
try step.handleChildProcessTerm(term, null, argv_list.items);
const term = try child.wait(io);
try step.handleChildProcessTerm(term);
}

try step.writeManifestAndWatch(&man);
Expand Down