Remove embedded Monero version string

This causes problems with source builds. It's also been inaccurate at
times where the latest tag wasn't pushed to our monero fork. Since the
Monero version can de derived from the Feather version anyway, it's not
worth keeping around.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c04b75429b4e19c5c5e57cad2e6bb6464726ba46..055387828c0824b181a1cbcc0e606f9000b22a44 100644 (file)
--- 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 (file)
index 4600c7c..0000000
--- 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 4c565a5a374e25960e1ee26a88d7a5c3c9198674..98fcd4fe344c4c5f875da40a0ed8122e3dc46f3b 100644 (file)
--- 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 433cb5436b25e58667cd8ecfe6c2b43b07412959..03a0659194418b65edd61ea664bf6cbf9f6d37f1 100644 (file)
--- 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 87c204ef20d5adba37171a829b8282201fb0dc53..dc4c83fccac8797fac871c4d13a2adcf4bf26583 100644 (file)
--- a/src/dialog/DebugInfoDialog.ui
+++ b/src/dialog/DebugInfoDialog.ui
@@ -33,38 +33,21 @@
        </property>
       </widget>
      </item>
-     <item row="1" column="0">
-      <widget class="QLabel" name="label_4">
-       <property name="text">
-        <string>Monero version:</string>
-       </property>
-      </widget>
-     </item>
      <item row="1" column="1">
-      <widget class="QLabel" name="label_moneroVersion">
-       <property name="text">
-        <string>TextLabel</string>
-       </property>
-       <property name="textInteractionFlags">
-        <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
-       </property>
-      </widget>
-     </item>
-     <item row="2" column="1">
       <widget class="Line" name="line">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
       </widget>
      </item>
-     <item row="3" column="0">
+     <item row="2" column="0">
       <widget class="QLabel" name="label_6">
        <property name="text">
         <string>Wallet height:</string>
        </property>
       </widget>
      </item>
-     <item row="3" column="1">
+     <item row="2" column="1">
       <widget class="QLabel" name="label_walletHeight">
        <property name="text">
         <string>TextLabel</string>
@@ -74,14 +57,14 @@
        </property>
       </widget>
      </item>
-     <item row="4" column="0">
+     <item row="3" column="0">
       <widget class="QLabel" name="label_12">
        <property name="text">
         <string>Daemon height:</string>
        </property>
       </widget>
      </item>
-     <item row="4" column="1">
+     <item row="3" column="1">
       <widget class="QLabel" name="label_daemonHeight">
        <property name="text">
         <string>TextLabel</string>
@@ -91,14 +74,14 @@
        </property>
       </widget>
      </item>
-     <item row="5" column="0">
+     <item row="4" column="0">
       <widget class="QLabel" name="label_5">
        <property name="text">
         <string>Target height:</string>
        </property>
       </widget>
      </item>
-     <item row="5" column="1">
+     <item row="4" column="1">
       <widget class="QLabel" name="label_targetHeight">
        <property name="text">
         <string>TextLabel</string>
@@ -108,14 +91,14 @@
        </property>
       </widget>
      </item>
-     <item row="6" column="0">
+     <item row="5" column="0">
       <widget class="QLabel" name="label_10">
        <property name="text">
         <string>Restore height:</string>
        </property>
       </widget>
      </item>
-     <item row="6" column="1">
+     <item row="5" column="1">
       <widget class="QLabel" name="label_restoreHeight">
        <property name="text">
         <string>TextLabel</string>
@@ -125,14 +108,14 @@
        </property>
       </widget>
      </item>
-     <item row="7" column="0">
+     <item row="6" column="0">
       <widget class="QLabel" name="label_9">
        <property name="text">
         <string>Synchronized:</string>
        </property>
       </widget>
      </item>
-     <item row="7" column="1">
+     <item row="6" column="1">
       <widget class="QLabel" name="label_synchronized">
        <property name="text">
         <string>TextLabel</string>
@@ -142,21 +125,21 @@
        </property>
       </widget>
      </item>
-     <item row="8" column="1">
+     <item row="7" column="1">
       <widget class="Line" name="line_2">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
       </widget>
      </item>
-     <item row="9" column="0">
+     <item row="8" column="0">
       <widget class="QLabel" name="label_27">
        <property name="text">
         <string>Remote node:</string>
        </property>
       </widget>
      </item>
-     <item row="9" column="1">
+     <item row="8" column="1">
       <widget class="QLabel" name="label_remoteNode">
        <property name="text">
         <string>TextLabel</string>
@@ -166,14 +149,14 @@
        </property>
       </widget>
      </item>
