mirror of
https://github.com/fairyglade/ly.git
synced 2025-12-20 19:24:53 +00:00
Various bug fixes and small features (#606)
* Fix stray cursor, integer overflows and other bugs * check for getenvlist error, shorten code * fix cascade, set info_line before auth, make code clearer and a bug fix * Add option to turn on numlock at startup * Fix setting numlock * Update build.zig * Custom info text * Shift+Tab for previous input * update changelog and res/config * Some fixes * update build.zig * update build.zig again * Fix xauth command for some shells and fix building in ReleaseSafe * Use git describe to get dev version str * revert change to getLockState (it broke the doom animation) * add new ly error messages. Only try to make path for pam/exe during install when dest_directory is defined + print warning on error. * add warning message for workaround
This commit is contained in:
アシュ
GitHub
293
build.zig
293
build.zig
@@ -1,32 +1,26 @@
|
||||
const std = @import("std");
|
||||
|
||||
const ly_version = std.SemanticVersion{ .major = 1, .minor = 0, .patch = 0, .build = "dev" };
|
||||
const ly_version = std.SemanticVersion{ .major = 1, .minor = 0, .patch = 0 };
|
||||
var dest_directory: []const u8 = undefined;
|
||||
var data_directory: []const u8 = undefined;
|
||||
var exe_name: []const u8 = undefined;
|
||||
|
||||
pub fn build(b: *std.Build) void {
|
||||
const data_directory = b.option([]const u8, "data_directory", "Specify a default data directory (default is /etc/ly)");
|
||||
pub fn build(b: *std.Build) !void {
|
||||
dest_directory = b.option([]const u8, "dest_directory", "Specify a dest directory for installation") orelse "";
|
||||
data_directory = b.option([]const u8, "data_directory", "Specify a default data directory (default is /etc/ly)") orelse "/etc/ly";
|
||||
data_directory = try std.fs.path.join(b.allocator, &[_][]const u8{ dest_directory, data_directory });
|
||||
exe_name = b.option([]const u8, "name", "Specify installed executable file name (default is ly)") orelse "ly";
|
||||
|
||||
const build_options = b.addOptions();
|
||||
build_options.addOption([]const u8, "data_directory", data_directory orelse "/etc/ly");
|
||||
const version_str = b.fmt("{d}.{d}.{d}-{s}", .{ ly_version.major, ly_version.minor, ly_version.patch, ly_version.build.? });
|
||||
build_options.addOption([]const u8, "data_directory", data_directory);
|
||||
|
||||
const version_str = try getVersionStr(b, "ly", ly_version);
|
||||
|
||||
build_options.addOption([]const u8, "version", version_str);
|
||||
|
||||
const target = b.standardTargetOptions(.{});
|
||||
const optimize = b.standardOptimizeOption(.{});
|
||||
|
||||
const c_args = [_][]const u8{
|
||||
"-std=c99",
|
||||
"-pedantic",
|
||||
"-g",
|
||||
"-Wall",
|
||||
"-Wextra",
|
||||
"-Werror=vla",
|
||||
"-Wno-unused-parameter",
|
||||
"-D_DEFAULT_SOURCE",
|
||||
"-D_POSIX_C_SOURCE=200809L",
|
||||
"-D_XOPEN_SOURCE",
|
||||
};
|
||||
|
||||
const exe = b.addExecutable(.{
|
||||
.name = "ly",
|
||||
.root_source_file = .{ .path = "src/main.zig" },
|
||||
@@ -42,18 +36,24 @@ pub fn build(b: *std.Build) void {
|
||||
const clap = b.dependency("clap", .{ .target = target, .optimize = optimize });
|
||||
exe.root_module.addImport("clap", clap.module("clap"));
|
||||
|
||||
exe.addIncludePath(.{ .path = "include" });
|
||||
exe.linkSystemLibrary("pam");
|
||||
exe.linkSystemLibrary("xcb");
|
||||
exe.linkLibC();
|
||||
|
||||
exe.addIncludePath(.{ .path = "dep/termbox_next/src" });
|
||||
// HACK: Only fails with ReleaseSafe, so we'll override it.
|
||||
const translate_c = b.addTranslateC(.{
|
||||
.root_source_file = .{ .path = "include/termbox2.h" },
|
||||
.target = target,
|
||||
.optimize = if (optimize == .ReleaseSafe) .ReleaseFast else optimize,
|
||||
});
|
||||
translate_c.defineCMacroRaw("TB_IMPL");
|
||||
const termbox2 = translate_c.addModule("termbox2");
|
||||
exe.root_module.addImport("termbox2", termbox2);
|
||||
|
||||
exe.addCSourceFile(.{ .file = .{ .path = "dep/termbox_next/src/input.c" }, .flags = &c_args });
|
||||
exe.addCSourceFile(.{ .file = .{ .path = "dep/termbox_next/src/memstream.c" }, .flags = &c_args });
|
||||
exe.addCSourceFile(.{ .file = .{ .path = "dep/termbox_next/src/ringbuffer.c" }, .flags = &c_args });
|
||||
exe.addCSourceFile(.{ .file = .{ .path = "dep/termbox_next/src/term.c" }, .flags = &c_args });
|
||||
exe.addCSourceFile(.{ .file = .{ .path = "dep/termbox_next/src/termbox.c" }, .flags = &c_args });
|
||||
exe.addCSourceFile(.{ .file = .{ .path = "dep/termbox_next/src/utf8.c" }, .flags = &c_args });
|
||||
if (optimize == .ReleaseSafe) {
|
||||
std.debug.print("warn: termbox2 module is being built in ReleaseFast due to a bug.\n", .{});
|
||||
}
|
||||
|
||||
b.installArtifact(exe);
|
||||
|
||||
@@ -67,120 +67,108 @@ pub fn build(b: *std.Build) void {
|
||||
run_step.dependOn(&run_cmd.step);
|
||||
|
||||
const installexe_step = b.step("installexe", "Install Ly");
|
||||
installexe_step.makeFn = installexe;
|
||||
installexe_step.makeFn = ExeInstaller(true).make;
|
||||
installexe_step.dependOn(b.getInstallStep());
|
||||
|
||||
const installnoconf_step = b.step("installnoconf", "Install Ly without its configuration file");
|
||||
installnoconf_step.makeFn = installnoconf;
|
||||
installnoconf_step.makeFn = ExeInstaller(false).make;
|
||||
installnoconf_step.dependOn(b.getInstallStep());
|
||||
|
||||
const installsystemd_step = b.step("installsystemd", "Install the Ly systemd service");
|
||||
installsystemd_step.makeFn = installsystemd;
|
||||
installsystemd_step.makeFn = ServiceInstaller(.Systemd).make;
|
||||
installsystemd_step.dependOn(installexe_step);
|
||||
|
||||
const installopenrc_step = b.step("installopenrc", "Install the Ly openrc service");
|
||||
installopenrc_step.makeFn = installopenrc;
|
||||
installopenrc_step.makeFn = ServiceInstaller(.Openrc).make;
|
||||
installopenrc_step.dependOn(installexe_step);
|
||||
|
||||
const installrunit_step = b.step("installrunit", "Install the Ly runit service");
|
||||
installrunit_step.makeFn = installrunit;
|
||||
installrunit_step.makeFn = ServiceInstaller(.Runit).make;
|
||||
installrunit_step.dependOn(installexe_step);
|
||||
|
||||
const uninstallall_step = b.step("uninstallall", "Uninstall Ly and all services");
|
||||
uninstallall_step.makeFn = uninstallall;
|
||||
}
|
||||
|
||||
fn installexe(self: *std.Build.Step, progress: *std.Progress.Node) !void {
|
||||
_ = progress;
|
||||
_ = self;
|
||||
|
||||
try install_ly(true);
|
||||
}
|
||||
|
||||
fn installnoconf(self: *std.Build.Step, progress: *std.Progress.Node) !void {
|
||||
_ = progress;
|
||||
_ = self;
|
||||
|
||||
try install_ly(false);
|
||||
}
|
||||
|
||||
fn installsystemd(self: *std.Build.Step, progress: *std.Progress.Node) !void {
|
||||
_ = progress;
|
||||
_ = self;
|
||||
|
||||
var service_dir = std.fs.openDirAbsolute("/usr/lib/systemd/system", .{}) catch unreachable;
|
||||
defer service_dir.close();
|
||||
|
||||
try std.fs.cwd().copyFile("res/ly.service", service_dir, "ly.service", .{ .override_mode = 644 });
|
||||
}
|
||||
|
||||
fn installopenrc(self: *std.Build.Step, progress: *std.Progress.Node) !void {
|
||||
_ = progress;
|
||||
_ = self;
|
||||
|
||||
var service_dir = std.fs.openDirAbsolute("/etc/init.d", .{}) catch unreachable;
|
||||
defer service_dir.close();
|
||||
|
||||
try std.fs.cwd().copyFile("res/ly-openrc", service_dir, "ly", .{ .override_mode = 755 });
|
||||
}
|
||||
|
||||
fn installrunit(self: *std.Build.Step, progress: *std.Progress.Node) !void {
|
||||
_ = progress;
|
||||
_ = self;
|
||||
|
||||
var service_dir = std.fs.openDirAbsolute("/etc/sv", .{}) catch unreachable;
|
||||
defer service_dir.close();
|
||||
|
||||
std.fs.makeDirAbsolute("/etc/sv/ly") catch {
|
||||
std.debug.print("warn: /etc/sv/ly already exists as a directory.\n", .{});
|
||||
};
|
||||
|
||||
var ly_service_dir = std.fs.openDirAbsolute("/etc/sv/ly", .{}) catch unreachable;
|
||||
defer ly_service_dir.close();
|
||||
|
||||
try std.fs.cwd().copyFile("res/ly-runit-service/conf", ly_service_dir, "conf", .{});
|
||||
try std.fs.cwd().copyFile("res/ly-runit-service/finish", ly_service_dir, "finish", .{});
|
||||
try std.fs.cwd().copyFile("res/ly-runit-service/run", ly_service_dir, "run", .{});
|
||||
}
|
||||
|
||||
fn uninstallall(self: *std.Build.Step, progress: *std.Progress.Node) !void {
|
||||
_ = progress;
|
||||
_ = self;
|
||||
|
||||
try std.fs.deleteTreeAbsolute("/etc/ly");
|
||||
try std.fs.deleteFileAbsolute("/usr/bin/ly");
|
||||
try std.fs.deleteFileAbsolute("/etc/pam.d/ly");
|
||||
std.fs.deleteFileAbsolute("/usr/lib/systemd/system/ly.service") catch {
|
||||
std.debug.print("warn: systemd service not found.\n", .{});
|
||||
};
|
||||
std.fs.deleteFileAbsolute("/etc/init.d/ly") catch {
|
||||
std.debug.print("warn: openrc service not found.\n", .{});
|
||||
};
|
||||
std.fs.deleteTreeAbsolute("/etc/sv/ly") catch {
|
||||
std.debug.print("warn: runit service not found.\n", .{});
|
||||
pub fn ExeInstaller(install_conf: bool) type {
|
||||
return struct {
|
||||
pub fn make(step: *std.Build.Step, progress: *std.Progress.Node) !void {
|
||||
_ = progress;
|
||||
try install_ly(step.owner.allocator, install_conf);
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
fn install_ly(install_config: bool) !void {
|
||||
std.fs.makeDirAbsolute("/etc/ly") catch {
|
||||
std.debug.print("warn: /etc/ly already exists as a directory.\n", .{});
|
||||
const InitSystem = enum {
|
||||
Systemd,
|
||||
Openrc,
|
||||
Runit,
|
||||
};
|
||||
pub fn ServiceInstaller(comptime init_system: InitSystem) type {
|
||||
return struct {
|
||||
pub fn make(step: *std.Build.Step, progress: *std.Progress.Node) !void {
|
||||
_ = progress;
|
||||
const allocator = step.owner.allocator;
|
||||
switch (init_system) {
|
||||
.Openrc => {
|
||||
const service_path = try std.fs.path.join(allocator, &[_][]const u8{ dest_directory, "/etc/init.d" });
|
||||
std.fs.cwd().makePath(service_path) catch {};
|
||||
var service_dir = std.fs.openDirAbsolute(service_path, .{}) catch unreachable;
|
||||
defer service_dir.close();
|
||||
|
||||
try std.fs.cwd().copyFile("res/ly-openrc", service_dir, exe_name, .{ .override_mode = 755 });
|
||||
},
|
||||
.Runit => {
|
||||
const service_path = try std.fs.path.join(allocator, &[_][]const u8{ dest_directory, "/etc/sv/ly" });
|
||||
std.fs.cwd().makePath(service_path) catch {};
|
||||
var service_dir = std.fs.openDirAbsolute(service_path, .{}) catch unreachable;
|
||||
defer service_dir.close();
|
||||
|
||||
try std.fs.cwd().copyFile("res/ly-runit-service/conf", service_dir, "conf", .{});
|
||||
try std.fs.cwd().copyFile("res/ly-runit-service/finish", service_dir, "finish", .{});
|
||||
try std.fs.cwd().copyFile("res/ly-runit-service/run", service_dir, "run", .{});
|
||||
},
|
||||
.Systemd => {
|
||||
const service_path = try std.fs.path.join(allocator, &[_][]const u8{ dest_directory, "/usr/lib/systemd/system" });
|
||||
std.fs.cwd().makePath(service_path) catch {};
|
||||
var service_dir = std.fs.openDirAbsolute(service_path, .{}) catch unreachable;
|
||||
defer service_dir.close();
|
||||
|
||||
try std.fs.cwd().copyFile("res/ly.service", service_dir, "ly.service", .{ .override_mode = 644 });
|
||||
},
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
fn install_ly(allocator: std.mem.Allocator, install_config: bool) !void {
|
||||
std.fs.cwd().makePath(data_directory) catch {
|
||||
std.debug.print("warn: {s} already exists as a directory.\n", .{data_directory});
|
||||
};
|
||||
|
||||
std.fs.makeDirAbsolute("/etc/ly/lang") catch {
|
||||
std.debug.print("warn: /etc/ly/lang already exists as a directory.\n", .{});
|
||||
const lang_path = try std.fs.path.join(allocator, &[_][]const u8{ data_directory, "/lang" });
|
||||
std.fs.cwd().makePath(lang_path) catch {
|
||||
std.debug.print("warn: {s} already exists as a directory.\n", .{data_directory});
|
||||
};
|
||||
|
||||
var current_dir = std.fs.cwd();
|
||||
|
||||
{
|
||||
var executable_dir = std.fs.openDirAbsolute("/usr/bin", .{}) catch unreachable;
|
||||
const exe_path = try std.fs.path.join(allocator, &[_][]const u8{ dest_directory, "/usr/bin" });
|
||||
if (!std.mem.eql(u8, dest_directory, "")) {
|
||||
std.fs.cwd().makePath(exe_path) catch {
|
||||
std.debug.print("warn: {s} already exists as a directory.\n", .{exe_path});
|
||||
};
|
||||
}
|
||||
|
||||
var executable_dir = std.fs.openDirAbsolute(exe_path, .{}) catch unreachable;
|
||||
defer executable_dir.close();
|
||||
|
||||
try current_dir.copyFile("zig-out/bin/ly", executable_dir, "ly", .{});
|
||||
try current_dir.copyFile("zig-out/bin/ly", executable_dir, exe_name, .{});
|
||||
}
|
||||
|
||||
{
|
||||
var config_dir = std.fs.openDirAbsolute("/etc/ly", .{}) catch unreachable;
|
||||
var config_dir = std.fs.openDirAbsolute(data_directory, .{}) catch unreachable;
|
||||
defer config_dir.close();
|
||||
|
||||
if (install_config) {
|
||||
@@ -191,7 +179,7 @@ fn install_ly(install_config: bool) !void {
|
||||
}
|
||||
|
||||
{
|
||||
var lang_dir = std.fs.openDirAbsolute("/etc/ly/lang", .{}) catch unreachable;
|
||||
var lang_dir = std.fs.openDirAbsolute(lang_path, .{}) catch unreachable;
|
||||
defer lang_dir.close();
|
||||
|
||||
try current_dir.copyFile("res/lang/cat.ini", lang_dir, "cat.ini", .{});
|
||||
@@ -213,9 +201,98 @@ fn install_ly(install_config: bool) !void {
|
||||
}
|
||||
|
||||
{
|
||||
var pam_dir = std.fs.openDirAbsolute("/etc/pam.d", .{}) catch unreachable;
|
||||
const pam_path = try std.fs.path.join(allocator, &[_][]const u8{ dest_directory, "/etc/pam.d" });
|
||||
if (!std.mem.eql(u8, dest_directory, "")) {
|
||||
std.fs.cwd().makePath(pam_path) catch {
|
||||
std.debug.print("warn: {s} already exists as a directory.\n", .{pam_path});
|
||||
};
|
||||
}
|
||||
|
||||
var pam_dir = std.fs.openDirAbsolute(pam_path, .{}) catch unreachable;
|
||||
defer pam_dir.close();
|
||||
|
||||
try current_dir.copyFile("res/pam.d/ly", pam_dir, "ly", .{ .override_mode = 644 });
|
||||
}
|
||||
}
|
||||
|
||||
pub fn uninstallall(step: *std.Build.Step, progress: *std.Progress.Node) !void {
|
||||
_ = progress;
|
||||
try std.fs.deleteTreeAbsolute(data_directory);
|
||||
const allocator = step.owner.allocator;
|
||||
|
||||
const exe_path = try std.fs.path.join(allocator, &[_][]const u8{ dest_directory, "/usr/bin/", exe_name });
|
||||
try std.fs.deleteFileAbsolute(exe_path);
|
||||
|
||||
const pam_path = try std.fs.path.join(allocator, &[_][]const u8{ dest_directory, "/etc/pam.d/ly" });
|
||||
try std.fs.deleteFileAbsolute(pam_path);
|
||||
|
||||
const systemd_service_path = try std.fs.path.join(allocator, &[_][]const u8{ dest_directory, "/usr/lib/systemd/system/ly.service" });
|
||||
std.fs.deleteFileAbsolute(systemd_service_path) catch {
|
||||
std.debug.print("warn: systemd service not found.\n", .{});
|
||||
};
|
||||
|
||||
const openrc_service_path = try std.fs.path.join(allocator, &[_][]const u8{ dest_directory, "/etc/init.d/ly" });
|
||||
std.fs.deleteFileAbsolute(openrc_service_path) catch {
|
||||
std.debug.print("warn: openrc service not found.\n", .{});
|
||||
};
|
||||
|
||||
const runit_service_path = try std.fs.path.join(allocator, &[_][]const u8{ dest_directory, "/etc/sv/ly" });
|
||||
std.fs.deleteTreeAbsolute(runit_service_path) catch {
|
||||
std.debug.print("warn: runit service not found.\n", .{});
|
||||
};
|
||||
}
|
||||
|
||||
fn getVersionStr(b: *std.Build, name: []const u8, version: std.SemanticVersion) ![]const u8 {
|
||||
const version_str = b.fmt("{d}.{d}.{d}", .{ version.major, version.minor, version.patch });
|
||||
|
||||
var status: u8 = undefined;
|
||||
const git_describe_raw = b.runAllowFail(&[_][]const u8{
|
||||
"git",
|
||||
"-C",
|
||||
b.build_root.path orelse ".",
|
||||
"describe",
|
||||
"--match",
|
||||
"*.*.*",
|
||||
"--tags",
|
||||
}, &status, .Ignore) catch {
|
||||
return version_str;
|
||||
};
|
||||
var git_describe = std.mem.trim(u8, git_describe_raw, " \n\r");
|
||||
git_describe = std.mem.trimLeft(u8, git_describe, "v");
|
||||
|
||||
switch (std.mem.count(u8, git_describe, "-")) {
|
||||
0 => {
|
||||
if (!std.mem.eql(u8, version_str, git_describe)) {
|
||||
std.debug.print("{s} version '{s}' does not match git tag: '{s}'\n", .{ name, version_str, git_describe });
|
||||
std.process.exit(1);
|
||||
}
|
||||
return version_str;
|
||||
},
|
||||
2 => {
|
||||
// Untagged development build (e.g. 0.10.0-dev.2025+ecf0050a9).
|
||||
var it = std.mem.splitScalar(u8, git_describe, '-');
|
||||
const tagged_ancestor = std.mem.trimLeft(u8, it.first(), "v");
|
||||
const commit_height = it.next().?;
|
||||
const commit_id = it.next().?;
|
||||
|
||||
const ancestor_ver = try std.SemanticVersion.parse(tagged_ancestor);
|
||||
if (version.order(ancestor_ver) != .gt) {
|
||||
std.debug.print("{s} version '{}' must be greater than tagged ancestor '{}'\n", .{ name, version, ancestor_ver });
|
||||
std.process.exit(1);
|
||||
}
|
||||
|
||||
// Check that the commit hash is prefixed with a 'g' (a Git convention).
|
||||
if (commit_id.len < 1 or commit_id[0] != 'g') {
|
||||
std.debug.print("Unexpected `git describe` output: {s}\n", .{git_describe});
|
||||
return version_str;
|
||||
}
|
||||
|
||||
// The version is reformatted in accordance with the https://semver.org specification.
|
||||
return b.fmt("{s}-dev.{s}+{s}", .{ version_str, commit_height, commit_id[1..] });
|
||||
},
|
||||
else => {
|
||||
std.debug.print("Unexpected `git describe` output: {s}\n", .{git_describe});
|
||||
return version_str;
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user