summaryrefslogtreecommitdiff
path: root/Userland/Libraries/LibCore
diff options
context:
space:
mode:
authorMahmoud Mandour <ma.mandourr@gmail.com>2021-08-29 11:51:42 +0200
committerLinus Groh <mail@linusgroh.de>2021-09-02 16:17:18 +0100
commitad80d4dce017837f5f5e2382e8ecbeb279886ca2 (patch)
tree6425d39b80adc83929c4f5f44d735cd88bdf2843 /Userland/Libraries/LibCore
parente3f7753233755d7369671ba4aa8582c1fb1bcb28 (diff)
downloadserenity-ad80d4dce017837f5f5e2382e8ecbeb279886ca2.zip
LibCore+LibGUI: Define a Serenity version in LibCore
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.
Diffstat (limited to 'Userland/Libraries/LibCore')
-rw-r--r--Userland/Libraries/LibCore/ArgsParser.cpp13
-rw-r--r--Userland/Libraries/LibCore/Version.h15
2 files changed, 17 insertions, 11 deletions
diff --git a/Userland/Libraries/LibCore/ArgsParser.cpp b/Userland/Libraries/LibCore/ArgsParser.cpp
index a10d16a555..54a362331f 100644
--- a/Userland/Libraries/LibCore/ArgsParser.cpp
+++ b/Userland/Libraries/LibCore/ArgsParser.cpp
@@ -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)
diff --git a/Userland/Libraries/LibCore/Version.h b/Userland/Libraries/LibCore/Version.h
new file mode 100644
index 0000000000..fd4fcced5b
--- /dev/null
+++ b/Userland/Libraries/LibCore/Version.h
@@ -0,0 +1,15 @@
+/*
+ * Copyright (c) 2021, Mahmoud Mandour <ma.mandourr@gmail.com>
+ *
+ * SPDX-License-Identifier: BSD-2-Clause
+ */
+
+#pragma once
+
+#include <AK/StringView.h>
+
+namespace Core::Version {
+
+constexpr StringView SERENITY_VERSION = "Version 1.0"sv;
+
+}