diff --git a/.gitignore b/.gitignore index f164e11648224274cf8f8d674a0649fa06dcd632..755aa68f03a30361a954cb1bfbf823ba9fa604ae 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ -zig-cache .zig-cache zig-out .zigmod diff --git a/build.zig b/build.zig index adc1f9475e648c8f811b93d54972cdc7056e6bf5..9fba23fd0f2ec866aa81d1f88d298b8dbb9aad6a 100644 --- a/build.zig +++ b/build.zig @@ -1,10 +1,11 @@ const std = @import("std"); +const deps = @import("./deps.zig"); pub fn build(b: *std.Build) void { const target = b.standardTargetOptions(.{}); const mode = b.option(std.builtin.Mode, "mode", "") orelse .Debug; - const mod = b.addModule("tracer", .{ .source_file = .{ .path = "src/mod.zig" } }); + const mod = b.addModule("tracer", .{ .root_source_file = b.path("src/mod.zig") }); addTest(b, target, mode, mod, 0); addTest(b, target, mode, mod, 1); @@ -12,22 +13,23 @@ pub fn build(b: *std.Build) void { addTest(b, target, mode, mod, 3); const test_step = b.step("test", "dummy test step to pass CI checks"); - _ = test_step; + test_step.dependOn(b.default_step); } -fn addTest(b: *std.Build, target: std.zig.CrossTarget, mode: std.builtin.Mode, mod: *std.build.Module, comptime backend: u8) void { +fn addTest(b: *std.Build, target: std.Build.ResolvedTarget, mode: std.builtin.Mode, mod: *std.Build.Module, comptime backend: u8) void { + _ = mod; const options = b.addOptions(); options.addOption(usize, "src_file_trimlen", std.fs.path.dirname(std.fs.path.dirname(@src().file).?).?.len); options.addOption(u8, "backend", backend); const exe = b.addExecutable(.{ .name = "test" ++ std.fmt.comptimePrint("{d}", .{backend}), - .root_source_file = .{ .path = "src/main.zig" }, + .root_source_file = b.path("src/main.zig"), .target = target, .optimize = mode, }); + deps.addAllTo(exe); exe.linkLibC(); - exe.addModule("tracer", mod); - exe.addOptions("build_options", options); + exe.root_module.addImport("build_options", options.createModule()); b.installArtifact(exe); } diff --git a/src/main.zig b/src/main.zig index 78dc47ea672ac67db7abd7d3c475eca367239aaa..5cd329eed90ed36805e456e4fe2cc8d3e55bdb83 100644 --- a/src/main.zig +++ b/src/main.zig @@ -16,6 +16,7 @@ pub fn main() !void { // main loop var go = false; + _ = &go; while (go) { try tracer.init_thread(std.fs.cwd()); defer tracer.deinit_thread();