From e8f83781363fee39a8cd597c730a1359fb3db63f Mon Sep 17 00:00:00 2001 From: jinzhongjia Date: Fri, 5 Jul 2024 16:24:11 +0800 Subject: [PATCH] feat: add default tty to build option --- build.zig | 5 +++++ src/config/Config.zig | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/build.zig b/build.zig index 69ea404..10817db 100644 --- a/build.zig +++ b/build.zig @@ -15,6 +15,7 @@ comptime { const ly_version = std.SemanticVersion{ .major = 1, .minor = 1, .patch = 0 }; var dest_directory: []const u8 = undefined; var data_directory: []const u8 = undefined; +var default_tty: u8 = 0; var exe_name: []const u8 = undefined; const ProgressNode = if (current_zig.minor == 12) *std.Progress.Node else std.Progress.Node; @@ -22,6 +23,8 @@ const ProgressNode = if (current_zig.minor == 12) *std.Progress.Node else std.Pr pub fn build(b: *std.Build) !void { dest_directory = b.option([]const u8, "dest_directory", "Specify a destination directory for installation") orelse ""; data_directory = b.option([]const u8, "data_directory", "Specify a default data directory (default is /etc/ly). This path gets embedded into the binary") orelse "/etc/ly"; + default_tty = b.option(u8, "default_tty", "set default tty") orelse 2; + exe_name = b.option([]const u8, "name", "Specify installed executable file name (default is ly)") orelse "ly"; const bin_directory = try b.allocator.dupe(u8, data_directory); @@ -34,6 +37,8 @@ pub fn build(b: *std.Build) !void { build_options.addOption([]const u8, "version", version_str); + build_options.addOption(u8, "tty", default_tty); + const target = b.standardTargetOptions(.{}); const optimize = b.standardOptimizeOption(.{}); diff --git a/src/config/Config.zig b/src/config/Config.zig index bddda19..347c5e1 100644 --- a/src/config/Config.zig +++ b/src/config/Config.zig @@ -42,7 +42,7 @@ sleep_cmd: ?[]const u8 = null, sleep_key: []const u8 = "F3", term_reset_cmd: [:0]const u8 = "/usr/bin/tput reset", term_restore_cursor_cmd: []const u8 = "/usr/bin/tput cnorm", -tty: u8 = 2, +tty: u8 = build_options.tty, vi_mode: bool = false, wayland_cmd: []const u8 = build_options.data_directory ++ "/wsetup.sh", waylandsessions: []const u8 = "/usr/share/wayland-sessions",