From 30aee016f15b43b90efb023d9bd04aa84cf58ade Mon Sep 17 00:00:00 2001
From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
Date: Wed, 10 May 2023 11:26:35 +0100
Subject: [PATCH 1/3] scripted-diff: Rename `libbitcoinconsensus` to
`libbitcoin_consensus`
This build artifact is not a user-exposed shared library (DLL) but a
convenience static library.
See: https://github.com/bitcoin/bitcoin/blob/master/doc/design/libraries.md
-BEGIN VERIFY SCRIPT-
sed -i 's/libbitcoinconsensus/libbitcoin_consensus/g' $(git grep -l "libbitcoinconsensus" -- build_msvc)
git mv build_msvc/libbitcoinconsensus build_msvc/libbitcoin_consensus
git mv build_msvc/libbitcoin_consensus/libbitcoinconsensus.vcxproj build_msvc/libbitcoin_consensus/libbitcoin_consensus.vcxproj
-END VERIFY SCRIPT-
---
build_msvc/bench_bitcoin/bench_bitcoin.vcxproj.in | 2 +-
build_msvc/bitcoin-qt/bitcoin-qt.vcxproj | 2 +-
build_msvc/bitcoin-tx/bitcoin-tx.vcxproj | 2 +-
build_msvc/bitcoin-util/bitcoin-util.vcxproj | 2 +-
build_msvc/bitcoin-wallet/bitcoin-wallet.vcxproj | 2 +-
build_msvc/bitcoin.sln | 2 +-
build_msvc/bitcoind/bitcoind.vcxproj | 2 +-
.../libbitcoin_consensus.vcxproj} | 0
build_msvc/test_bitcoin-qt/test_bitcoin-qt.vcxproj | 2 +-
build_msvc/test_bitcoin/test_bitcoin.vcxproj | 2 +-
10 files changed, 9 insertions(+), 9 deletions(-)
rename build_msvc/{libbitcoinconsensus/libbitcoinconsensus.vcxproj => libbitcoin_consensus/libbitcoin_consensus.vcxproj} (100%)
diff --git a/build_msvc/bench_bitcoin/bench_bitcoin.vcxproj.in b/build_msvc/bench_bitcoin/bench_bitcoin.vcxproj.in
index fc9d7cbed64..a5702a83ba3 100644
--- a/build_msvc/bench_bitcoin/bench_bitcoin.vcxproj.in
+++ b/build_msvc/bench_bitcoin/bench_bitcoin.vcxproj.in
@@ -12,7 +12,7 @@
@SOURCE_FILES@
-
+
{2b384fa8-9ee1-4544-93cb-0d733c25e8ce}
diff --git a/build_msvc/bitcoin-qt/bitcoin-qt.vcxproj b/build_msvc/bitcoin-qt/bitcoin-qt.vcxproj
index 0d6358e0d07..20cdb7bb6e7 100644
--- a/build_msvc/bitcoin-qt/bitcoin-qt.vcxproj
+++ b/build_msvc/bitcoin-qt/bitcoin-qt.vcxproj
@@ -13,7 +13,7 @@
-
+
{2b384fa8-9ee1-4544-93cb-0d733c25e8ce}
diff --git a/build_msvc/bitcoin-tx/bitcoin-tx.vcxproj b/build_msvc/bitcoin-tx/bitcoin-tx.vcxproj
index 4e9b4916a0f..52585b98f94 100644
--- a/build_msvc/bitcoin-tx/bitcoin-tx.vcxproj
+++ b/build_msvc/bitcoin-tx/bitcoin-tx.vcxproj
@@ -12,7 +12,7 @@
-
+
{2b384fa8-9ee1-4544-93cb-0d733c25e8ce}
diff --git a/build_msvc/bitcoin-util/bitcoin-util.vcxproj b/build_msvc/bitcoin-util/bitcoin-util.vcxproj
index 8a0964824bc..4ea27fe4394 100644
--- a/build_msvc/bitcoin-util/bitcoin-util.vcxproj
+++ b/build_msvc/bitcoin-util/bitcoin-util.vcxproj
@@ -12,7 +12,7 @@
-
+
{2b384fa8-9ee1-4544-93cb-0d733c25e8ce}
diff --git a/build_msvc/bitcoin-wallet/bitcoin-wallet.vcxproj b/build_msvc/bitcoin-wallet/bitcoin-wallet.vcxproj
index 2ac0be9814b..56d88d6a441 100644
--- a/build_msvc/bitcoin-wallet/bitcoin-wallet.vcxproj
+++ b/build_msvc/bitcoin-wallet/bitcoin-wallet.vcxproj
@@ -15,7 +15,7 @@
-
+
{2b384fa8-9ee1-4544-93cb-0d733c25e8ce}
diff --git a/build_msvc/bitcoin.sln b/build_msvc/bitcoin.sln
index 2a1ccf58fec..0931bf5dfe6 100644
--- a/build_msvc/bitcoin.sln
+++ b/build_msvc/bitcoin.sln
@@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.28803.452
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbitcoinconsensus", "libbitcoinconsensus\libbitcoinconsensus.vcxproj", "{2B384FA8-9EE1-4544-93CB-0D733C25E8CE}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbitcoin_consensus", "libbitcoin_consensus\libbitcoin_consensus.vcxproj", "{2B384FA8-9EE1-4544-93CB-0D733C25E8CE}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bitcoind", "bitcoind\bitcoind.vcxproj", "{D4513DDF-6013-44DC-ADCC-12EAF6D1F038}"
EndProject
diff --git a/build_msvc/bitcoind/bitcoind.vcxproj b/build_msvc/bitcoind/bitcoind.vcxproj
index b1204d0d5d1..bb61865e140 100644
--- a/build_msvc/bitcoind/bitcoind.vcxproj
+++ b/build_msvc/bitcoind/bitcoind.vcxproj
@@ -15,7 +15,7 @@
-
+
{2b384fa8-9ee1-4544-93cb-0d733c25e8ce}
diff --git a/build_msvc/libbitcoinconsensus/libbitcoinconsensus.vcxproj b/build_msvc/libbitcoin_consensus/libbitcoin_consensus.vcxproj
similarity index 100%
rename from build_msvc/libbitcoinconsensus/libbitcoinconsensus.vcxproj
rename to build_msvc/libbitcoin_consensus/libbitcoin_consensus.vcxproj
diff --git a/build_msvc/test_bitcoin-qt/test_bitcoin-qt.vcxproj b/build_msvc/test_bitcoin-qt/test_bitcoin-qt.vcxproj
index 3a2540d549a..cdab2f30614 100644
--- a/build_msvc/test_bitcoin-qt/test_bitcoin-qt.vcxproj
+++ b/build_msvc/test_bitcoin-qt/test_bitcoin-qt.vcxproj
@@ -27,7 +27,7 @@
-
+
{2b384fa8-9ee1-4544-93cb-0d733c25e8ce}
diff --git a/build_msvc/test_bitcoin/test_bitcoin.vcxproj b/build_msvc/test_bitcoin/test_bitcoin.vcxproj
index 4182448ec35..c0c84fc6f18 100644
--- a/build_msvc/test_bitcoin/test_bitcoin.vcxproj
+++ b/build_msvc/test_bitcoin/test_bitcoin.vcxproj
@@ -22,7 +22,7 @@
{542007e3-be0d-4b0d-a6b0-aa8813e2558d}
-
+
{2b384fa8-9ee1-4544-93cb-0d733c25e8ce}
From cf6ff1031bd577c18fe8eb2dd168a6d0d1c16e0d Mon Sep 17 00:00:00 2001
From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
Date: Wed, 10 May 2023 11:26:44 +0100
Subject: [PATCH 2/3] msvc: Clean up `libbitcoin_consensus` source files
See `libbitcoin_consensus_a_SOURCES` in the `src/Makefile.am`.
---
.../libbitcoin_consensus/libbitcoin_consensus.vcxproj | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/build_msvc/libbitcoin_consensus/libbitcoin_consensus.vcxproj b/build_msvc/libbitcoin_consensus/libbitcoin_consensus.vcxproj
index 4cb0bdc9021..95fdcdb79b4 100644
--- a/build_msvc/libbitcoin_consensus/libbitcoin_consensus.vcxproj
+++ b/build_msvc/libbitcoin_consensus/libbitcoin_consensus.vcxproj
@@ -11,15 +11,6 @@
-
-
-
-
-
-
-
-
-
From a94d75fa81bab8f4695ab1756524e639af0ff69c Mon Sep 17 00:00:00 2001
From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
Date: Wed, 10 May 2023 11:26:51 +0100
Subject: [PATCH 3/3] msvc: Do not define `HAVE_CONSENSUS_LIB`
The `HAVE_CONSENSUS_LIB` symbol is supposed to be defined when a
user-exposed shared library (DLL) is built which is not the case here.
---
build_msvc/bitcoin_config.h.in | 3 ---
1 file changed, 3 deletions(-)
diff --git a/build_msvc/bitcoin_config.h.in b/build_msvc/bitcoin_config.h.in
index 02d8fc41c2a..05e38b15717 100644
--- a/build_msvc/bitcoin_config.h.in
+++ b/build_msvc/bitcoin_config.h.in
@@ -44,9 +44,6 @@
/* define if external signer support is enabled (requires Boost::Process) */
#define ENABLE_EXTERNAL_SIGNER /**/
-/* Define this symbol if the consensus lib has been built */
-#define HAVE_CONSENSUS_LIB 1
-
/* Define to 1 if you have the declaration of `be16toh', and to 0 if you
don't. */
#define HAVE_DECL_BE16TOH 0