From a4c82869a62d601147a693bc7280b9b12c7de086 Mon Sep 17 00:00:00 2001 From: sithlord48 Date: Fri, 18 Jul 2025 21:30:31 -0400 Subject: [PATCH] fix: split version info in new header a new file src/lib/VersionInfo.h.in now holds our version info vars fixes #8657 --- src/apps/deskflow-daemon/deskflow-daemon.cpp | 1 + src/apps/deskflow-gui/deskflow-gui.cpp | 1 + src/lib/CMakeLists.txt | 2 ++ src/lib/VersionInfo.h.in | 14 ++++++++++++++ src/lib/common/Constants.h.in | 6 ------ src/lib/deskflow/App.cpp | 1 + src/lib/gui/MainWindow.cpp | 1 + src/lib/gui/Messages.cpp | 1 + src/lib/gui/VersionChecker.cpp | 1 + src/lib/gui/dialogs/AboutDialog.cpp | 1 + 10 files changed, 23 insertions(+), 6 deletions(-) create mode 100644 src/lib/VersionInfo.h.in diff --git a/src/apps/deskflow-daemon/deskflow-daemon.cpp b/src/apps/deskflow-daemon/deskflow-daemon.cpp index b706b0241..0aa8f3bbe 100644 --- a/src/apps/deskflow-daemon/deskflow-daemon.cpp +++ b/src/apps/deskflow-daemon/deskflow-daemon.cpp @@ -5,6 +5,7 @@ * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception */ +#include "VersionInfo.h" #include "arch/Arch.h" #include "base/EventQueue.h" #include "base/Log.h" diff --git a/src/apps/deskflow-gui/deskflow-gui.cpp b/src/apps/deskflow-gui/deskflow-gui.cpp index 8d6cb03f1..a2dbf86d9 100644 --- a/src/apps/deskflow-gui/deskflow-gui.cpp +++ b/src/apps/deskflow-gui/deskflow-gui.cpp @@ -6,6 +6,7 @@ * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception */ +#include "VersionInfo.h" #include "common/Constants.h" #include "common/UrlConstants.h" #include "gui/Diagnostic.h" diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt index e936fa077..b327522b7 100644 --- a/src/lib/CMakeLists.txt +++ b/src/lib/CMakeLists.txt @@ -3,6 +3,8 @@ # SPDX-FileCopyrightText: 2009 - 2012 Nick Bolton # SPDX-License-Identifier: MIT +configure_file(VersionInfo.h.in VersionInfo.h @ONLY) + add_subdirectory(arch) add_subdirectory(base) add_subdirectory(client) diff --git a/src/lib/VersionInfo.h.in b/src/lib/VersionInfo.h.in new file mode 100644 index 000000000..4ec6d0988 --- /dev/null +++ b/src/lib/VersionInfo.h.in @@ -0,0 +1,14 @@ +/* + * Deskflow -- mouse and keyboard sharing utility + * SPDX-FileCopyrightText: (C) 2024 - 2025 Chris Rizzitello + * SPDX-FileCopyrightText: (C) 2025 Symless Ltd. + * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception + */ + +#pragma once + +const auto kVersion = "@CMAKE_PROJECT_VERSION@"; +const auto kVersionGitSha = "@GIT_SHA_SHORT@"; +// clang-format off +const auto kDisplayVersion = @CMAKE_PROJECT_VERSION_TWEAK@ ? "@CMAKE_PROJECT_VERSION@ (@GIT_SHA_SHORT@)" : "@CMAKE_PROJECT_VERSION_MAJOR@.@CMAKE_PROJECT_VERSION_MINOR@.@CMAKE_PROJECT_VERSION_PATCH@"; +// clang-format on diff --git a/src/lib/common/Constants.h.in b/src/lib/common/Constants.h.in index 5e71962ba..b784f92ce 100644 --- a/src/lib/common/Constants.h.in +++ b/src/lib/common/Constants.h.in @@ -10,17 +10,11 @@ const auto kAppName = "@CMAKE_PROJECT_PROPER_NAME@"; const auto kAppId = "@CMAKE_PROJECT_NAME@"; const auto kAppDescription = "@CMAKE_PROJECT_DESCRIPTION@"; -const auto kVersion = "@CMAKE_PROJECT_VERSION@"; -const auto kVersionGitSha = "@GIT_SHA_SHORT@"; const auto kDaemonBinName = "@CMAKE_PROJECT_NAME@-daemon"; const auto kDaemonIpcName = "@CMAKE_PROJECT_NAME@-daemon"; const auto kDaemonLogFilename = "@CMAKE_PROJECT_NAME@-daemon.log"; const auto kDefaultLogFile = "@CMAKE_PROJECT_NAME@.log"; -// clang-format off -const auto kDisplayVersion = @CMAKE_PROJECT_VERSION_TWEAK@ ? "@CMAKE_PROJECT_VERSION@ (@GIT_SHA_SHORT@)" : "@CMAKE_PROJECT_VERSION_MAJOR@.@CMAKE_PROJECT_VERSION_MINOR@.@CMAKE_PROJECT_VERSION_PATCH@"; -// clang-format on - const auto kCopyright = // "Copyright @CMAKE_PROJECT_COPYRIGHT@\n" "Copyright (C) 2012-2025 Symless Ltd.\n" diff --git a/src/lib/deskflow/App.cpp b/src/lib/deskflow/App.cpp index b718037f6..70f5008ad 100644 --- a/src/lib/deskflow/App.cpp +++ b/src/lib/deskflow/App.cpp @@ -8,6 +8,7 @@ #include "deskflow/App.h" #include "DisplayInvalidException.h" +#include "VersionInfo.h" #include "arch/Arch.h" #include "base/Log.h" #include "base/LogOutputters.h" diff --git a/src/lib/gui/MainWindow.cpp b/src/lib/gui/MainWindow.cpp index 7b997e22c..71b987008 100644 --- a/src/lib/gui/MainWindow.cpp +++ b/src/lib/gui/MainWindow.cpp @@ -11,6 +11,7 @@ #include "Diagnostic.h" #include "StyleUtils.h" +#include "VersionInfo.h" #include "dialogs/AboutDialog.h" #include "dialogs/FingerprintDialog.h" diff --git a/src/lib/gui/Messages.cpp b/src/lib/gui/Messages.cpp index a5f365268..a8a285f3d 100644 --- a/src/lib/gui/Messages.cpp +++ b/src/lib/gui/Messages.cpp @@ -8,6 +8,7 @@ #include "Logger.h" #include "Styles.h" +#include "VersionInfo.h" #include "common/Settings.h" #include "common/UrlConstants.h" diff --git a/src/lib/gui/VersionChecker.cpp b/src/lib/gui/VersionChecker.cpp index 763413e34..bda0ca87b 100644 --- a/src/lib/gui/VersionChecker.cpp +++ b/src/lib/gui/VersionChecker.cpp @@ -6,6 +6,7 @@ #include "VersionChecker.h" +#include "VersionInfo.h" #include "common/Settings.h" #include diff --git a/src/lib/gui/dialogs/AboutDialog.cpp b/src/lib/gui/dialogs/AboutDialog.cpp index 8d97a5161..4109866ec 100644 --- a/src/lib/gui/dialogs/AboutDialog.cpp +++ b/src/lib/gui/dialogs/AboutDialog.cpp @@ -9,6 +9,7 @@ #include "AboutDialog.h" #include "ui_AboutDialog.h" +#include "VersionInfo.h" #include "common/Constants.h" #include