From 172096e9dd5b0e04b88ffd6dc1f6d43190070e14 Mon Sep 17 00:00:00 2001 From: Russell Yanofsky Date: Mon, 20 Dec 2021 10:53:01 -0500 Subject: scripted-diff: Rename libbitcoin_server.a to libbitcoin_node.a Goal along with namespacing PR #23497 is to have src/node/ code in node:: namespace in libbitcoin_node.a library -BEGIN VERIFY SCRIPT- bash -c ' # Bash shell needed for brace expansion {a,b} git mv build_msvc/libbitcoin_{server,node} git mv build_msvc/libbitcoin_node/libbitcoin_{server,node}.vcxproj.in ren() { git grep -l "$1" src build_msvc | xargs sed -i "s/$1/$2/g"; } ren LIBBITCOIN_{SERVER,NODE} ren libbitcoin_{server,node} ' -END VERIFY SCRIPT- --- build_msvc/.gitignore | 2 +- build_msvc/bench_bitcoin/bench_bitcoin.vcxproj.in | 2 +- build_msvc/bitcoin-qt/bitcoin-qt.vcxproj | 2 +- build_msvc/bitcoin.sln | 2 +- build_msvc/bitcoind/bitcoind.vcxproj | 2 +- build_msvc/libbitcoin_node/libbitcoin_node.vcxproj.in | 19 +++++++++++++++++++ .../libbitcoin_server/libbitcoin_server.vcxproj.in | 19 ------------------- build_msvc/msvc-autogen.py | 2 +- build_msvc/test_bitcoin-qt/test_bitcoin-qt.vcxproj | 2 +- build_msvc/test_bitcoin/test_bitcoin.vcxproj | 2 +- 10 files changed, 27 insertions(+), 27 deletions(-) create mode 100644 build_msvc/libbitcoin_node/libbitcoin_node.vcxproj.in delete mode 100644 build_msvc/libbitcoin_server/libbitcoin_server.vcxproj.in (limited to 'build_msvc') diff --git a/build_msvc/.gitignore b/build_msvc/.gitignore index ae8120fdf3..f70eea5b04 100644 --- a/build_msvc/.gitignore +++ b/build_msvc/.gitignore @@ -13,7 +13,7 @@ packages/* libbitcoin_cli/libbitcoin_cli.vcxproj libbitcoin_common/libbitcoin_common.vcxproj libbitcoin_crypto/libbitcoin_crypto.vcxproj -libbitcoin_server/libbitcoin_server.vcxproj +libbitcoin_node/libbitcoin_node.vcxproj libbitcoin_util/libbitcoin_util.vcxproj libbitcoin_wallet_tool/libbitcoin_wallet_tool.vcxproj libbitcoin_wallet/libbitcoin_wallet.vcxproj diff --git a/build_msvc/bench_bitcoin/bench_bitcoin.vcxproj.in b/build_msvc/bench_bitcoin/bench_bitcoin.vcxproj.in index 128c1bd8e7..fc9d7cbed6 100644 --- a/build_msvc/bench_bitcoin/bench_bitcoin.vcxproj.in +++ b/build_msvc/bench_bitcoin/bench_bitcoin.vcxproj.in @@ -21,7 +21,7 @@ {6190199c-6cf4-4dad-bfbd-93fa72a760c1} - + {460fee33-1fe1-483f-b3bf-931ff8e969a5} diff --git a/build_msvc/bitcoin-qt/bitcoin-qt.vcxproj b/build_msvc/bitcoin-qt/bitcoin-qt.vcxproj index 2800a42767..0d6358e0d0 100644 --- a/build_msvc/bitcoin-qt/bitcoin-qt.vcxproj +++ b/build_msvc/bitcoin-qt/bitcoin-qt.vcxproj @@ -28,7 +28,7 @@ {2b4abff8-d1fd-4845-88c9-1f3c0a6512bf} - + {460fee33-1fe1-483f-b3bf-931ff8e969a5} diff --git a/build_msvc/bitcoin.sln b/build_msvc/bitcoin.sln index b2ab64a34b..2a1ccf58fe 100644 --- a/build_msvc/bitcoin.sln +++ b/build_msvc/bitcoin.sln @@ -12,7 +12,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbitcoin_common", "libbit EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbitcoin_crypto", "libbitcoin_crypto\libbitcoin_crypto.vcxproj", "{6190199C-6CF4-4DAD-BFBD-93FA72A760C1}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbitcoin_server", "libbitcoin_server\libbitcoin_server.vcxproj", "{460FEE33-1FE1-483F-B3BF-931FF8E969A5}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbitcoin_node", "libbitcoin_node\libbitcoin_node.vcxproj", "{460FEE33-1FE1-483F-B3BF-931FF8E969A5}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libunivalue", "libunivalue\libunivalue.vcxproj", "{5724BA7D-A09A-4BA8-800B-C4C1561B3D69}" EndProject diff --git a/build_msvc/bitcoind/bitcoind.vcxproj b/build_msvc/bitcoind/bitcoind.vcxproj index d56c359fe0..b1204d0d5d 100644 --- a/build_msvc/bitcoind/bitcoind.vcxproj +++ b/build_msvc/bitcoind/bitcoind.vcxproj @@ -24,7 +24,7 @@ {6190199c-6cf4-4dad-bfbd-93fa72a760c1} - + {460fee33-1fe1-483f-b3bf-931ff8e969a5} diff --git a/build_msvc/libbitcoin_node/libbitcoin_node.vcxproj.in b/build_msvc/libbitcoin_node/libbitcoin_node.vcxproj.in new file mode 100644 index 0000000000..58e90dbaeb --- /dev/null +++ b/build_msvc/libbitcoin_node/libbitcoin_node.vcxproj.in @@ -0,0 +1,19 @@ + + + + + {460FEE33-1FE1-483F-B3BF-931FF8E969A5} + + + StaticLibrary + + +@SOURCE_FILES@ + + $(IntDir)wallet_init.obj + + + + + + \ No newline at end of file diff --git a/build_msvc/libbitcoin_server/libbitcoin_server.vcxproj.in b/build_msvc/libbitcoin_server/libbitcoin_server.vcxproj.in deleted file mode 100644 index 58e90dbaeb..0000000000 --- a/build_msvc/libbitcoin_server/libbitcoin_server.vcxproj.in +++ /dev/null @@ -1,19 +0,0 @@ - - - - - {460FEE33-1FE1-483F-B3BF-931FF8E969A5} - - - StaticLibrary - - -@SOURCE_FILES@ - - $(IntDir)wallet_init.obj - - - - - - \ No newline at end of file diff --git a/build_msvc/msvc-autogen.py b/build_msvc/msvc-autogen.py index 6ce65f3fa3..32f6f6968c 100755 --- a/build_msvc/msvc-autogen.py +++ b/build_msvc/msvc-autogen.py @@ -15,7 +15,7 @@ libs = [ 'libbitcoin_cli', 'libbitcoin_common', 'libbitcoin_crypto', - 'libbitcoin_server', + 'libbitcoin_node', 'libbitcoin_util', 'libbitcoin_wallet_tool', 'libbitcoin_wallet', diff --git a/build_msvc/test_bitcoin-qt/test_bitcoin-qt.vcxproj b/build_msvc/test_bitcoin-qt/test_bitcoin-qt.vcxproj index f9948b6f13..d3be693e99 100644 --- a/build_msvc/test_bitcoin-qt/test_bitcoin-qt.vcxproj +++ b/build_msvc/test_bitcoin-qt/test_bitcoin-qt.vcxproj @@ -40,7 +40,7 @@ {2b4abff8-d1fd-4845-88c9-1f3c0a6512bf} - + {460fee33-1fe1-483f-b3bf-931ff8e969a5} diff --git a/build_msvc/test_bitcoin/test_bitcoin.vcxproj b/build_msvc/test_bitcoin/test_bitcoin.vcxproj index 2fc0078b8d..4182448ec3 100644 --- a/build_msvc/test_bitcoin/test_bitcoin.vcxproj +++ b/build_msvc/test_bitcoin/test_bitcoin.vcxproj @@ -34,7 +34,7 @@ {6190199c-6cf4-4dad-bfbd-93fa72a760c1} - + {460fee33-1fe1-483f-b3bf-931ff8e969a5} -- cgit v1.2.3