mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-11-10 22:18:54 +01:00
refactor: move run_command from util to common
Quoting ryanofsky: "util can be the library for things included in the kernel which the kernel can depend on, and common can be the library for other code that needs to be shared internally, but should not be part of the kernel or shared externally."
This commit is contained in:
@@ -133,6 +133,7 @@ BITCOIN_CORE_H = \
|
|||||||
clientversion.h \
|
clientversion.h \
|
||||||
coins.h \
|
coins.h \
|
||||||
common/bloom.h \
|
common/bloom.h \
|
||||||
|
common/run_command.h \
|
||||||
compat/assumptions.h \
|
compat/assumptions.h \
|
||||||
compat/byteswap.h \
|
compat/byteswap.h \
|
||||||
compat/compat.h \
|
compat/compat.h \
|
||||||
@@ -284,7 +285,6 @@ BITCOIN_CORE_H = \
|
|||||||
util/rbf.h \
|
util/rbf.h \
|
||||||
util/readwritefile.h \
|
util/readwritefile.h \
|
||||||
util/result.h \
|
util/result.h \
|
||||||
util/run_command.h \
|
|
||||||
util/serfloat.h \
|
util/serfloat.h \
|
||||||
util/settings.h \
|
util/settings.h \
|
||||||
util/sock.h \
|
util/sock.h \
|
||||||
@@ -617,7 +617,7 @@ libbitcoin_consensus_a_SOURCES = \
|
|||||||
version.h
|
version.h
|
||||||
|
|
||||||
# common: shared between bitcoind, and bitcoin-qt and non-server tools
|
# common: shared between bitcoind, and bitcoin-qt and non-server tools
|
||||||
libbitcoin_common_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
|
libbitcoin_common_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BOOST_CPPFLAGS)
|
||||||
libbitcoin_common_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
|
libbitcoin_common_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
|
||||||
libbitcoin_common_a_SOURCES = \
|
libbitcoin_common_a_SOURCES = \
|
||||||
base58.cpp \
|
base58.cpp \
|
||||||
@@ -625,6 +625,7 @@ libbitcoin_common_a_SOURCES = \
|
|||||||
chainparams.cpp \
|
chainparams.cpp \
|
||||||
coins.cpp \
|
coins.cpp \
|
||||||
common/bloom.cpp \
|
common/bloom.cpp \
|
||||||
|
common/run_command.cpp \
|
||||||
compressor.cpp \
|
compressor.cpp \
|
||||||
core_read.cpp \
|
core_read.cpp \
|
||||||
core_write.cpp \
|
core_write.cpp \
|
||||||
@@ -681,7 +682,6 @@ libbitcoin_util_a_SOURCES = \
|
|||||||
util/fees.cpp \
|
util/fees.cpp \
|
||||||
util/getuniquepath.cpp \
|
util/getuniquepath.cpp \
|
||||||
util/hasher.cpp \
|
util/hasher.cpp \
|
||||||
util/run_command.cpp \
|
|
||||||
util/sock.cpp \
|
util/sock.cpp \
|
||||||
util/syserror.cpp \
|
util/syserror.cpp \
|
||||||
util/system.cpp \
|
util/system.cpp \
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
#include <config/bitcoin-config.h>
|
#include <config/bitcoin-config.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <util/run_command.h>
|
#include <common/run_command.h>
|
||||||
|
|
||||||
#include <tinyformat.h>
|
#include <tinyformat.h>
|
||||||
#include <univalue.h>
|
#include <univalue.h>
|
||||||
@@ -2,8 +2,8 @@
|
|||||||
// Distributed under the MIT software license, see the accompanying
|
// Distributed under the MIT software license, see the accompanying
|
||||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||||
|
|
||||||
#ifndef BITCOIN_UTIL_RUN_COMMAND_H
|
#ifndef BITCOIN_COMMON_RUN_COMMAND_H
|
||||||
#define BITCOIN_UTIL_RUN_COMMAND_H
|
#define BITCOIN_COMMON_RUN_COMMAND_H
|
||||||
|
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
@@ -18,4 +18,4 @@ class UniValue;
|
|||||||
*/
|
*/
|
||||||
UniValue RunCommandParseJSON(const std::string& str_command, const std::string& str_std_in="");
|
UniValue RunCommandParseJSON(const std::string& str_command, const std::string& str_std_in="");
|
||||||
|
|
||||||
#endif // BITCOIN_UTIL_RUN_COMMAND_H
|
#endif // BITCOIN_COMMON_RUN_COMMAND_H
|
||||||
@@ -3,9 +3,9 @@
|
|||||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||||
|
|
||||||
#include <chainparams.h>
|
#include <chainparams.h>
|
||||||
|
#include <common/run_command.h>
|
||||||
#include <core_io.h>
|
#include <core_io.h>
|
||||||
#include <psbt.h>
|
#include <psbt.h>
|
||||||
#include <util/run_command.h>
|
|
||||||
#include <util/strencodings.h>
|
#include <util/strencodings.h>
|
||||||
#include <external_signer.h>
|
#include <external_signer.h>
|
||||||
|
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||||
//
|
//
|
||||||
#include <test/util/setup_common.h>
|
#include <test/util/setup_common.h>
|
||||||
#include <util/run_command.h>
|
#include <common/run_command.h>
|
||||||
#include <univalue.h>
|
#include <univalue.h>
|
||||||
|
|
||||||
#ifdef ENABLE_EXTERNAL_SIGNER
|
#ifdef ENABLE_EXTERNAL_SIGNER
|
||||||
|
|||||||
Reference in New Issue
Block a user