diff --git a/CMakeLists.txt b/CMakeLists.txt index c04b7542..05538782 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -73,7 +73,6 @@ 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(VersionMonero) include(VersionFeather) include_directories(${EASYLOGGING_INCLUDE}) diff --git a/cmake/VersionMonero.cmake b/cmake/VersionMonero.cmake deleted file mode 100644 index 4600c7ce..00000000 --- a/cmake/VersionMonero.cmake +++ /dev/null @@ -1,49 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright (c) 2020, The Monero Project. - -find_package(Git QUIET) -# Check what commit we're on -execute_process(COMMAND "${GIT_EXECUTABLE}" rev-parse --short=9 HEAD RESULT_VARIABLE RET OUTPUT_VARIABLE COMMIT OUTPUT_STRIP_TRAILING_WHITESPACE - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/monero) - -if(RET) - # Something went wrong, set the version tag to -unknown - - message(WARNING "Cannot determine current commit. Make sure that you are building either from a Git working tree or from a source archive.") - set(MONERO_BRANCH "unknown") -else() - string(SUBSTRING ${COMMIT} 0 9 COMMIT) - message(STATUS "You are currently on commit ${COMMIT}") - - # Get all the tags - execute_process(COMMAND "${GIT}" rev-list --tags --max-count=1 --abbrev-commit RESULT_VARIABLE RET OUTPUT_VARIABLE TAGGEDCOMMIT OUTPUT_STRIP_TRAILING_WHITESPACE) - - if(NOT TAGGEDCOMMIT) - message(STATUS "Cannot determine most recent tag. Make sure that you are building either from a Git working tree or from a source archive.") - set(MONERO_BRANCH "${COMMIT}") - else() - message(STATUS "The most recent tag was at ${TAGGEDCOMMIT}") - - # Check if we're building that tagged commit or a different one - if(COMMIT STREQUAL TAGGEDCOMMIT) - message(STATUS "You are building a tagged release") - set(MONERO_BRANCH "release") - else() - message(STATUS "You are ahead of or behind a tagged release") - set(MONERO_BRANCH "${COMMIT}") - endif() - endif() -endif() - -# Check latest tagged release -execute_process(COMMAND "${GIT_EXECUTABLE}" describe --abbrev=0 RESULT_VARIABLE RET OUTPUT_VARIABLE TAG OUTPUT_STRIP_TRAILING_WHITESPACE - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/monero) - -if(RET) - message(WARNING "Cannot determine most recent tag. Make sure that you are building either from a Git working tree or from a source archive.") - set(MONERO_VERSION "unknown") -else () - set(MONERO_VERSION "${TAG}") -endif() - -configure_file("cmake/config-feather.h.cmake" "${CMAKE_CURRENT_SOURCE_DIR}/src/config-feather.h") \ No newline at end of file diff --git a/cmake/config-feather.h.cmake b/cmake/config-feather.h.cmake index 4c565a5a..98fcd4fe 100644 --- a/cmake/config-feather.h.cmake +++ b/cmake/config-feather.h.cmake @@ -4,9 +4,6 @@ #define FEATHER_VERSION "@VERSION@" #define FEATHER_BRANCH "@FEATHER_BRANCH@" -#define MONERO_VERSION "@MONERO_VERSION@" -#define MONERO_BRANCH "@MONERO_BRANCH@" - #define TOR_VERSION "@TOR_VERSION@" #endif //FEATHER_VERSION_H diff --git a/src/dialog/DebugInfoDialog.cpp b/src/dialog/DebugInfoDialog.cpp index 433cb543..03a06591 100644 --- a/src/dialog/DebugInfoDialog.cpp +++ b/src/dialog/DebugInfoDialog.cpp @@ -46,7 +46,6 @@ void DebugInfoDialog::updateInfo() { torStatus = "Unknown"; ui->label_featherVersion->setText(QString("%1-%2").arg(FEATHER_VERSION, FEATHER_BRANCH)); - ui->label_moneroVersion->setText(QString("%1-%2").arg(MONERO_VERSION, MONERO_BRANCH)); ui->label_walletHeight->setText(QString::number(m_ctx->wallet->blockChainHeight())); ui->label_daemonHeight->setText(QString::number(m_ctx->wallet->daemonBlockChainHeight())); @@ -122,7 +121,6 @@ void DebugInfoDialog::copyToClipboad() { // Two spaces at the end of each line are for newlines in Markdown QString text = ""; text += QString("Feather version: %1 \n").arg(ui->label_featherVersion->text()); - text += QString("Monero version: %1 \n").arg(ui->label_moneroVersion->text()); text += QString("Wallet height: %1 \n").arg(ui->label_walletHeight->text()); text += QString("Daemon height: %1 \n").arg(ui->label_daemonHeight->text()); diff --git a/src/dialog/DebugInfoDialog.ui b/src/dialog/DebugInfoDialog.ui index 87c204ef..dc4c83fc 100644 --- a/src/dialog/DebugInfoDialog.ui +++ b/src/dialog/DebugInfoDialog.ui @@ -33,38 +33,21 @@ - - - - Monero version: - - - - - - TextLabel - - - Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse - - - - Qt::Horizontal - + Wallet height: - + TextLabel @@ -74,14 +57,14 @@ - + Daemon height: - + TextLabel @@ -91,14 +74,14 @@ - + Target height: - + TextLabel @@ -108,14 +91,14 @@ - + Restore height: - + TextLabel @@ -125,14 +108,14 @@ - + Synchronized: - + TextLabel @@ -142,21 +125,21 @@ - + Qt::Horizontal - + Remote node: - + TextLabel @@ -166,14 +149,14 @@ - + Wallet status: - + TextLabel @@ -183,14 +166,14 @@ - + Tor status: - + TextLabel @@ -200,14 +183,14 @@ - + Websocket status: - + TextLabel @@ -217,21 +200,21 @@ - + Qt::Horizontal - + Network type: - + TextLabel @@ -241,14 +224,14 @@ - + Seed type: - + TextLabel @@ -258,14 +241,14 @@ - + Device type: - + TextLabel @@ -275,14 +258,14 @@ - + View only: - + TextLabel @@ -292,14 +275,14 @@ - + Primary only: - + TextLabel @@ -309,21 +292,21 @@ - + Qt::Horizontal - + Operating system: - + TextLabel @@ -333,14 +316,14 @@ - + Timestamp: - + TextLabel