From 7222005e0cbb5d765396de380ed10ef0ba7542cd Mon Sep 17 00:00:00 2001 From: tobtoht Date: Thu, 10 Apr 2025 03:07:24 +0200 Subject: [PATCH] main: print monero version on startup --- src/CMakeLists.txt | 1 + src/main.cpp | 26 +++++++++++--------------- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e417caba..8364655f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -269,6 +269,7 @@ target_link_libraries(feather PRIVATE epee easylogging ringct + version ${Boost_LIBRARIES} ${OPENSSL_LIBRARIES} ${EXTRA_LIBRARIES} diff --git a/src/main.cpp b/src/main.cpp index 29b5f52e..495479de 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -11,6 +11,7 @@ #include #include "libwalletqt/Wallet.h" #include "libwalletqt/WalletManager.h" +#include "version.h" #if defined(Q_OS_LINUX) && defined(STACK_TRACE) #define BOOST_STACKTRACE_LINK @@ -180,21 +181,16 @@ if (AttachConsole(ATTACH_PARENT_PROCESS)) { conf()->set(Config::restartRequired, false); if (!quiet) { - QMap info; - info["Qt"] = QT_VERSION_STR; - info["Feather"] = FEATHER_VERSION; - if (stagenet) info["Mode"] = "Stagenet"; - else if (testnet) info["Mode"] = "Testnet"; - else info["Mode"] = "Mainnet"; - info["SSL"] = QSslSocket::sslLibraryVersionString(); - info["SSL build"] = QSslSocket::sslLibraryBuildVersionString(); -#if defined(TOR_VERSION) - info["Tor version"] = TOR_VERSION; -#else - info["Tor version"] = "Not bundled"; -#endif - for (const QString &k: info.keys()) { - qWarning().nospace().noquote() << QString("%1: %2").arg(k, info[k]); + QList> info; + info.emplace_back("Feather", FEATHER_VERSION); + info.emplace_back("Monero", MONERO_VERSION); + info.emplace_back("Qt", QT_VERSION_STR); + info.emplace_back("Tor", TOR_VERSION); + info.emplace_back("SSL", QSslSocket::sslLibraryVersionString()); + info.emplace_back("Mode", stagenet ? "Stagenet" : (testnet ? "Testnet" : "Mainnet")); + + for (const auto &k: info) { + qWarning().nospace().noquote() << QString("%1: %2").arg(k.first, k.second); } } -- 2.52.0