-     <item row="10" column="0">
+     <item row="9" column="0">
       <widget class="QLabel" name="label_17">
        <property name="text">
         <string>Wallet status:</string>
        </property>
       </widget>
      </item>
-     <item row="10" column="1">
+     <item row="9" column="1">
       <widget class="QLabel" name="label_walletStatus">
        <property name="text">
         <string>TextLabel</string>
@@ -183,14 +166,14 @@
        </property>
       </widget>
      </item>
-     <item row="11" column="0">
+     <item row="10" column="0">
       <widget class="QLabel" name="label_18">
        <property name="text">
         <string>Tor status:</string>
        </property>
       </widget>
      </item>
-     <item row="11" column="1">
+     <item row="10" column="1">
       <widget class="QLabel" name="label_torStatus">
        <property name="text">
         <string>TextLabel</string>
@@ -200,14 +183,14 @@
        </property>
       </widget>
      </item>
-     <item row="12" column="0">
+     <item row="11" column="0">
       <widget class="QLabel" name="label_19">
        <property name="text">
         <string>Websocket status:</string>
        </property>
       </widget>
      </item>
-     <item row="12" column="1">
+     <item row="11" column="1">
       <widget class="QLabel" name="label_websocketStatus">
        <property name="text">
         <string>TextLabel</string>
@@ -217,21 +200,21 @@
        </property>
       </widget>
      </item>
-     <item row="13" column="1">
+     <item row="12" column="1">
       <widget class="Line" name="line_3">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
       </widget>
      </item>
-     <item row="14" column="0">
+     <item row="13" column="0">
       <widget class="QLabel" name="label_2">
        <property name="text">
         <string>Network type:</string>
        </property>
       </widget>
      </item>
-     <item row="14" column="1">
+     <item row="13" column="1">
       <widget class="QLabel" name="label_netType">
        <property name="text">
         <string>TextLabel</string>
@@ -241,14 +224,14 @@
        </property>
       </widget>
      </item>
-     <item row="15" column="0">
+     <item row="14" column="0">
       <widget class="QLabel" name="label_23">
        <property name="text">
         <string>Seed type:</string>
        </property>
       </widget>
      </item>
-     <item row="15" column="1">
+     <item row="14" column="1">
       <widget class="QLabel" name="label_seedType">
        <property name="text">
         <string>TextLabel</string>
@@ -258,14 +241,14 @@
        </property>
       </widget>
      </item>
-     <item row="16" column="0">
+     <item row="15" column="0">
       <widget class="QLabel" name="label_8">
        <property name="text">
         <string>Device type:</string>
        </property>
       </widget>
      </item>
-     <item row="16" column="1">
+     <item row="15" column="1">
       <widget class="QLabel" name="label_deviceType">
        <property name="text">
         <string>TextLabel</string>
@@ -275,14 +258,14 @@
        </property>
       </widget>
      </item>
-     <item row="17" column="0">
+     <item row="16" column="0">
       <widget class="QLabel" name="label_7">
        <property name="text">
         <string>View only:</string>
        </property>
       </widget>
      </item>
-     <item row="17" column="1">
+     <item row="16" column="1">
       <widget class="QLabel" name="label_viewOnly">
        <property name="text">
         <string>TextLabel</string>
@@ -292,14 +275,14 @@
        </property>
       </widget>
      </item>
-     <item row="18" column="0">
+     <item row="17" column="0">
       <widget class="QLabel" name="label_11">
        <property name="text">
         <string>Primary only:</string>
        </property>
       </widget>
      </item>
-     <item row="18" column="1">
+     <item row="17" column="1">
       <widget class="QLabel" name="label_primaryOnly">
        <property name="text">
         <string>TextLabel</string>
@@ -309,21 +292,21 @@
        </property>
       </widget>
      </item>
-     <item row="19" column="1">
+     <item row="18" column="1">
       <widget class="Line" name="line_4">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
       </widget>
      </item>
-     <item row="20" column="0">
+     <item row="19" column="0">
       <widget class="QLabel" name="label_3">
        <property name="text">
         <string>Operating system:</string>
        </property>
       </widget>
      </item>
-     <item row="20" column="1">
+     <item row="19" column="1">
       <widget class="QLabel" name="label_OS">
        <property name="text">
         <string>TextLabel</string>
@@ -333,14 +316,14 @@
        </property>
       </widget>
      </item>
-     <item row="21" column="0">
+     <item row="20" column="0">
       <widget class="QLabel" name="label_24">
        <property name="text">
         <string>Timestamp:</string>
        </property>
       </widget>
      </item>
-     <item row="21" column="1">
+     <item row="20" column="1">
       <widget class="QLabel" name="label_timestamp">
        <property name="text">
         <string>TextLabel</string>