RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 22:48:11 +00:00
Code Issues Activity Actions

LibCore+LibGUI: Define a Serenity version in LibCore

Browse source 
Before, `AboutDialog` and `ArgsParser` read from a build-time created
file called `/res/version.ini`. This caused problems with utilities
unveiling specific paths leaving the version file unaccessible.

This commit hard-codes a serenity version in `LibCore`, and use it in
`ArgsParser` and `AboutDialog`.

The previous version contained the hash of the last GIT commit, this is
omitted for the default use for the sake of simplicity.
This commit is contained in:
Mahmoud Mandour 2021-08-29 11:51:42 +02:00 • committed by Linus Groh
parent e3f7753233
commit ad80d4dce0
3 changed files with 19 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -7,7 +7,7 @@
#include <AK/Format.h>
#include <AK/StringBuilder.h>
#include <LibCore/ArgsParser.h>
#include <LibCore/ConfigFile.h>
#include <LibCore/Version.h>
#include <getopt.h>
#include <limits.h>
#include <math.h>
@ -245,16 +245,7 @@ void ArgsParser::print_usage(FILE* file, const char* argv0)
void ArgsParser::print_version(FILE* file)
{
auto version_config = Core::ConfigFile::open("/res/version.ini");
auto major_version = version_config->read_entry("Version", "Major", "0");
auto minor_version = version_config->read_entry("Version", "Minor", "0");
StringBuilder builder;
builder.appendff("{}.{}", major_version, minor_version);
if (auto git_version = version_config->read_entry("Version", "Git", ""); git_version != "")
builder.appendff(".g{}", git_version);
outln(file, builder.to_string());
outln(file, Core::Version::SERENITY_VERSION);
}
void ArgsParser::add_option(Option&& option)