diff --git a/build.zig b/build.zig index ac34813be89904025a3cbf3b173da0a6a73cfc97..7179a83344f7917225d9276ede350455806d34b5 100644 --- a/build.zig +++ b/build.zig @@ -10,8 +10,7 @@ pub fn build(b: *Builder) void { const use_full_name = b.option(bool, "use-full-name", "") orelse false; const with_arch_os = b.fmt("-{}-{}", .{@tagName(target.cpu_arch orelse builtin.arch), @tagName(target.os_tag orelse builtin.os.tag)}); - const version_tag = if (b.option([]const u8, "tag", "")) |vt| b.fmt("-{}", .{vt}) else ""; - const exe_name = b.fmt("{}{}{}", .{ "zigmod", version_tag, if (use_full_name) with_arch_os else "" }); + const exe_name = b.fmt("{}{}", .{ "zigmod", if (use_full_name) with_arch_os else "" }); const exe = b.addExecutable(exe_name, "src/main.zig"); exe.setTarget(target); @@ -19,6 +18,7 @@ pub fn build(b: *Builder) void { if (mode != .Debug) { exe.strip = true; } + exe.addBuildOption([]const u8, "version", b.option([]const u8, "tag", "") orelse ""); exe.linkLibC(); diff --git a/src/main.zig b/src/main.zig index 810b3cda07e058bad4d914e254bee7fe6c3930f6..fdbb078790f80cefa9ff74db8fa138be407e5753 100644 --- a/src/main.zig +++ b/src/main.zig @@ -21,7 +21,12 @@ pub fn main() !void { const args = proc_args[1..]; if (args.len == 0) { - u.print("zigmod-{}-{}-{}", .{@tagName(builtin.os.tag), @tagName(builtin.arch), @tagName(builtin.abi)}); + u.print("zigmod {} {} {} {}", .{ + @import("build_options").version, + @tagName(builtin.os.tag), + @tagName(builtin.arch), + @tagName(builtin.abi) + }); return; } @@ -32,6 +37,5 @@ pub fn main() !void { return; } } - std.debug.panic("Error: unknown command \"{}\" for \"zigmod\"", .{args[0]}); }