summaryrefslogtreecommitdiff
path: root/build.zig
diff options
context:
space:
mode:
authorGabriel Schneider <[email protected]>2026-10-22 09:50:43 -0300
committerGabriel Schneider <[email protected]>2026-10-22 10:03:24 -0300
commita8b457a306a4442975210bcac3f04b56513c61c3 (patch)
tree6e2026ecb15da2fb919a0202f5d8b38e3b36a595 /build.zig
parenta8a1499bdffffc5b6919e24ec957e92fabaf003b (diff)
parent7e9d2c4169245072265b483ffaa6aa05f23f08d3 (diff)
downloadpardes-a8b457a306a4442975210bcac3f04b56513c61c3.tar.gz
pardes-a8b457a306a4442975210bcac3f04b56513c61c3.zip
Merge: Def/Refs, the diff viewer, Helix n/N, Callstack, Zig 0.17, Window mode and the terminal cwd fix onto 0.24
The docs keep both sides: 0.24's Ctrl-i fallbacks and typed ls with this line's Window mode, raw Esc and Helix n/N wording. The CHANGELOG's unreleased entries go above 0.24, Def/Refs and the context rows among them. cheatsheet-a4.pdf rendered again; .scratch/ ignored. Co-Authored-By: Claude Opus 5.5 <[email protected]>
Diffstat (limited to 'build.zig')
-rw-r--r--build.zig304
1 files changed, 139 insertions, 165 deletions
diff --git a/build.zig b/build.zig
index 0246d55f..ca7b26af 100644
--- a/build.zig
+++ b/build.zig
@@ -39,10 +39,13 @@ pub const macos_min_version: std.SemanticVersion = .{ .major = 13, .minor = 0, .
pub const TreeSitterGrammars = enum { disabled, zig, minimal, full };
const gui_shaders = [_][]const u8{
- "ui.vert", "ui.frag",
+ "ui.vert",
+ "ui.frag",
"decor.frag",
- "overlay.vert", "overlay.frag",
- "image.vert", "image.frag",
+ "overlay.vert",
+ "overlay.frag",
+ "image.vert",
+ "image.frag",
"post.vert",
// The bundled post passes: shaders/post/<name>.glsl behind the
// Shadertoy prefix (shaderSource).
@@ -59,13 +62,14 @@ pub fn build(b: *std.Build) void {
const requested_platform = b.option(Platform, "platform", "which shell to build (tty, gui, web, macos, esp32p4); absent builds the tty cli and the SDL gui together");
const platform = requested_platform orelse .tty;
const also_gui = requested_platform == null;
- const home_install = also_gui and prefixIsUntouched(b);
- if (home_install) {
- if (b.graph.environ_map.get("HOME")) |home| {
- b.resolveInstallPrefix(b.pathJoin(&.{ home, ".local" }), .{});
- std.debug.print("pardes: installing into {s} (override with --prefix)\n", .{b.install_prefix});
- }
- }
+ // A bare `zig build` also copies the binaries into ~/.local/bin. Zig
+ // 0.17 keeps the prefix in the maker process, out of this script's
+ // reach, so `--prefix` no longer turns it off: -Dhome-install=false does.
+ const home_bin: ?[]const u8 = if (also_gui and (b.option(bool, "home-install", "a bare `zig build` also copies the binaries into ~/.local/bin (default: true)") orelse true))
+ if (b.graph.environ_map.get("HOME")) |home| b.pathJoin(&.{ home, ".local", "bin" }) else null
+ else
+ null;
+ const home_install = home_bin != null;
const esp32p4_target: std.Target.Query = .{
.cpu_arch = .riscv32,
.os_tag = .freestanding,
@@ -114,18 +118,18 @@ pub fn build(b: *std.Build) void {
const is_web_target = target.result.cpu.arch == .wasm32 and target.result.os.tag == .freestanding;
const is_esp32p4_target = target.result.cpu.arch == .riscv32 and target.result.os.tag == .freestanding;
const optimize = if (is_web)
- .ReleaseSmall
- else if (is_esp32p4_target and requested_optimize == .Debug)
- .ReleaseFast
+ .small
+ else if (is_esp32p4_target and requested_optimize == .debug)
+ .fast
else
requested_optimize;
const test_build = b.step("test-build", "compile unit-test programs without running them");
const doc_typ_opts = b.addOptions();
- doc_typ_opts.addOption([]const u8, "dir", b.pathFromRoot("docs/typ"));
+ doc_typ_opts.addOptionPathUntracked("dir", b.path("docs/typ"));
// The docs (docs/typ, docs/site): each output is one typst run, and each
// reads docs/typ/builtins-*.json; `builtins-json` refreshes this build's from the
// registry first (the tool is wired below, once the core module is).
- const typst_bin: ?[]const u8 = b.findProgram(&.{"typst"}, &.{}) catch null;
+ const typst_bin: ?[]const u8 = b.findProgram(.{ .names = &.{"typst"} });
var doc_renders: [3]?*std.Build.Step.Run = @splat(null);
const cheatsheet_step = b.step("cheatsheet", "render docs/typ/cheatsheet-a4.typ to <prefix>/share/doc/pardes/cheatsheet.pdf (needs typst)");
const book_step = b.step("book", "render docs/typ/book.typ to <prefix>/share/doc/pardes/pardes.pdf (needs typst)");
@@ -139,11 +143,13 @@ pub fn build(b: *std.Build) void {
sheet.addFileArg(b.path("docs/typ/cheatsheet-a4.typ"));
sheet.has_side_effects = true;
cheatsheet_step.dependOn(&b.addInstallFile(sheet.addOutputFileArg("cheatsheet.pdf"), "share/doc/pardes/cheatsheet.pdf").step);
- const book = b.addSystemCommand(&.{ typst, "compile", "--ignore-system-fonts", "--root", b.pathFromRoot(".") });
+ const book = b.addSystemCommand(&.{ typst, "compile", "--ignore-system-fonts", "--root", "." });
+ book.setCwd(b.path("."));
book.addFileArg(b.path("docs/typ/book.typ"));
book.has_side_effects = true;
book_step.dependOn(&b.addInstallFile(book.addOutputFileArg("pardes.pdf"), "share/doc/pardes/pardes.pdf").step);
- const site = b.addSystemCommand(&.{ typst, "compile", "--format", "bundle", "--features", "bundle,html", "--root", b.pathFromRoot(".") });
+ const site = b.addSystemCommand(&.{ typst, "compile", "--format", "bundle", "--features", "bundle,html", "--root", "." });
+ site.setCwd(b.path("."));
site.addFileArg(b.path("docs/site/site.typ"));
const site_dir = site.addOutputDirectoryArg("site");
site.has_side_effects = true;
@@ -168,7 +174,7 @@ pub fn build(b: *std.Build) void {
.root_source_file = b.path("test/unit_profile.zig"),
}),
});
- const c_optimize: std.builtin.OptimizeMode = if (optimize == .Debug) .ReleaseFast else optimize;
+ const c_optimize: std.lang.Optimize = if (optimize == .debug) .fast else optimize;
const default_grammars: TreeSitterGrammars = if (is_web) .zig else if (is_esp32p4) .disabled else .full;
const requested_grammars = b.option(TreeSitterGrammars, "tree-sitter", "tree-sitter grammar set: disabled, zig, minimal (c/c++/zig), full");
const tree_sitter_grammars = requested_grammars orelse default_grammars;
@@ -321,7 +327,7 @@ pub fn build(b: *std.Build) void {
.name = "pardes-gen-themes",
.root_module = b.createModule(.{
.target = b.graph.host,
- .optimize = .Debug,
+ .optimize = .debug,
.root_source_file = b.path("tools/gen_themes.zig"),
}),
});
@@ -353,7 +359,7 @@ pub fn build(b: *std.Build) void {
// `pardes <version>` alone, like a tarball build; -Dstamp-commit=true
// stamps one anyway.
const stamp_commit = b.option(bool, "stamp-commit", "embed the git commit in --version and crash records (default: release builds and the ~/.local install)") orelse
- (optimize != .Debug or home_install);
+ (optimize != .debug or home_install);
const shell_cfg: ShellConfig = .{
.tree_sitter_grammars = tree_sitter_grammars,
.tracy = tracy != null,
@@ -391,9 +397,7 @@ pub fn build(b: *std.Build) void {
if (tree_sitter_grammars != .disabled) {
const tree_sitter_mod = b.dependency("tree_sitter", .{ .target = target, .optimize = c_optimize }).module("tree_sitter");
if (is_web) {
- const web_libc_include: std.Build.LazyPath = .{
- .cwd_relative = b.path("src/web/libc/include").getPath(b),
- };
+ const web_libc_include = b.path("src/web/libc/include");
for (tree_sitter_mod.link_objects.items) |link_object| switch (link_object) {
.other_step => |lib| {
lib.root_module.link_libc = false;
@@ -417,12 +421,11 @@ pub fn build(b: *std.Build) void {
(tree_sitter_grammars == .zig and g.tier == .zig))
{
const dep = b.dependency(g.dep, .{});
- const query_path = dep.path(g.query);
- const query = std.Io.Dir.cwd().readFileAlloc(io, query_path.getPath(b), b.allocator, .limited(0x100000)) catch @panic("read " ++ g.name ++ " highlights");
+ const query = configureRead(b, io, dep.builder.root, g.query, 0x100000) catch @panic("read " ++ g.name ++ " highlights");
ts_queries.addOption([]const u8, g.name ++ "_highlights", query);
// helix's textobject queries, vendored (vendor/queries); a
// grammar without one gets none
- const objects = std.Io.Dir.cwd().readFileAlloc(io, b.pathFromRoot("vendor/queries/" ++ g.name ++ "/textobjects.scm"), b.allocator, .limited(0x100000)) catch "";
+ const objects = configureRead(b, io, b.root, "vendor/queries/" ++ g.name ++ "/textobjects.scm", 0x100000) catch "";
ts_queries.addOption([]const u8, g.name ++ "_textobjects", objects);
const lib = b.addLibrary(.{
@@ -438,8 +441,9 @@ pub fn build(b: *std.Build) void {
const ts_cflags = [_][]const u8{
"-fno-sanitize=function",
"-DTREE_SITTER_REUSE_ALLOCATOR",
+ // Relative to the build root, the compiler's working directory.
"-include",
- b.path("src/tree_sitter_heap.h").getPath(b),
+ "src/tree_sitter_heap.h",
};
lib.root_module.addCSourceFile(.{ .file = dep.path(g.src ++ "/parser.c"), .flags = &ts_cflags });
if (g.scanner) lib.root_module.addCSourceFile(.{ .file = dep.path(g.src ++ "/scanner.c"), .flags = &ts_cflags });
@@ -467,7 +471,7 @@ pub fn build(b: *std.Build) void {
// (src/regexp.zig). A bump that moves the anchor stops the build.
const mvzr_mod = mvzr: {
const dep = b.dependency("mvzr", .{ .target = target, .optimize = optimize });
- const src = std.Io.Dir.cwd().readFileAlloc(io, dep.path("src/mvzr.zig").getPath(b), b.allocator, .limited(1 << 20)) catch @panic("read mvzr");
+ const src = configureRead(b, io, dep.builder.root, "src/mvzr.zig", 1 << 20) catch @panic("read mvzr");
const anchor = "fn matchPattern(patt: []const RegOp, sets: []const CharSet, haystack: []const u8, i_in: usize) ?OpMatch {\n";
const at = (std.mem.indexOf(u8, src, anchor) orelse @panic("mvzr's matchPattern changed: redo its step budget in build.zig")) + anchor.len;
const spend =
@@ -536,7 +540,17 @@ pub fn build(b: *std.Build) void {
\\
;
if (std.mem.count(u8, backed, end_anchor) != 1) @panic("mvzr's parser changed: redo its `$` before `|` in build.zig");
- const patched = std.mem.replaceOwned(u8, b.allocator, backed, end_anchor, end_before_alt) catch @panic("OOM");
+ var patched = std.mem.replaceOwned(u8, b.allocator, backed, end_anchor, end_before_alt) catch @panic("OOM");
+ // Zig 0.17 removed `**`; mvzr still has it (its PR #16 replaces it upstream).
+ for ([_][3][]const u8{
+ .{ "[1]RegOp{.{ .unused = {} }} ** ops", "@splat(.{ .unused = {} })", "1" },
+ .{ "[1]CharSet{.{ .low = 0, .hi = 0 }} ** char_sets", "@splat(.{ .low = 0, .hi = 0 })", "1" },
+ .{ "\"a\" ** 2048", "&@as([2048]u8, @splat('a'))", "2" },
+ .{ "\"12345,\" ** 255", "std.mem.asBytes(&@as([255][6]u8, @splat(\"12345,\".*)))", "1" },
+ }) |edit| {
+ if (std.mem.count(u8, patched, edit[0]) != std.fmt.parseInt(usize, edit[2], 10) catch unreachable) std.debug.panic("mvzr changed at `{s}`: redo its `**` patch in build.zig", .{edit[0]});
+ patched = std.mem.replaceOwned(u8, b.allocator, patched, edit[0], edit[1]) catch @panic("OOM");
+ }
break :mvzr b.createModule(.{ .root_source_file = b.addWriteFiles().add("mvzr.zig", patched), .target = target, .optimize = optimize });
};
@@ -582,6 +596,7 @@ pub fn build(b: *std.Build) void {
});
mupdf.linkTo(mupdf_mod);
mupdf_mod.addImport("c_heap", c_heap_mod);
+ mupdf_mod.addImport("pdf_c", b.addTranslateC(.{ .root_source_file = b.path("src/pdf_bridge.h"), .target = target, .optimize = optimize }).createModule());
mupdf_mod.addIncludePath(b.path("src"));
mupdf_mod.addCSourceFile(.{
.file = b.path("src/pdf_bridge.c"),
@@ -599,12 +614,13 @@ pub fn build(b: *std.Build) void {
const pdf_bench_mod = b.createModule(.{
.target = target,
- .optimize = .ReleaseFast,
+ .optimize = .fast,
.root_source_file = b.path("src/pdf.zig"),
.link_libc = true,
});
mupdf.linkTo(pdf_bench_mod);
pdf_bench_mod.addImport("c_heap", c_heap_mod);
+ pdf_bench_mod.addImport("pdf_c", b.addTranslateC(.{ .root_source_file = b.path("src/pdf_bridge.h"), .target = target, .optimize = .fast }).createModule());
pdf_bench_mod.addIncludePath(b.path("src"));
pdf_bench_mod.addCSourceFile(.{
.file = b.path("src/pdf_bridge.c"),
@@ -614,14 +630,14 @@ pub fn build(b: *std.Build) void {
.name = "pardes-pdf-bench",
.root_module = b.createModule(.{
.target = target,
- .optimize = .ReleaseFast,
+ .optimize = .fast,
.root_source_file = b.path("test/pdf_bench.zig"),
.link_libc = true,
}),
});
pdf_bench.root_module.addImport("mupdf", pdf_bench_mod);
const run_pdf_bench = b.addRunArtifact(pdf_bench);
- if (b.args) |args| run_pdf_bench.addArgs(args);
+ run_pdf_bench.addPassthruArgs();
run_pdf_bench.setCwd(b.path("."));
pdf_bench_step.dependOn(&run_pdf_bench.step);
@@ -629,7 +645,7 @@ pub fn build(b: *std.Build) void {
.name = "pardes-pdf-sections-bench",
.root_module = b.createModule(.{
.target = target,
- .optimize = .ReleaseFast,
+ .optimize = .fast,
.root_source_file = b.path("test/pdf_sections_bench.zig"),
.link_libc = true,
}),
@@ -637,10 +653,10 @@ pub fn build(b: *std.Build) void {
pdf_sections_bench.root_module.addImport("pardes", core_module);
pdf_sections_bench.root_module.addImport("mupdf", mupdf_mod);
const sections_bench_opts = b.addOptions();
- sections_bench_opts.addOption(bool, "release_fast_core", optimize == .ReleaseFast);
+ sections_bench_opts.addOption(bool, "release_fast_core", optimize == .fast);
pdf_sections_bench.root_module.addOptions("pdf_sections_bench_config", sections_bench_opts);
const run_pdf_sections_bench = b.addRunArtifact(pdf_sections_bench);
- if (b.args) |args| run_pdf_sections_bench.addArgs(args);
+ run_pdf_sections_bench.addPassthruArgs();
run_pdf_sections_bench.setCwd(b.path("."));
pdf_sections_bench_step.dependOn(&run_pdf_sections_bench.step);
@@ -648,7 +664,7 @@ pub fn build(b: *std.Build) void {
.name = "pardes-pdf-pointer-bench",
.root_module = b.createModule(.{
.target = target,
- .optimize = .ReleaseFast,
+ .optimize = .fast,
.root_source_file = b.path("test/pdf_pointer_bench.zig"),
.link_libc = true,
}),
@@ -656,7 +672,7 @@ pub fn build(b: *std.Build) void {
pdf_pointer_bench.root_module.addImport("pardes", core_module);
pdf_pointer_bench.root_module.addImport("mupdf", mupdf_mod);
const run_pdf_pointer_bench = b.addRunArtifact(pdf_pointer_bench);
- if (b.args) |args| run_pdf_pointer_bench.addArgs(args);
+ run_pdf_pointer_bench.addPassthruArgs();
run_pdf_pointer_bench.setCwd(b.path("."));
pdf_pointer_bench_step.dependOn(&run_pdf_pointer_bench.step);
@@ -672,11 +688,11 @@ pub fn build(b: *std.Build) void {
pdf_scroll_bench.root_module.addImport("pardes", core_module);
pdf_scroll_bench.root_module.addImport("mupdf", mupdf_mod);
const scroll_bench_opts = b.addOptions();
- scroll_bench_opts.addOption(bool, "release_fast_core", optimize == .ReleaseFast);
+ scroll_bench_opts.addOption(bool, "release_fast_core", optimize == .fast);
scroll_bench_opts.addOption([]const u8, "core_optimize", @tagName(optimize));
pdf_scroll_bench.root_module.addOptions("pdf_scroll_bench_config", scroll_bench_opts);
const run_pdf_scroll_bench = b.addRunArtifact(pdf_scroll_bench);
- if (b.args) |args| run_pdf_scroll_bench.addArgs(args);
+ run_pdf_scroll_bench.addPassthruArgs();
run_pdf_scroll_bench.setCwd(b.path("."));
pdf_scroll_bench_step.dependOn(&run_pdf_scroll_bench.step);
}
@@ -712,15 +728,13 @@ pub fn build(b: *std.Build) void {
// - An X10 mouse report and a kitty graphics reply cut short by a read
// wait for their rest: the first became three bytes of text, the
// second sliced past its input.
- // - A malformed color or clipboard reply is dropped instead of failing
- // the parse, which stopped input; so is a byte no UTF-8 starts with.
- // - An OSC reply ends at its first terminator: one ended by BEL ran on to
- // the next sequence's ESC and left what lay between as text.
+ // - A byte no UTF-8 starts with is dropped instead of failing the parse,
+ // which stopped input. (vaxis itself now drops a malformed color or
+ // clipboard reply and ends an OSC at its first terminator.)
// - A device report's fields are sought in the sequence, not past it.
// A bump that moves an anchor stops the build.
{
- const parser_path = vaxis_dep.path("src/Parser.zig").getPath(b);
- var src = std.Io.Dir.cwd().readFileAlloc(io, parser_path, b.allocator, .limited(1 << 20)) catch @panic("read vaxis Parser.zig");
+ var src = configureRead(b, io, vaxis_dep.builder.root, "src/Parser.zig", 1 << 20) catch @panic("read vaxis Parser.zig");
const edits = [_]struct { anchor: []const u8, with: []const u8, count: usize = 1 }{
.{
.anchor =
@@ -731,7 +745,7 @@ pub fn build(b: *std.Build) void {
\\ 0x5F => return parseApc(input),
\\ // pardes's patch (its build.zig): ESC before a key's sequence is Alt on the key.
\\ 0x1B => if (input.len > 2 and (input[2] == '[' or input[2] == 'O')) {
- \\ var inner = if (input[2] == '[') parseCsi(input[1..], &self.buf) else parseSs3(input[1..]);
+ \\ var inner = if (input[2] == '[') parseCsi(input[1..], &self.buf, self.cursor_position_requests) else parseSs3(input[1..]);
\\ if (inner.n == 0) return inner;
\\ if (inner.event) |*event| switch (event.*) {
\\ .key_press, .key_release => |*key| key.mods.alt = true,
@@ -767,69 +781,15 @@ pub fn build(b: *std.Build) void {
},
.{
.anchor =
- \\ const esc_result = skipUntilST(input);
- \\ if (esc_result.n > 0) break :blk esc_result.n;
- \\
- \\ // No escape, could be BEL terminated
- \\ const bel = std.mem.indexOfScalarPos(u8, input, 2, 0x07) orelse return .{
- \\ .event = null,
- \\ .n = 0,
- \\ };
- \\ bel_terminated = true;
- \\ break :blk bel + 1;
- ,
- .with =
- \\ // pardes's patch (its build.zig): whichever terminator comes first ends it.
- \\ const esc = std.mem.indexOfScalarPos(u8, input, 2, 0x1b);
- \\ const bel = std.mem.indexOfScalarPos(u8, input, 2, 0x07);
- \\ if (bel != null and (esc == null or bel.? < esc.?)) {
- \\ bel_terminated = true;
- \\ break :blk bel.? + 1;
- \\ }
- \\ const esc_result = skipUntilST(input);
- \\ if (esc_result.n > 0) break :blk esc_result.n;
- \\ return .{ .event = null, .n = 0 };
- ,
- },
- .{
- .anchor = " const color = try Color.rgbFromSpec(color_spec);\n",
- .with = " const color = Color.rgbFromSpec(color_spec) catch return null_event; // pardes's patch (its build.zig)\n",
- .count = 2,
- },
- .{
- .anchor =
- \\ if (input[semicolon_idx + 1] != 'c') return null_event;
- \\ const payload = if (bel_terminated)
- \\ input[semicolon_idx + 3 .. sequence.len - 1]
- \\ else
- \\ input[semicolon_idx + 3 .. sequence.len - 2];
- \\ const decoder = std.base64.standard.Decoder;
- \\ const text = try paste_allocator.?.alloc(u8, try decoder.calcSizeForSlice(payload));
- \\ try decoder.decode(text, payload);
- ,
- .with =
- \\ // pardes's patch (its build.zig): a malformed reply is dropped.
- \\ const body_end = if (bel_terminated) sequence.len - 1 else sequence.len - 2;
- \\ if (semicolon_idx + 3 > body_end or input[semicolon_idx + 1] != 'c') return null_event;
- \\ const payload = input[semicolon_idx + 3 .. body_end];
- \\ const decoder = std.base64.standard.Decoder;
- \\ const gpa = paste_allocator orelse return null_event;
- \\ const text = gpa.alloc(u8, decoder.calcSizeForSlice(payload) catch return null_event) catch return null_event;
- \\ decoder.decode(text, payload) catch {
- \\ gpa.free(text);
- \\ return null_event;
- \\ };
- ,
- },
- .{
- .anchor =
\\ 'A', 'B', 'C', 'D', 'E', 'F', 'H', 'P', 'Q', 'R', 'S' => {
+ \\ // Legacy keys
\\
,
.with =
\\ 'A', 'B', 'C', 'D', 'E', 'F', 'H', 'P', 'Q', 'R', 'S' => {
\\ // pardes's patch (its build.zig): a cursor position report is no key.
\\ if (final == 'R' and cursorReport(sequence)) return null_event;
+ \\ // Legacy keys
\\
,
},
@@ -882,12 +842,11 @@ pub fn build(b: *std.Build) void {
// (InactiveDim on a focus change) sent every blank of every pane it
// touched again: 7 KB a click for three shell panes. The terminal
// keeps the old ink there, and so does vaxis's last frame.
- const render_path = vaxis_dep.path("src/Vaxis.zig").getPath(b);
- var render_src = std.Io.Dir.cwd().readFileAlloc(io, render_path, b.allocator, .limited(1 << 20)) catch @panic("read vaxis Vaxis.zig");
+ var render_src = configureRead(b, io, vaxis_dep.builder.root, "src/Vaxis.zig", 1 << 20) catch @panic("read vaxis Vaxis.zig");
const render_anchor =
\\ if ((!self.refresh and
\\ last.eql(cell) and
- ;
+ ;
if (std.mem.count(u8, render_src, render_anchor) != 1) std.debug.panic("vaxis's Vaxis.zig changed at `{s}`: redo its patch in build.zig", .{render_anchor});
render_src = std.mem.replaceOwned(u8, b.allocator, render_src, render_anchor,
\\ if ((!self.refresh and
@@ -941,7 +900,7 @@ pub fn build(b: *std.Build) void {
var ghostty_vt_for_snap: ?*std.Build.Module = null;
const ghostty_simd = !freestanding_core and (!target.result.os.tag.isDarwin() or b.graph.host.result.os.tag.isDarwin());
- const ghostty_optimize: std.builtin.OptimizeMode = if (optimize == .Debug) .ReleaseSafe else optimize;
+ const ghostty_optimize: std.lang.Optimize = if (optimize == .debug) .safe else optimize;
const ghostty_dep = if (is_esp32p4) null else b.lazyDependency("ghostty", .{ .target = target, .optimize = ghostty_optimize, .simd = ghostty_simd, .@"app-runtime" = .none, .@"emit-xcframework" = false });
if (ghostty_dep) |dep| {
const ghostty_vt = dep.module("ghostty-vt");
@@ -968,7 +927,6 @@ pub fn build(b: *std.Build) void {
.uucode = uucode_mod,
});
-
const iso_off = b.addOptions();
iso_off.addOption(bool, "isolated", false);
const iso_on = b.addOptions();
@@ -1017,6 +975,17 @@ pub fn build(b: *std.Build) void {
const sdl_lib = dep.artifact("SDL3");
gm.linkLibrary(sdl_lib);
gm.addIncludePath(dep.path("include"));
+ // gui.zig's `c`: SDL and the font shim, which @cImport gave it before Zig 0.17.
+ const header = b.addWriteFiles().add("gui_c.h",
+ \\#define SDL_DISABLE_OLD_NAMES 1
+ \\#include <SDL3/SDL.h>
+ \\#include "font.h"
+ \\
+ );
+ const gui_c = b.addTranslateC(.{ .root_source_file = header, .target = target, .optimize = optimize });
+ gui_c.addIncludePath(dep.path("include"));
+ gui_c.addIncludePath(b.path("src/gui"));
+ gm.addImport("gui_c", gui_c.createModule());
}
gm.linkLibrary(freetype.?);
// HarfBuzz from source, like FreeType: its FreeType integration
@@ -1105,7 +1074,7 @@ pub fn build(b: *std.Build) void {
}) |file| web_step.dependOn(&b.addInstallFileWithDir(b.path(file[0]), .{ .custom = "web" }, file[1]).step);
const run_web_harness = b.addSystemCommand(&.{ "node", "test/web_harness.mjs" });
- run_web_harness.addArg(b.getInstallPath(.{ .custom = "web" }, ""));
+ run_web_harness.addDirectoryArg(installed("web"));
run_web_harness.step.dependOn(web_step);
b.step("web-harness", "run the dependency-free JS/WASM DOM harness").dependOn(&run_web_harness.step);
b.getInstallStep().dependOn(web_step);
@@ -1149,9 +1118,9 @@ pub fn build(b: *std.Build) void {
const min_version = b.fmt("{d}.{d}", .{ macos_min_version.major, macos_min_version.minor });
const swift_mode: []const u8 = switch (optimize) {
- .Debug => "-Onone",
- .ReleaseSmall => "-Osize",
- .ReleaseFast, .ReleaseSafe => "-O",
+ .debug => "-Onone",
+ .small => "-Osize",
+ .fast, .safe => "-O",
};
const link = b.addSystemCommand(&.{ "swiftc", swift_mode, "-target", triple, "-import-objc-header" });
@@ -1218,7 +1187,8 @@ pub fn build(b: *std.Build) void {
const sign = b.addSystemCommand(&.{ "codesign", "--force", "--sign", macos_identity });
if (!std.mem.eql(u8, macos_identity, "-")) sign.addArgs(&.{ "--options", "runtime", "--timestamp" });
- sign.addArg(b.getInstallPath(.prefix, "pardes.app"));
+ sign.setCwd(installed(""));
+ sign.addArg("pardes.app");
sign.has_side_effects = true;
sign.step.dependOn(&install_app_bin.step);
sign.step.dependOn(&install_plist.step);
@@ -1227,8 +1197,8 @@ pub fn build(b: *std.Build) void {
app_step.dependOn(&sign.step);
const dmg = b.addSystemCommand(&.{ "hdiutil", "create", "-volname", "pardes", "-ov", "-format", "UDZO", "-srcfolder" });
- dmg.addArg(b.getInstallPath(.prefix, "pardes.app"));
- dmg.addArg(b.getInstallPath(.prefix, "pardes.dmg"));
+ dmg.setCwd(installed(""));
+ dmg.addArgs(&.{ "pardes.app", "pardes.dmg" });
dmg.has_side_effects = true;
dmg.step.dependOn(&sign.step);
dmg_step.dependOn(&dmg.step);
@@ -1267,7 +1237,7 @@ pub fn build(b: *std.Build) void {
const run_e2e = std.Build.Step.Run.create(b, "run macos-e2e");
run_e2e.addFileArg(runnable);
run_e2e.setCwd(b.path("."));
- if (b.args) |args| run_e2e.addArgs(args);
+ run_e2e.addPassthruArgs();
run_e2e.has_side_effects = true;
e2e_step.dependOn(&run_e2e.step);
} else e2e_step.dependOn(&b.addFail("macos-e2e needs a Darwin host and target").step);
@@ -1290,7 +1260,7 @@ pub fn build(b: *std.Build) void {
.linkage = if (static) .static else null,
.root_module = root_mod,
});
- b.installArtifact(exe);
+ installHome(b, exe, home_bin);
if (gui_mod) |gm| {
var gui_name: []const u8 = "pardes-gui";
if (target.result.os.tag != .linux or target.result.cpu.arch != .x86_64)
@@ -1300,7 +1270,7 @@ pub fn build(b: *std.Build) void {
.linkage = if (static) .static else null,
.root_module = gm,
});
- b.installArtifact(gui_exe);
+ installHome(b, gui_exe, home_bin);
}
const run = b.addRunArtifact(exe);
b.step("run", "descend to the pardes").dependOn(&run.step);
@@ -1312,7 +1282,7 @@ pub fn build(b: *std.Build) void {
});
const run_iso = b.addRunArtifact(iso_exe);
// Something to look at on arrival, read out of the binary itself.
- if (b.args) |args| run_iso.addArgs(args) else run_iso.addArg("src/pardes.zig");
+ run_iso.addPassthruArgs();
const iso_step = b.step("run-isolated", "descend to a pardes with no host but the terminal");
iso_step.dependOn(&run_iso.step);
}
@@ -1370,15 +1340,9 @@ pub fn build(b: *std.Build) void {
hxdiff.root_module.addImport("pardes", core_module);
const run_hxdiff = b.addRunArtifact(hxdiff);
run_hxdiff.has_side_effects = true;
- if (b.args) |args| run_hxdiff.addArgs(args) else {
- run_hxdiff.addArgs(&.{
- "--strict",
- "test/hxcases/cases.jsonl",
- "test/hxcases/goldens.jsonl",
- "test/hxcases/waivers.jsonl",
- });
- run_hxdiff.setCwd(b.path("."));
- }
+ // Bare, it runs the checked-in suite (test/hxdiff.zig).
+ run_hxdiff.addPassthruArgs();
+ run_hxdiff.setCwd(b.path("."));
const hxdiff_step = b.step("hxdiff", "compare Helix results (-- --strict cases reference [waivers]; cases alone emits)");
hxdiff_step.dependOn(&run_hxdiff.step);
@@ -1403,16 +1367,8 @@ pub fn build(b: *std.Build) void {
const run_hxparity = b.addRunArtifact(hxdiff);
run_hxparity.has_side_effects = true;
run_hxparity.addArg("--parity");
- if (b.args) |args| run_hxparity.addArgs(args) else {
- run_hxparity.addArgs(&.{
- "--strict",
- "--waivers",
- "test/hxcases/parity-waivers.jsonl",
- "test/hxcases/cases.jsonl",
- "test/hxcases/parity.jsonl",
- });
- run_hxparity.setCwd(b.path("."));
- }
+ run_hxparity.addPassthruArgs();
+ run_hxparity.setCwd(b.path("."));
const hxparity_step = b.step("hxparity", "run the file-vs-pty editing parity suite (-- [--waivers w.jsonl] <cases.jsonl>...)");
hxparity_step.dependOn(&run_hxparity.step);
@@ -1427,34 +1383,33 @@ pub fn build(b: *std.Build) void {
.name = "pardes-lspbench",
.root_module = b.createModule(.{
.target = target,
- .optimize = .ReleaseFast,
+ .optimize = .fast,
.root_source_file = b.path("test/lspbench.zig"),
.link_libc = true,
}),
});
lspbench.root_module.addImport("pardes", core_module);
const run_lspbench = b.addRunArtifact(lspbench);
- if (b.args) |args| run_lspbench.addArgs(args);
+ run_lspbench.addPassthruArgs();
run_lspbench.setCwd(b.path("."));
run_lspbench.has_side_effects = true;
const lspbench_step = b.step("lspbench", "language-backend latency + feature matrix (-- [--json] [--check] [repo-root]), or one query (-- probe <kind> <file> <line>:<col> [arg] [--reps N])");
lspbench_step.dependOn(&run_lspbench.step);
const run_lspbench_check = b.addRunArtifact(lspbench);
run_lspbench_check.addArg("--check");
- if (b.args) |args| run_lspbench_check.addArgs(args);
+ run_lspbench_check.addPassthruArgs();
run_lspbench_check.setCwd(b.path("."));
run_lspbench_check.has_side_effects = true;
const lspbench_check_step = b.step("lspbench-check", "require every configured language probe to complete correctly");
lspbench_check_step.dependOn(&run_lspbench_check.step);
-
const locations_bench_step = b.step("locations-bench", "measure cold/warm result formatting (-Doptimize=ReleaseFast; CSV on stderr)");
- if (optimize != .ReleaseFast) {
+ if (optimize != .fast) {
locations_bench_step.dependOn(&b.addFail("locations-bench requires -Doptimize=ReleaseFast").step);
} else {
const locations_bench_module = b.createModule(.{
.target = target,
- .optimize = .ReleaseFast,
+ .optimize = .fast,
.root_source_file = b.path("test/locations_bench.zig"),
.link_libc = true,
});
@@ -1465,7 +1420,7 @@ pub fn build(b: *std.Build) void {
locations_bench_step.dependOn(&run_locations_bench.step);
}
- const perf_optimize: std.builtin.OptimizeMode = .ReleaseFast;
+ const perf_optimize: std.lang.Optimize = .fast;
const perf_options = b.addOptions();
const perf_target = std.Target.Query.fromTarget(&target.result);
perf_options.addOption(PerfBuild, "identity", .{
@@ -1499,7 +1454,7 @@ pub fn build(b: *std.Build) void {
perf.root_module.addOptions("perf_options", perf_options);
const run_perf = b.addRunArtifact(perf);
run_perf.has_side_effects = true;
- if (b.args) |args| run_perf.addArgs(args);
+ run_perf.addPassthruArgs();
run_perf.setCwd(b.path("."));
const perf_step = b.step("perf", "gesture latency or bounded terminal stress (-- [--json] [--reps N] [--base old.json] [--terminal-mib N])");
perf_step.dependOn(&run_perf.step);
@@ -1536,7 +1491,7 @@ pub fn build(b: *std.Build) void {
.name = "pardes-fs-bench",
.root_module = b.createModule(.{
.target = target,
- .optimize = .ReleaseFast,
+ .optimize = .fast,
.root_source_file = b.path("test/fs_bench.zig"),
.link_libc = true,
}),
@@ -1544,7 +1499,7 @@ pub fn build(b: *std.Build) void {
fs_bench.root_module.addImport("pardes", core_module);
const run_fs_bench = b.addRunArtifact(fs_bench);
run_fs_bench.has_side_effects = true;
- if (b.args) |args| run_fs_bench.addArgs(args);
+ run_fs_bench.addPassthruArgs();
run_fs_bench.setCwd(b.path("."));
const fs_bench_step = b.step("fs-bench", "9P filesystem request cost and allocation count (-- [--json] [--reps N])");
fs_bench_step.dependOn(&run_fs_bench.step);
@@ -1581,11 +1536,11 @@ pub fn build(b: *std.Build) void {
});
syntax_runner.root_module.addImport("syntax", syntax_module);
const run_syntax = b.addRunArtifact(syntax_runner);
- if (b.args) |args| run_syntax.addArgs(args);
+ run_syntax.addPassthruArgs();
b.step("syntax", "emit deterministic syntax snapshots").dependOn(&run_syntax.step);
const run_syntax_bench = b.addRunArtifact(syntax_runner);
run_syntax_bench.addArg("--bench");
- if (b.args) |args| run_syntax_bench.addArgs(args);
+ run_syntax_bench.addPassthruArgs();
run_syntax_bench.has_side_effects = true;
b.step("syntax-bench", "measure highlighting latency and allocations").dependOn(&run_syntax_bench.step);
const syntax_test = b.addTest(.{
@@ -1611,7 +1566,7 @@ pub fn build(b: *std.Build) void {
// part of fs-test; the long run is manual.
const run_monkey9p = b.addSystemCommand(&.{ "python3", "-B", "test/monkey9p.py" });
run_monkey9p.addArtifactArg(exe);
- if (b.args) |args| run_monkey9p.addArgs(args);
+ run_monkey9p.addPassthruArgs();
run_monkey9p.setCwd(b.path("."));
run_monkey9p.has_side_effects = true;
b.step("monkey-9p", "random 9P operations checking the documented rules (-- [--seed N]... [--steps M] [--replay F] [--shrink F] [--no-shrink])").dependOn(&run_monkey9p.step);
@@ -1622,7 +1577,7 @@ pub fn build(b: *std.Build) void {
if (platform == .gui) {
const run_monkey_gui = b.addSystemCommand(&.{ "python3", "-B", "test/gui_monkey.py" });
run_monkey_gui.addArtifactArg(exe);
- if (b.args) |args| run_monkey_gui.addArgs(args);
+ run_monkey_gui.addPassthruArgs();
run_monkey_gui.setCwd(b.path("."));
run_monkey_gui.has_side_effects = true;
monkey_gui_step.dependOn(&run_monkey_gui.step);
@@ -1653,7 +1608,7 @@ pub fn build(b: *std.Build) void {
}),
});
// Ordinary executable; each launch asks sudo inside its own PTY.
- b.installArtifact(v9fs_helper);
+ installHome(b, v9fs_helper, home_bin);
const run_v9fs = b.addSystemCommand(&.{ "python3", "-B", "test/v9fs.py" });
run_v9fs.addArtifactArg(exe);
run_v9fs.addArtifactArg(v9fs_helper);
@@ -1688,7 +1643,7 @@ pub fn build(b: *std.Build) void {
}),
});
const run_history = b.addRunArtifact(history);
- if (b.args) |args| run_history.addArgs(args);
+ run_history.addPassthruArgs();
run_history.has_side_effects = true;
b.step("history", "compare command output and test/build runtime across jj revisions").dependOn(&run_history.step);
@@ -1843,7 +1798,7 @@ pub fn build(b: *std.Build) void {
if (unit_match) |check| check.addArtifactArg(shell_test);
const run_profile = b.addRunArtifact(unit_profile);
run_profile.addArtifactArg(shell_test);
- if (b.args) |args| run_profile.addArgs(args);
+ run_profile.addPassthruArgs();
run_profile.has_side_effects = true;
b.step("unit-profile", "report test request time and process memory as JSONL (-- optional filter, --timeout-ms=N)").dependOn(&run_profile.step);
const profile_test = b.addExecutable(.{
@@ -1876,19 +1831,38 @@ fn testMatch(b: *std.Build, profiler: *std.Build.Step.Compile, filters: []const
return check;
}
-fn prefixIsUntouched(b: *std.Build) bool {
- if (b.dest_dir != null) return false;
- const zig_out = b.build_root.join(b.allocator, &.{"zig-out"}) catch @panic("OOM");
- if (!std.mem.eql(u8, b.install_prefix, zig_out)) return false;
- return std.mem.eql(u8, b.exe_dir, b.pathJoin(&.{ b.install_path, "bin" })) and
- std.mem.eql(u8, b.lib_dir, b.pathJoin(&.{ b.install_path, "lib" })) and
- std.mem.eql(u8, b.h_dir, b.pathJoin(&.{ b.install_path, "include" }));
+/// Installs `artifact` in the prefix and, given `home_bin`, copies it there
+/// too (`install` unlinks first, so a running binary is replaced).
+fn installHome(b: *std.Build, artifact: *std.Build.Step.Compile, home_bin: ?[]const u8) void {
+ b.installArtifact(artifact);
+ const dir = home_bin orelse return;
+ const copy = b.addSystemCommand(&.{ "install", "-Dm755" });
+ copy.addArtifactArg(artifact);
+ copy.addArg(b.pathJoin(&.{ dir, artifact.name }));
+ copy.has_side_effects = true;
+ b.getInstallStep().dependOn(&copy.step);
+}
+
+/// A file read while configuring, under a package's root. A dependency's is
+/// hash-addressed and never changes under the same pin; this repo's are not
+/// tracked one by one, since the configure runs again on every build anyway
+/// (findProgram and gitCommit poison its cache).
+// ponytail: untracked repo reads; b.dependOnFileContents each one if the configure cache ever stays pure.
+fn configureRead(b: *std.Build, io: std.Io, root: std.Build.Cache.Path, sub: []const u8, limit: usize) ![]u8 {
+ return root.root_dir.handle.readFileAlloc(io, b.pathJoin(&.{ root.subPathOrDot(), sub }), b.allocator, .limited(limit));
+}
+
+/// `sub` under the install prefix, known only when the build runs.
+fn installed(sub: []const u8) std.Build.LazyPath {
+ return .{ .relative = .{ .base = .install_prefix, .sub_path = sub } };
}
fn gitCommit(b: *std.Build) ?[]const u8 {
+ // HEAD is not a file the configure cache can track.
+ b.graph.poisonCache();
var code: u8 = 0;
const out = b.runAllowFail(
- &.{ "git", "-C", b.build_root.path orelse ".", "rev-parse", "--short=12", "HEAD" },
+ &.{ "git", "rev-parse", "--short=12", "HEAD" },
&code,
.ignore,
) catch return null;
@@ -1985,7 +1959,7 @@ fn compileGlsl(b: *std.Build, name: []const u8) std.Build.LazyPath {
fn vendoredThemes(b: *std.Build, io: std.Io) []const []const u8 {
var count: usize = 0;
{
- var dir = b.build_root.handle.openDir(io, "vendor/themes", .{ .iterate = true }) catch @panic("open vendor/themes");
+ var dir = b.root.root_dir.handle.openDir(io, "vendor/themes", .{ .iterate = true }) catch @panic("open vendor/themes");
defer dir.close(io);
var it = dir.iterate();
while (it.next(io) catch @panic("read vendor/themes")) |e| {
@@ -1995,7 +1969,7 @@ fn vendoredThemes(b: *std.Build, io: std.Io) []const []const u8 {
}
const names = b.allocator.alloc([]const u8, count) catch @panic("OOM");
- var dir = b.build_root.handle.openDir(io, "vendor/themes", .{ .iterate = true }) catch @panic("open vendor/themes");
+ var dir = b.root.root_dir.handle.openDir(io, "vendor/themes", .{ .iterate = true }) catch @panic("open vendor/themes");
defer dir.close(io);
var it = dir.iterate();
var index: usize = 0;
@@ -2043,6 +2017,6 @@ fn wireCore(m: *std.Build.Module, d: struct {
/// helper because `cpu_features_add` wants a set and there is no literal syntax for one.
fn riscvFeatures(comptime features: []const std.Target.riscv.Feature) std.Target.Cpu.Feature.Set {
var set = std.Target.Cpu.Feature.Set.empty;
- for (features) |f| set.addFeature(@intFromEnum(f));
+ for (features) |f| set.addFeature(@backingInt(f));
return set;
}