main: print monero version on startup

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e417caba0f2d7633a968f288d03d3c6563c0faf4..8364655f3670da7c6c4b9ce94dec4fdb69ad661c 100644 (file)
--- 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 29b5f52efd1d598100dc23cb86fe1be13745c78a..495479de7beef05b4d0ef3794a2a4270ea6e10bf 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -11,6 +11,7 @@
 #include <wallet/api/wallet2_api.h>
 #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<QString, QString> 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<QPair<QString, QString>> 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);
         }
     }