RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 20:07:36 +00:00
Code Issues Activity Actions

LibCore: Add default version for Lagom applications

Browse source 
Instead of grabbing `uname -vr` on non-Serenity platforms, let's just
hardcode a version. This prevents Lagom builds of applications like
Shell or Ladybird from reporting their version as that of the host OS.
This commit is contained in:
Andrew Kaster 2023-08-19 16:31:07 -06:00 • committed by Tim Flynn
parent 39e79d6f6f
commit b7f9634f6c
2 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Userland/Libraries/LibCore/ArgsParser.cpp
View file

@ -383,6 +383,8 @@ void ArgsParser::print_usage_markdown(FILE* file, StringView argv0)
void ArgsParser::print_version(FILE* file) void ArgsParser::print_version(FILE* file)
{ {
// FIXME: Allow applications to override version string for --version.
// Especially useful for Lagom applications
outln(file, Core::Version::read_long_version_string().release_value_but_fixme_should_propagate_errors()); outln(file, Core::Version::read_long_version_string().release_value_but_fixme_should_propagate_errors());
} }

4
Userland/Libraries/LibCore/Version.cpp
View file

@ -12,12 +12,16 @@ namespace Core::Version {
ErrorOr<String> read_long_version_string() ErrorOr<String> read_long_version_string()
{ {
#ifdef AK_OS_SERENITY
auto uname = TRY(Core::System::uname()); auto uname = TRY(Core::System::uname());
auto const* version = uname.release; auto const* version = uname.release;
auto const* git_hash = uname.version; auto const* git_hash = uname.version;
return String::formatted("Version {} revision {}", version, git_hash); return String::formatted("Version {} revision {}", version, git_hash);
#else
return String::from_utf8("Version 1.0"sv);
#endif
} }
} }