mirror of
https://github.com/dashpay/dash.git
synced 2024-12-25 03:52:49 +01:00
a640c6585a
2d7534bd93ec78609e187beaea64f1d1bdb1f81a wallet: use PACKAGE_NAME instead of "Bitcoin" in rpcdump (fanquake)
14b480240539eee8d296ed1ac6ec674b34635433 wallet: use FormatFullVersion instead of CLIENT_BUILD in rpcdump (fanquake)
Pull request description:
The dumpwallet RPC is the last place we're using CLIENT_BUILD directly, rather FormatFullVersion() (which just returns it), so switch to using that. At the same time, use PACKAGE_NAME (Bitcoin Core), rather than just "Bitcoin".
ACKs for top commit:
MarcoFalke:
cr ACK 2d7534bd93ec78609e187beaea64f1d1bdb1f81a
laanwj:
Tested ACK 2d7534bd93ec78609e187beaea64f1d1bdb1f81a
achow101:
ACK 2d7534bd93ec78609e187beaea64f1d1bdb1f81a
Zero-1729:
crACK 2d7534b
Tree-SHA512: b38ee074e317448719d2a628380786ec665413515b38d9ce680c21608bc2acf6a2bf817f78f100a8310477613ae72d6969cc4f595f4f44af0896659d3ebf2671
47 lines
1.7 KiB
C++
47 lines
1.7 KiB
C++
// Copyright (c) 2009-2020 The Bitcoin Core developers
|
|
// Distributed under the MIT software license, see the accompanying
|
|
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
|
|
|
#ifndef BITCOIN_CLIENTVERSION_H
|
|
#define BITCOIN_CLIENTVERSION_H
|
|
|
|
#include <util/macros.h>
|
|
|
|
#if defined(HAVE_CONFIG_H)
|
|
#include <config/bitcoin-config.h>
|
|
#endif //HAVE_CONFIG_H
|
|
|
|
// Check that required client information is defined
|
|
#if !defined(CLIENT_VERSION_MAJOR) || !defined(CLIENT_VERSION_MINOR) || !defined(CLIENT_VERSION_BUILD) || !defined(CLIENT_VERSION_IS_RELEASE) || !defined(COPYRIGHT_YEAR)
|
|
#error Client version information missing: version is not defined by bitcoin-config.h or in any other way
|
|
#endif
|
|
|
|
//! Copyright string used in Windows .rc files
|
|
#define COPYRIGHT_STR "2009-" STRINGIZE(COPYRIGHT_YEAR) " The Bitcoin Core Developers, 2014-" STRINGIZE(COPYRIGHT_YEAR) " " COPYRIGHT_HOLDERS_FINAL
|
|
|
|
/**
|
|
* dashd-res.rc includes this file, but it cannot cope with real c++ code.
|
|
* WINDRES_PREPROC is defined to indicate that its pre-processor is running.
|
|
* Anything other than a define should be guarded below.
|
|
*/
|
|
|
|
#if !defined(WINDRES_PREPROC)
|
|
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
static const int CLIENT_VERSION =
|
|
10000 * CLIENT_VERSION_MAJOR
|
|
+ 100 * CLIENT_VERSION_MINOR
|
|
+ 1 * CLIENT_VERSION_BUILD;
|
|
|
|
extern const std::string CLIENT_NAME;
|
|
|
|
std::string FormatVersion(int nVersion);
|
|
std::string FormatFullVersion();
|
|
std::string FormatSubVersion(const std::string& name, int nClientVersion, const std::vector<std::string>& comments);
|
|
|
|
#endif // WINDRES_PREPROC
|
|
|
|
#endif // BITCOIN_CLIENTVERSION_H
|