Skip to content

Commit 87d6f6c

Browse files
fanquakefanquake
committed
Merge bitcoin/bitcoin#27615: msvc: Rename libbitcoinconsensus to libbitcoin_consensus and other adjustments
a94d75f msvc: Do not define `HAVE_CONSENSUS_LIB` (Hennadii Stepanov) cf6ff10 msvc: Clean up `libbitcoin_consensus` source files (Hennadii Stepanov) 30aee01 scripted-diff: Rename `libbitcoinconsensus` to `libbitcoin_consensus` (Hennadii Stepanov) Pull request description: The current Autotools-based build system operates with two build artifacts: - [`LIBBITCOIN_CONSENSUS`](https://github.com/bitcoin/bitcoin/blob/3777c75d147954b24f770dc7781b27870eadf775/src/Makefile.am#L31) which is [defined as](https://github.com/bitcoin/bitcoin/blob/master/doc/design/libraries.md) "Stable, backwards-compatible consensus functionality used by _libbitcoin_node_ and _libbitcoin_wallet_" - [`LIBBITCOINCONSENSUS`](https://github.com/bitcoin/bitcoin/blob/3777c75d147954b24f770dc7781b27870eadf775/src/Makefile.am#L42) which is [defined as](https://github.com/bitcoin/bitcoin/blob/master/doc/design/libraries.md) "Shared library build of static _libbitcoin_consensus_ library" The way how the `libbitcoinconsensus.vcxproj` project is used in the MSVC build system obviously shows that it is the former use case. This PR makes the related adjustments to the MSVC build system. ACKs for top commit: sipsorcery: ACK a94d75f. Tree-SHA512: 1144e13ee2b428ce14be8f76729744830c502a07814eb03e2aa6b8e009d8936fd13743e3f36ef3f31fac0e3979eb9af23e6a1364f151df49b3ae18dbd14cbf99
2 parents 8146f2a + a94d75f commit 87d6f6c

File tree

11 files changed

+9
-21
lines changed

11 files changed

+9
-21
lines changed

‎build_msvc/bench_bitcoin/bench_bitcoin.vcxproj.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
@SOURCE_FILES@
1313
</ItemGroup>
1414
<ItemGroup>
15-
<ProjectReference Include="..\libbitcoinconsensus\libbitcoinconsensus.vcxproj">
15+
<ProjectReference Include="..\libbitcoin_consensus\libbitcoin_consensus.vcxproj">
1616
<Project>{2b384fa8-9ee1-4544-93cb-0d733c25e8ce}</Project>
1717
</ProjectReference>
1818
<ProjectReference Include="..\libbitcoin_common\libbitcoin_common.vcxproj">

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<ResourceCompile Include="..\..\src\qt\res\bitcoin-qt-res.rc" />
1414
</ItemGroup>
1515
<ItemGroup>
16-
<ProjectReference Include="..\libbitcoinconsensus\libbitcoinconsensus.vcxproj">
16+
<ProjectReference Include="..\libbitcoin_consensus\libbitcoin_consensus.vcxproj">
1717
<Project>{2b384fa8-9ee1-4544-93cb-0d733c25e8ce}</Project>
1818
</ProjectReference>
1919
<ProjectReference Include="..\libbitcoin_cli\libbitcoin_cli.vcxproj">

‎build_msvc/bitcoin-tx/bitcoin-tx.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<ClCompile Include="..\..\src\bitcoin-tx.cpp" />
1313
</ItemGroup>
1414
<ItemGroup>
15-
<ProjectReference Include="..\libbitcoinconsensus\libbitcoinconsensus.vcxproj">
15+
<ProjectReference Include="..\libbitcoin_consensus\libbitcoin_consensus.vcxproj">
1616
<Project>{2b384fa8-9ee1-4544-93cb-0d733c25e8ce}</Project>
1717
</ProjectReference>
1818
<ProjectReference Include="..\libbitcoin_common\libbitcoin_common.vcxproj">

‎build_msvc/bitcoin-util/bitcoin-util.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<ClCompile Include="..\..\src\bitcoin-util.cpp" />
1313
</ItemGroup>
1414
<ItemGroup>
15-
<ProjectReference Include="..\libbitcoinconsensus\libbitcoinconsensus.vcxproj">
15+
<ProjectReference Include="..\libbitcoin_consensus\libbitcoin_consensus.vcxproj">
1616
<Project>{2b384fa8-9ee1-4544-93cb-0d733c25e8ce}</Project>
1717
</ProjectReference>
1818
<ProjectReference Include="..\libbitcoin_common\libbitcoin_common.vcxproj">

‎build_msvc/bitcoin-wallet/bitcoin-wallet.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
</ClCompile>
1616
</ItemGroup>
1717
<ItemGroup>
18-
<ProjectReference Include="..\libbitcoinconsensus\libbitcoinconsensus.vcxproj">
18+
<ProjectReference Include="..\libbitcoin_consensus\libbitcoin_consensus.vcxproj">
1919
<Project>{2b384fa8-9ee1-4544-93cb-0d733c25e8ce}</Project>
2020
</ProjectReference>
2121
<ProjectReference Include="..\libbitcoin_common\libbitcoin_common.vcxproj">

‎build_msvc/bitcoin.sln

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
22
# Visual Studio Version 16
33
VisualStudioVersion = 16.0.28803.452
44
MinimumVisualStudioVersion = 10.0.40219.1
5-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbitcoinconsensus", "libbitcoinconsensus\libbitcoinconsensus.vcxproj", "{2B384FA8-9EE1-4544-93CB-0D733C25E8CE}"
5+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbitcoin_consensus", "libbitcoin_consensus\libbitcoin_consensus.vcxproj", "{2B384FA8-9EE1-4544-93CB-0D733C25E8CE}"
66
EndProject
77
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bitcoind", "bitcoind\bitcoind.vcxproj", "{D4513DDF-6013-44DC-ADCC-12EAF6D1F038}"
88
EndProject

‎build_msvc/bitcoin_config.h.in

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,6 @@
4444
/* define if external signer support is enabled (requires Boost::Process) */
4545
#define ENABLE_EXTERNAL_SIGNER /**/
4646

47-
/* Define this symbol if the consensus lib has been built */
48-
#define HAVE_CONSENSUS_LIB 1
49-
5047
/* Define to 1 if you have the declaration of `be16toh', and to 0 if you
5148
don't. */
5249
#define HAVE_DECL_BE16TOH 0

‎build_msvc/bitcoind/bitcoind.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
</ClCompile>
1616
</ItemGroup>
1717
<ItemGroup>
18-
<ProjectReference Include="..\libbitcoinconsensus\libbitcoinconsensus.vcxproj">
18+
<ProjectReference Include="..\libbitcoin_consensus\libbitcoin_consensus.vcxproj">
1919
<Project>{2b384fa8-9ee1-4544-93cb-0d733c25e8ce}</Project>
2020
</ProjectReference>
2121
<ProjectReference Include="..\libbitcoin_common\libbitcoin_common.vcxproj">

‎build_msvc/libbitcoinconsensus/libbitcoinconsensus.vcxproj renamed to ‎build_msvc/libbitcoin_consensus/libbitcoin_consensus.vcxproj

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,6 @@
1111
<ClCompile Include="..\..\src\arith_uint256.cpp" />
1212
<ClCompile Include="..\..\src\consensus\merkle.cpp" />
1313
<ClCompile Include="..\..\src\consensus\tx_check.cpp" />
14-
<ClCompile Include="..\..\src\crypto\aes.cpp" />
15-
<ClCompile Include="..\..\src\crypto\chacha20.cpp" />
16-
<ClCompile Include="..\..\src\crypto\hmac_sha256.cpp" />
17-
<ClCompile Include="..\..\src\crypto\hmac_sha512.cpp" />
18-
<ClCompile Include="..\..\src\crypto\ripemd160.cpp" />
19-
<ClCompile Include="..\..\src\crypto\sha1.cpp" />
20-
<ClCompile Include="..\..\src\crypto\sha256.cpp" />
21-
<ClCompile Include="..\..\src\crypto\sha256_sse4.cpp" />
22-
<ClCompile Include="..\..\src\crypto\sha512.cpp" />
2314
<ClCompile Include="..\..\src\hash.cpp" />
2415
<ClCompile Include="..\..\src\primitives\block.cpp" />
2516
<ClCompile Include="..\..\src\primitives\transaction.cpp" />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<ClCompile Include="$(GeneratedFilesOutDir)\moc\moc_wallettests.cpp" />
2929
</ItemGroup>
3030
<ItemGroup>
31-
<ProjectReference Include="..\libbitcoinconsensus\libbitcoinconsensus.vcxproj">
31+
<ProjectReference Include="..\libbitcoin_consensus\libbitcoin_consensus.vcxproj">
3232
<Project>{2b384fa8-9ee1-4544-93cb-0d733c25e8ce}</Project>
3333
</ProjectReference>
3434
<ProjectReference Include="..\libbitcoin_cli\libbitcoin_cli.vcxproj">

0 commit comments

Comments
 (0)