[Scummvm-git-logs] scummvm master -> bbe40c58c5c921942b74c00904f8c0b2314a2bfd
lotharsm
noreply at scummvm.org
Sun Apr 12 12:42:43 UTC 2026
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
bbe40c58c5 BASE: GUI: Show version build date/time only on non-release builds
Commit: bbe40c58c5c921942b74c00904f8c0b2314a2bfd
https://github.com/scummvm/scummvm/commit/bbe40c58c5c921942b74c00904f8c0b2314a2bfd
Author: Lothar Serra Mari (mail at serra.me)
Date: 2026-04-12T14:38:56+02:00
Commit Message:
BASE: GUI: Show version build date/time only on non-release builds
Historically, we should the version build date wherever we display
the current ScummVM version.
However, this leads to issues with toolchains that care about reproducible
builds and thus set "fake" timestamps, e.g.
https://github.com/flathub/org.scummvm.ScummVM/pull/60#issuecomment-4150167445
Since we can derive the approximate release date based on our
new versioning scheme, it makes sense to hide the build date
from release builds and only use it for development builds
to keep track of "old" and "new" builds.
Changed paths:
base/version.cpp
gui/about.cpp
gui/launcher.cpp
diff --git a/base/version.cpp b/base/version.cpp
index c233e7a3c5a..e0cf813636a 100644
--- a/base/version.cpp
+++ b/base/version.cpp
@@ -80,7 +80,13 @@ const char gScummVMCompiler[] = ""
#undef STR
#undef STR_HELPER
;
-const char gScummVMFullVersion[] = "ScummVM " SCUMMVM_VERSION SCUMMVM_REVISION " (" __DATE__ " " __TIME__ ")";
+
+#ifdef RELEASE_BUILD
+ const char gScummVMFullVersion[] = "ScummVM " SCUMMVM_VERSION;
+#else
+ const char gScummVMFullVersion[] = "ScummVM " SCUMMVM_VERSION SCUMMVM_REVISION " (" __DATE__ " " __TIME__ ")";
+#endif
+
const char gScummVMFeatures[] = ""
#ifdef TAINTED_BUILD
// TAINTED means the build contains engines/subengines not enabled by default
diff --git a/gui/about.cpp b/gui/about.cpp
index b7f2b9a98b2..dcee678d062 100644
--- a/gui/about.cpp
+++ b/gui/about.cpp
@@ -108,8 +108,13 @@ void AboutDialog::buildLines() {
version += gScummVMVersion;
addLine(version);
+ #ifdef RELEASE_BUILD
+ // I18N: built with <compiler>
+ Common::U32String date = Common::U32String::format(_("(built with %s)"), gScummVMCompiler);
+ #else
// I18N: built on <build date> with <compiler>
Common::U32String date = Common::U32String::format(_("(built on %s with %s)"), gScummVMBuildDate, gScummVMCompiler);
+ #endif
addLine(Common::U32String("C2") + date);
for (i = 0; i < ARRAYSIZE(copyright_text); i++)
@@ -327,8 +332,8 @@ void AboutDialog::drawDialog(DrawLayer layerToDraw) {
Common::U32String renderStr(strLineItrBegin, strLineItrEnd);
if (!renderStr.empty())
// Center the text line within the _textRect
- g_gui.theme()->drawText(Common::Rect(_x + _textRect.left + _xOff, y, _x + _textRect.right - _xOff, y + g_gui.theme()->getFontHeight()),
- renderStr, state, align, ThemeEngine::kTextInversionNone, 0, false,
+ g_gui.theme()->drawText(Common::Rect(_x + _textRect.left + _xOff, y, _x + _textRect.right - _xOff, y + g_gui.theme()->getFontHeight()),
+ renderStr, state, align, ThemeEngine::kTextInversionNone, 0, false,
ThemeEngine::kFontStyleBold, ThemeEngine::kFontColorNormal, true, _textDrawableArea);
y += _lineHeight;
}
diff --git a/gui/launcher.cpp b/gui/launcher.cpp
index 2f8df9e7150..5adf5b3bc7d 100644
--- a/gui/launcher.cpp
+++ b/gui/launcher.cpp
@@ -257,7 +257,7 @@ void LauncherDialog::build() {
_logo = new GraphicsWidget(this, _title + ".Logo");
_logo->setGfxFromTheme(ThemeEngine::kImageLogo);
- new StaticTextWidget(this, _title + ".Version", Common::U32String(gScummVMVersionDate));
+ new StaticTextWidget(this, _title + ".Version", Common::U32String(gScummVMFullVersion));
} else
#endif
new StaticTextWidget(this, _title + ".Version", Common::U32String(gScummVMFullVersion));
@@ -888,7 +888,7 @@ void LauncherDialog::reflowLayout() {
StaticTextWidget *ver = (StaticTextWidget *)findWidget(Common::String(_title + ".Version").c_str());
if (ver) {
ver->setAlign(g_gui.xmlEval()->getWidgetTextHAlign(_title + ".Version"));
- ver->setLabel(Common::U32String(gScummVMVersionDate));
+ ver->setLabel(Common::U32String(gScummVMFullVersion));
}
if (!_logo)
More information about the Scummvm-git-logs
mailing list