Ecosystem/feather
Ecosystem/feather
1
0
Fork 0
mirror of https://github.com/feather-wallet/feather.git synced 2024-11-16 17:27:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't include commit hash

Browse source
This commit is contained in:
tobtoht 2022-08-02 13:30:09 +02:00
parent cfd85fac8a
commit 8b471bfee2
6 changed files with 2 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CMakeLists.txt
View file

@ -57,7 +57,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(VersionFeather)
include_directories(${EASYLOGGING_INCLUDE})
link_directories(${EASYLOGGING_LIBRARY_DIRS})

27
cmake/VersionFeather.cmake
View file

@ -1,27 +0,0 @@
# 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")

1
cmake/config-feather.h.cmake
View file

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

2
src/assets/about.txt
View file

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

1
src/dialog/AboutDialog.cpp
View file

@ -19,7 +19,6 @@ 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);

2
src/dialog/DebugInfoDialog.cpp
View file

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