feat: port to zig-0.16.0 and update flow-syntax and flow-themes

This commit is contained in:
CJ van den Berg 2026-04-16 21:40:27 +02:00
parent a62e5f7d5d
commit 720bc9bc5b
Signed by: neurocyte
GPG key ID: 8EB1E1BB660E3FB9
6 changed files with 153 additions and 138 deletions

View file

@ -51,11 +51,11 @@ fn build_release(
};
const optimize = .ReleaseFast;
var version = std.ArrayList(u8).init(b.allocator);
var version: std.Io.Writer.Allocating = .init(b.allocator);
defer version.deinit();
gen_version(b, version.writer()) catch unreachable;
gen_version(b, &version.writer) catch unreachable;
const write_file_step = b.addWriteFiles();
const version_file = write_file_step.add("version", version.items);
const version_file = write_file_step.add("version", version.written());
b.getInstallStep().dependOn(&b.addInstallFile(version_file, "version").step);
for (targets) |t| {
@ -97,10 +97,12 @@ pub fn build_exe(
const exe = b.addExecutable(.{
.name = "zat",
.root_source_file = b.path("src/main.zig"),
.target = target,
.optimize = optimize,
.strip = strip,
.root_module = b.createModule(.{
.root_source_file = b.path("src/main.zig"),
.target = target,
.optimize = optimize,
.strip = strip,
}),
});
if (pie) |value| exe.pie = value;
exe.root_module.addImport("syntax", syntax_dep.module("syntax"));
@ -118,13 +120,13 @@ pub fn build_exe(
run_step.dependOn(&run_cmd.step);
}
fn gen_version(b: *std.Build, writer: anytype) !void {
fn gen_version(b: *std.Build, writer: *std.Io.Writer) !void {
var code: u8 = 0;
const describe = try b.runAllowFail(&[_][]const u8{ "git", "describe", "--always", "--tags" }, &code, .Ignore);
const diff_ = try b.runAllowFail(&[_][]const u8{ "git", "diff", "--stat", "--patch", "HEAD" }, &code, .Ignore);
const diff = std.mem.trimRight(u8, diff_, "\r\n ");
const version = std.mem.trimRight(u8, describe, "\r\n ");
const describe = try b.runAllowFail(&[_][]const u8{ "git", "describe", "--always", "--tags" }, &code, .ignore);
const diff_ = try b.runAllowFail(&[_][]const u8{ "git", "diff", "--stat", "--patch", "HEAD" }, &code, .ignore);
const diff = std.mem.trimEnd(u8, diff_, "\r\n ");
const version = std.mem.trimEnd(u8, describe, "\r\n ");
try writer.print("{s}{s}", .{ version, if (diff.len > 0) "-dirty" else "" });
}