GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-14 12:43:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

MERGE-FIX: Rebrand bitcoin-wallet to elements-wallet

Browse source
This commit is contained in:
Steven Roose 2019-05-20 16:21:25 +01:00
parent 39c2906dca
commit de5dc03251
No known key found for this signature in database
GPG key ID: 2F2A88D7F8D68E87
2 changed files with 15 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/Makefile.am
View file

@ -93,7 +93,7 @@ if BUILD_BITCOIN_TX
endif
if ENABLE_WALLET
if BUILD_BITCOIN_WALLET
bin_PROGRAMS += bitcoin-wallet
bin_PROGRAMS += elements-wallet
endif
endif
@ -583,16 +583,16 @@ elements_tx_LDADD += $(BOOST_LIBS) $(CRYPTO_LIBS)
#
# bitcoin-wallet binary #
bitcoin_wallet_SOURCES = bitcoin-wallet.cpp
bitcoin_wallet_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
bitcoin_wallet_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
bitcoin_wallet_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
elements_wallet_SOURCES = bitcoin-wallet.cpp
elements_wallet_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
elements_wallet_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
elements_wallet_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
if TARGET_WINDOWS
bitcoin_wallet_SOURCES += bitcoin-wallet-res.rc
elements_wallet_SOURCES += bitcoin-wallet-res.rc
endif
bitcoin_wallet_LDADD = \
elements_wallet_LDADD = \
$(LIBBITCOIN_WALLET_TOOL) \
$(LIBBITCOIN_WALLET) \
$(LIBBITCOIN_SERVER) \
@ -600,12 +600,13 @@ bitcoin_wallet_LDADD = \
$(LIBBITCOIN_CONSENSUS) \
$(LIBBITCOIN_UTIL) \
$(LIBBITCOIN_CRYPTO) \
$(LIBUNIVALUE) \
$(LIBLEVELDB) \
$(LIBLEVELDB_SSE42) \
$(LIBMEMENV) \
$(LIBSECP256K1)
bitcoin_wallet_LDADD += $(BOOST_LIBS) $(BDB_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS)
elements_wallet_LDADD += $(BOOST_LIBS) $(BDB_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS) $(EVENT_LIBS)
#
# bitcoinconsensus library #

12
src/bitcoin-wallet.cpp
View file

@ -41,12 +41,12 @@ static bool WalletAppInit(int argc, char* argv[])
return false;
}
if (argc < 2 || HelpRequested(gArgs)) {
std::string usage = strprintf("%s bitcoin-wallet version", PACKAGE_NAME) + " " + FormatFullVersion() + "\n\n" +
"wallet-tool is an offline tool for creating and interacting with Bitcoin Core wallet files.\n" +
"By default wallet-tool will act on wallets in the default mainnet wallet directory in the datadir.\n" +
"To change the target wallet, use the -datadir, -wallet and -testnet/-regtest arguments.\n\n" +
std::string usage = strprintf("%s elements-wallet version", PACKAGE_NAME) + " " + FormatFullVersion() + "\n\n" +
"wallet-tool is an offline tool for creating and interacting with Elements Core wallet files.\n" +
"By default wallet-tool will act on wallets in the default wallet directory in the datadir.\n" +
"To change the target wallet, use the -datadir, -wallet and -chain arguments.\n\n" +
"Usage:\n" +
" bitcoin-wallet [options] <command>\n\n" +
" elements-wallet [options] <command>\n\n" +
gArgs.GetHelpMessage();
fprintf(stdout, "%s", usage.c_str());
@ -96,7 +96,7 @@ int main(int argc, char* argv[])
}
if (method.empty()) {
fprintf(stderr, "No method provided. Run `bitcoin-wallet -help` for valid methods.\n");
fprintf(stderr, "No method provided. Run `elements-wallet -help` for valid methods.\n");
return EXIT_FAILURE;
}