Revert "Don't include commit hash"

This reverts commit 8b471bfee2.

CMakeLists.txt

@@ -57,6 +57,7 @@ get_directory_property(DEVICE_TREZOR_READY DIRECTORY "monero" DEFINITION DEVICE_
 get_directory_property(TREZOR_DEP_LIBS DIRECTORY "monero" DEFINITION TREZOR_DEP_LIBS)
 
 include(CMakePackageConfigHelpers)
+include(VersionFeather)
 
 include_directories(${EASYLOGGING_INCLUDE})
 link_directories(${EASYLOGGING_LIBRARY_DIRS})

cmake/VersionFeather.cmake

@@ -0,0 +1,27 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# SPDX-FileCopyrightText: 2020-2022 The Monero Project
+
+find_package(Git QUIET)
+
+# Sets FEATHER_COMMIT to the first 9 chars of the current commit hash.
+
+if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/githash.txt")
+    # This file added in source archives where the .git folder has been removed to optimize for space.
+    file(READ "githash.txt" COMMIT)
+    string(SUBSTRING ${COMMIT} 0 9 COMMIT)
+    message(STATUS "You are currently on commit ${COMMIT}")
+    set(FEATHER_COMMIT "${COMMIT}")
+else()
+    execute_process(COMMAND "${GIT_EXECUTABLE}" rev-parse --short=9 HEAD RESULT_VARIABLE RET OUTPUT_VARIABLE COMMIT OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+    if(RET)
+        message(WARNING "Cannot determine current commit. Make sure that you are building either from a Git working tree or from a source archive.")
+        set(FEATHER_COMMIT "unknown")
+    else()
+        string(SUBSTRING ${COMMIT} 0 9 COMMIT)
+        message(STATUS "You are currently on commit ${COMMIT}")
+        set(FEATHER_COMMIT "${COMMIT}")
+    endif()
+endif()
+
+configure_file("cmake/config-feather.h.cmake" "${CMAKE_CURRENT_SOURCE_DIR}/src/config-feather.h")

cmake/config-feather.h.cmake

@@ -2,6 +2,7 @@
 #define FEATHER_VERSION_H
 
 #define FEATHER_VERSION "@VERSION@"
+#define FEATHER_COMMIT "@FEATHER_COMMIT@"
 
 #define TOR_VERSION "@TOR_VERSION@"
 

src/assets/about.txt

@@ -1,4 +1,4 @@
-Feather <feather_version>
+Feather <feather_version> (<feather_git_head>)
 
 Copyright (c) 2020-<current_year>, The Monero Project
 

src/dialog/AboutDialog.cpp

@@ -19,6 +19,7 @@ AboutDialog::AboutDialog(QWidget *parent)
     auto about = Utils::fileOpenQRC(":assets/about.txt");
     auto about_text = Utils::barrayToString(about);
     about_text = about_text.replace("<feather_version>", FEATHER_VERSION);
+    about_text = about_text.replace("<feather_git_head>", FEATHER_COMMIT);
     about_text = about_text.replace("<current_year>", QString::number(QDate::currentDate().year()));
     ui->copyrightText->setPlainText(about_text);
 

src/dialog/DebugInfoDialog.cpp

@@ -45,7 +45,7 @@ void DebugInfoDialog::updateInfo() {
     else
         torStatus = "Unknown";
 
-    ui->label_featherVersion->setText(QString("%1").arg(FEATHER_VERSION));
+    ui->label_featherVersion->setText(QString("%1-%2").arg(FEATHER_VERSION, FEATHER_COMMIT));
 
     ui->label_walletHeight->setText(QString::number(m_ctx->wallet->blockChainHeight()));
     ui->label_daemonHeight->setText(QString::number(m_ctx->wallet->daemonBlockChainHeight()));