dburr/eden
1
0
Fork 0
mirror of https://git.eden-emu.dev/eden-emu/eden.git synced 2025-07-24 16:05:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix build ID and update checker (#148)

Browse source 
Signed-off-by: swurl <swurl@swurl.xyz>
Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/148
Co-authored-by: swurl <swurl@swurl.xyz>
Co-committed-by: swurl <swurl@swurl.xyz>
This commit is contained in:
swurl 2025-06-05 18:58:54 +00:00 • committed by crueter
parent d2364ae1f7
commit 7e13da47af
5 changed files with 45 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/common/scm_rev.cpp.in
View file

@ -17,6 +17,7 @@
#define BUILD_ID "@BUILD_ID@"
#define TITLE_BAR_FORMAT_IDLE "@TITLE_BAR_FORMAT_IDLE@"
#define TITLE_BAR_FORMAT_RUNNING "@TITLE_BAR_FORMAT_RUNNING@"
#define IS_DEV_BUILD @IS_DEV_BUILD@
namespace Common {
@ -30,6 +31,7 @@ const char g_build_version[] = BUILD_VERSION;
const char g_build_id[] = BUILD_ID;
const char g_title_bar_format_idle[] = TITLE_BAR_FORMAT_IDLE;
const char g_title_bar_format_running[] = TITLE_BAR_FORMAT_RUNNING;
const bool g_is_dev_build = IS_DEV_BUILD;
/// Anonymizes SCM data
/// This is quite weak. But better than nothing.

1
src/common/scm_rev.h
View file

@ -16,5 +16,6 @@ extern const char g_build_id[];
extern const char g_title_bar_format_idle[];
extern const char g_title_bar_format_running[];
extern const char g_shader_cache_version[];
extern const bool g_is_dev_build;
} // namespace Common

24
src/yuzu/about_dialog.cpp
View file

@ -1,21 +1,29 @@
// SPDX-FileCopyrightText: Copyright 2018 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
#include "yuzu/about_dialog.h"
#include <QIcon>
#include <fmt/ranges.h>
#include "common/scm_rev.h"
#include "ui_aboutdialog.h"
#include "yuzu/about_dialog.h"
#include <fmt/ranges.h>
AboutDialog::AboutDialog(QWidget* parent)
: QDialog(parent), ui{std::make_unique<Ui::AboutDialog>()} {
const auto branch_name = std::string(Common::g_scm_branch);
const auto description = std::string(Common::g_scm_desc);
: QDialog(parent)
, ui{std::make_unique<Ui::AboutDialog>()}
{
const auto description = std::string(Common::g_build_version);
const auto build_id = std::string(Common::g_build_id);
const auto yuzu_build = fmt::format("eden Development Build | {}-{}", branch_name, description);
const auto override_build =
fmt::format(fmt::runtime(std::string(Common::g_title_bar_format_idle)), build_id);
std::string yuzu_build;
if (Common::g_is_dev_build) {
yuzu_build = fmt::format("eden Nightly | {}-{}", description, build_id);
} else {
yuzu_build = fmt::format("eden | {}", description);
}
const auto override_build = fmt::format(fmt::runtime(
std::string(Common::g_title_bar_format_idle)),
build_id);
const auto yuzu_build_version = override_build.empty() ? yuzu_build : override_build;
ui->setupUi(this);

21
src/yuzu/main.cpp
View file

@ -420,13 +420,13 @@ GMainWindow::GMainWindow(bool has_broken_vulkan)
if (UISettings::values.check_for_updates) {
update_future = QtConcurrent::run([]() -> QString {
const bool is_prerelease =
((strstr(Common::g_build_fullname, "pre-alpha") != NULL) ||
(strstr(Common::g_build_fullname, "alpha") != NULL) ||
(strstr(Common::g_build_fullname, "beta") != NULL) ||
(strstr(Common::g_build_fullname, "rc") != NULL));
((strstr(Common::g_build_version, "pre-alpha") != NULL) ||
(strstr(Common::g_build_version, "alpha") != NULL) ||
(strstr(Common::g_build_version, "beta") != NULL) ||
(strstr(Common::g_build_version, "rc") != NULL));
const std::optional<std::string> latest_release_tag =
UpdateChecker::GetLatestRelease(is_prerelease);
if (latest_release_tag && latest_release_tag.value() != Common::g_build_fullname) {
if (latest_release_tag && latest_release_tag.value() != Common::g_build_version) {
return QString::fromStdString(latest_release_tag.value());
}
return QString{};
@ -4796,11 +4796,16 @@ void GMainWindow::OnEmulatorUpdateAvailable() {
void GMainWindow::UpdateWindowTitle(std::string_view title_name, std::string_view title_version,
std::string_view gpu_vendor) {
const auto branch_name = std::string(Common::g_scm_branch);
const auto description = std::string(Common::g_scm_desc);
const auto description = std::string(Common::g_build_version);
const auto build_id = std::string(Common::g_build_id);
const auto yuzu_title = fmt::format("eden | {}-{}", branch_name, description);
std::string yuzu_title;
if (Common::g_is_dev_build) {
yuzu_title = fmt::format("eden Nightly | {}-{}", description, build_id);
} else {
yuzu_title = fmt::format("eden | {}", description);
}
const auto override_title =
fmt::format(fmt::runtime(std::string(Common::g_title_bar_format_idle)), build_id);
const auto window_title = override_title.empty() ? yuzu_title : override_title;