public/browser
1
0
Fork 0
mirror of https://github.com/lightpanda-io/browser.git synced 2025-10-29 15:13:28 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Add git_commit to build and build-dev target

Browse Source 
Add "version" command to cli.
This commit is contained in:
Karl Seguin
2025-02-26 10:21:35 +08:00
parent d501cbf765
commit d0ba06c44b
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@@ -59,13 +59,13 @@ download-zig:
## Build in release-safe mode ## Build in release-safe mode
build: build:
@printf "\e[36mBuilding (release safe)...\e[0m\n" @printf "\e[36mBuilding (release safe)...\e[0m\n"
@$(ZIG) build -Doptimize=ReleaseSafe -Dengine=v8 || (printf "\e[33mBuild ERROR\e[0m\n"; exit 1;) $(ZIG) build -Doptimize=ReleaseSafe -Dengine=v8 -Dgit_commit=$$(git rev-parse --short HEAD) || (printf "\e[33mBuild ERROR\e[0m\n"; exit 1;)
@printf "\e[33mBuild OK\e[0m\n" @printf "\e[33mBuild OK\e[0m\n"
## Build in debug mode ## Build in debug mode
build-dev: build-dev:
@printf "\e[36mBuilding (debug)...\e[0m\n" @printf "\e[36mBuilding (debug)...\e[0m\n"
@$(ZIG) build -Dengine=v8 || (printf "\e[33mBuild ERROR\e[0m\n"; exit 1;) @$(ZIG) build -Dengine=v8 -Dgit_commit=$$(git rev-parse --short HEAD) || (printf "\e[33mBuild ERROR\e[0m\n"; exit 1;)
@printf "\e[33mBuild OK\e[0m\n" @printf "\e[33mBuild OK\e[0m\n"
## Run the server in debug mode ## Run the server in debug mode

18
src/main.zig
View File

@@ -59,6 +59,10 @@ pub fn main() !void {
switch (args.mode) { switch (args.mode) {
.help => args.printUsageAndExit(args.mode.help), .help => args.printUsageAndExit(args.mode.help),
.version => {
std.debug.print("{s}\n", .{@import("build_info").git_commit});
return std.process.cleanExit();
},
.serve => |opts| { .serve => |opts| {
const address = std.net.Address.parseIp4(opts.host, opts.port) catch |err| { const address = std.net.Address.parseIp4(opts.host, opts.port) catch |err| {
log.err("address (host:port) {any}\n", .{err}); log.err("address (host:port) {any}\n", .{err});
@@ -125,12 +129,14 @@ const Command = struct {
help, help,
fetch, fetch,
serve, serve,
version,
}; };
const Mode = union(ModeType) { const Mode = union(ModeType) {
help: bool, // false when being printed because of an error help: bool, // false when being printed because of an error
fetch: Fetch, fetch: Fetch,
serve: Serve, serve: Serve,
version: void,
}; };
const Serve = struct { const Serve = struct {
@@ -172,10 +178,13 @@ const Command = struct {
\\--timeout Inactivity timeout in seconds before disconnecting clients \\--timeout Inactivity timeout in seconds before disconnecting clients
\\ Defaults to 3 (seconds) \\ Defaults to 3 (seconds)
\\ \\
\\version command
\\Displays the version of {s}
\\
\\help command \\help command
\\Displays this message \\Displays this message
; ;
std.debug.print(usage, .{ self.exec_name, self.exec_name, self.exec_name }); std.debug.print(usage, .{ self.exec_name, self.exec_name, self.exec_name, self.exec_name });
if (success) { if (success) {
return std.process.cleanExit(); return std.process.cleanExit();
} }
@@ -210,9 +219,10 @@ fn parseArgs(allocator: Allocator) !Command {
}; };
cmd.mode = switch (mode) { cmd.mode = switch (mode) {
.help => Command.Mode{ .help = true }, .help => .{ .help = true },
.serve => Command.Mode{ .serve = parseServeArgs(allocator, &args) catch return cmd }, .serve => .{ .serve = parseServeArgs(allocator, &args) catch return cmd },
.fetch => Command.Mode{ .fetch = parseFetchArgs(allocator, &args) catch return cmd }, .fetch => .{ .fetch = parseFetchArgs(allocator, &args) catch return cmd },
.version => .{ .version = {} },
}; };
return cmd; return cmd;
} }