Skip to content

Commit ddcc518

Browse files
author
MarcoFalke
committed
Merge bitcoin#23828: scripted-diff: Rename libbitcoin_server.a to libbitcoin_node.a
172096e scripted-diff: Rename libbitcoin_server.a to libbitcoin_node.a (Russell Yanofsky) Pull request description: Goal along with namespacing PR bitcoin#23497 is to make code organization more obvious and have `src/node/` code in `node::` namespace in `libbitcoin_node.a` library ACKs for top commit: MarcoFalke: cr ACK 172096e Tree-SHA512: a2e787eeaa3ab769b0f5376473072cae584d237aa8b67b677bea833bb36b0134a0eca17eb01722389639473b8463f4953bc3a5e4801a6b2c8965ac1075cba005
2 parents 70395ba + 172096e commit ddcc518

16 files changed

+25
-25
lines changed

‎build_msvc/.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ packages/*
1313
libbitcoin_cli/libbitcoin_cli.vcxproj
1414
libbitcoin_common/libbitcoin_common.vcxproj
1515
libbitcoin_crypto/libbitcoin_crypto.vcxproj
16-
libbitcoin_server/libbitcoin_server.vcxproj
16+
libbitcoin_node/libbitcoin_node.vcxproj
1717
libbitcoin_util/libbitcoin_util.vcxproj
1818
libbitcoin_wallet_tool/libbitcoin_wallet_tool.vcxproj
1919
libbitcoin_wallet/libbitcoin_wallet.vcxproj

‎build_msvc/bench_bitcoin/bench_bitcoin.vcxproj.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<ProjectReference Include="..\libbitcoin_crypto\libbitcoin_crypto.vcxproj">
2222
<Project>{6190199c-6cf4-4dad-bfbd-93fa72a760c1}</Project>
2323
</ProjectReference>
24-
<ProjectReference Include="..\libbitcoin_server\libbitcoin_server.vcxproj">
24+
<ProjectReference Include="..\libbitcoin_node\libbitcoin_node.vcxproj">
2525
<Project>{460fee33-1fe1-483f-b3bf-931ff8e969a5}</Project>
2626
</ProjectReference>
2727
<ProjectReference Include="..\libbitcoin_util\libbitcoin_util.vcxproj">

‎build_msvc/bitcoin-qt/bitcoin-qt.vcxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<ProjectReference Include="..\libbitcoin_qt\libbitcoin_qt.vcxproj">
2929
<Project>{2b4abff8-d1fd-4845-88c9-1f3c0a6512bf}</Project>
3030
</ProjectReference>
31-
<ProjectReference Include="..\libbitcoin_server\libbitcoin_server.vcxproj">
31+
<ProjectReference Include="..\libbitcoin_node\libbitcoin_node.vcxproj">
3232
<Project>{460fee33-1fe1-483f-b3bf-931ff8e969a5}</Project>
3333
</ProjectReference>
3434
<ProjectReference Include="..\libbitcoin_util\libbitcoin_util.vcxproj">

‎build_msvc/bitcoin.sln‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbitcoin_common", "libbit
1212
EndProject
1313
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbitcoin_crypto", "libbitcoin_crypto\libbitcoin_crypto.vcxproj", "{6190199C-6CF4-4DAD-BFBD-93FA72A760C1}"
1414
EndProject
15-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbitcoin_server", "libbitcoin_server\libbitcoin_server.vcxproj", "{460FEE33-1FE1-483F-B3BF-931FF8E969A5}"
15+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbitcoin_node", "libbitcoin_node\libbitcoin_node.vcxproj", "{460FEE33-1FE1-483F-B3BF-931FF8E969A5}"
1616
EndProject
1717
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libunivalue", "libunivalue\libunivalue.vcxproj", "{5724BA7D-A09A-4BA8-800B-C4C1561B3D69}"
1818
EndProject

‎build_msvc/bitcoind/bitcoind.vcxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<ProjectReference Include="..\libbitcoin_crypto\libbitcoin_crypto.vcxproj">
2525
<Project>{6190199c-6cf4-4dad-bfbd-93fa72a760c1}</Project>
2626
</ProjectReference>
27-
<ProjectReference Include="..\libbitcoin_server\libbitcoin_server.vcxproj">
27+
<ProjectReference Include="..\libbitcoin_node\libbitcoin_node.vcxproj">
2828
<Project>{460fee33-1fe1-483f-b3bf-931ff8e969a5}</Project>
2929
</ProjectReference>
3030
<ProjectReference Include="..\libbitcoin_util\libbitcoin_util.vcxproj">

build_msvc/libbitcoin_server/libbitcoin_server.vcxproj.in renamed to build_msvc/libbitcoin_node/libbitcoin_node.vcxproj.in

File renamed without changes.

‎build_msvc/msvc-autogen.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
'libbitcoin_cli',
1616
'libbitcoin_common',
1717
'libbitcoin_crypto',
18-
'libbitcoin_server',
18+
'libbitcoin_node',
1919
'libbitcoin_util',
2020
'libbitcoin_wallet_tool',
2121
'libbitcoin_wallet',

‎build_msvc/test_bitcoin-qt/test_bitcoin-qt.vcxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<ProjectReference Include="..\libbitcoin_qt\libbitcoin_qt.vcxproj">
4141
<Project>{2b4abff8-d1fd-4845-88c9-1f3c0a6512bf}</Project>
4242
</ProjectReference>
43-
<ProjectReference Include="..\libbitcoin_server\libbitcoin_server.vcxproj">
43+
<ProjectReference Include="..\libbitcoin_node\libbitcoin_node.vcxproj">
4444
<Project>{460fee33-1fe1-483f-b3bf-931ff8e969a5}</Project>
4545
</ProjectReference>
4646
<ProjectReference Include="..\libbitcoin_util\libbitcoin_util.vcxproj">

‎build_msvc/test_bitcoin/test_bitcoin.vcxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<ProjectReference Include="..\libbitcoin_crypto\libbitcoin_crypto.vcxproj">
3535
<Project>{6190199c-6cf4-4dad-bfbd-93fa72a760c1}</Project>
3636
</ProjectReference>
37-
<ProjectReference Include="..\libbitcoin_server\libbitcoin_server.vcxproj">
37+
<ProjectReference Include="..\libbitcoin_node\libbitcoin_node.vcxproj">
3838
<Project>{460fee33-1fe1-483f-b3bf-931ff8e969a5}</Project>
3939
</ProjectReference>
4040
<ProjectReference Include="..\libbitcoin_util\libbitcoin_util.vcxproj">

‎src/Makefile.am‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ EXTRA_LIBRARIES =
1717

1818
BITCOIN_INCLUDES=-I$(builddir) -I$(srcdir)/$(MINISKETCH_INCLUDE_DIR_INT) -I$(srcdir)/secp256k1/include -I$(srcdir)/$(UNIVALUE_INCLUDE_DIR_INT) $(BDB_CPPFLAGS) $(BOOST_CPPFLAGS) $(LEVELDB_CPPFLAGS)
1919

20-
LIBBITCOIN_SERVER=libbitcoin_server.a
20+
LIBBITCOIN_NODE=libbitcoin_node.a
2121
LIBBITCOIN_COMMON=libbitcoin_common.a
2222
LIBBITCOIN_CONSENSUS=libbitcoin_consensus.a
2323
LIBBITCOIN_CLI=libbitcoin_cli.a
@@ -61,7 +61,7 @@ EXTRA_LIBRARIES += \
6161
$(LIBBITCOIN_UTIL) \
6262
$(LIBBITCOIN_COMMON) \
6363
$(LIBBITCOIN_CONSENSUS) \
64-
$(LIBBITCOIN_SERVER) \
64+
$(LIBBITCOIN_NODE) \
6565
$(LIBBITCOIN_CLI) \
6666
$(LIBBITCOIN_IPC) \
6767
$(LIBBITCOIN_WALLET) \
@@ -317,9 +317,9 @@ ipc/capnp/libbitcoin_ipc_a-ipc.$(OBJEXT): $(libbitcoin_ipc_mpgen_input:=.h)
317317
# Contains code accessing mempool and chain state that is meant to be separated
318318
# from wallet and gui code (see node/README.md). Shared code should go in
319319
# libbitcoin_common or libbitcoin_util libraries, instead.
320-
libbitcoin_server_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(MINIUPNPC_CPPFLAGS) $(NATPMP_CPPFLAGS) $(EVENT_CFLAGS) $(EVENT_PTHREADS_CFLAGS)
321-
libbitcoin_server_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
322-
libbitcoin_server_a_SOURCES = \
320+
libbitcoin_node_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(MINIUPNPC_CPPFLAGS) $(NATPMP_CPPFLAGS) $(EVENT_CFLAGS) $(EVENT_PTHREADS_CFLAGS)
321+
libbitcoin_node_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
322+
libbitcoin_node_a_SOURCES = \
323323
addrdb.cpp \
324324
addrman.cpp \
325325
banman.cpp \
@@ -382,10 +382,10 @@ libbitcoin_server_a_SOURCES = \
382382
$(BITCOIN_CORE_H)
383383

384384
if ENABLE_WALLET
385-
libbitcoin_server_a_SOURCES += wallet/init.cpp
385+
libbitcoin_node_a_SOURCES += wallet/init.cpp
386386
endif
387387
if !ENABLE_WALLET
388-
libbitcoin_server_a_SOURCES += dummywallet.cpp
388+
libbitcoin_node_a_SOURCES += dummywallet.cpp
389389
endif
390390

391391
if ENABLE_ZMQ
@@ -670,13 +670,13 @@ bitcoind_SOURCES = $(bitcoin_daemon_sources) init/bitcoind.cpp
670670
bitcoind_CPPFLAGS = $(bitcoin_bin_cppflags)
671671
bitcoind_CXXFLAGS = $(bitcoin_bin_cxxflags)
672672
bitcoind_LDFLAGS = $(bitcoin_bin_ldflags)
673-
bitcoind_LDADD = $(LIBBITCOIN_SERVER) $(bitcoin_bin_ldadd)
673+
bitcoind_LDADD = $(LIBBITCOIN_NODE) $(bitcoin_bin_ldadd)
674674

675675
bitcoin_node_SOURCES = $(bitcoin_daemon_sources) init/bitcoin-node.cpp
676676
bitcoin_node_CPPFLAGS = $(bitcoin_bin_cppflags)
677677
bitcoin_node_CXXFLAGS = $(bitcoin_bin_cxxflags)
678678
bitcoin_node_LDFLAGS = $(bitcoin_bin_ldflags)
679-
bitcoin_node_LDADD = $(LIBBITCOIN_SERVER) $(bitcoin_bin_ldadd) $(LIBBITCOIN_IPC) $(LIBMULTIPROCESS_LIBS)
679+
bitcoin_node_LDADD = $(LIBBITCOIN_NODE) $(bitcoin_bin_ldadd) $(LIBBITCOIN_IPC) $(LIBMULTIPROCESS_LIBS)
680680

681681
# bitcoin-cli binary #
682682
bitcoin_cli_SOURCES = bitcoin-cli.cpp

0 commit comments

Comments
 (0)