Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 24 additions & 12 deletions builds/gnu/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -48,21 +48,24 @@ src_libbitcoin_server_la_LIBADD = \

src_libbitcoin_server_la_SOURCES = \
${srcdir}/../../src/configuration.cpp \
${srcdir}/../../src/error.cpp \
${srcdir}/../../src/parser.cpp \
${srcdir}/../../src/server_node.cpp \
${srcdir}/../../src/settings.cpp \
${srcdir}/../../src/error/bitcoind_error_t.cpp \
${srcdir}/../../src/error/btcd_error_t.cpp \
${srcdir}/../../src/error/electrum_error_t.cpp \
${srcdir}/../../src/error/error_t.cpp \
${srcdir}/../../src/parsers/admin_query.cpp \
${srcdir}/../../src/parsers/admin_target.cpp \
${srcdir}/../../src/parsers/bitcoind_block_stats.cpp \
${srcdir}/../../src/parsers/bitcoind_descriptor.cpp \
${srcdir}/../../src/parsers/bitcoind_merkle.cpp \
${srcdir}/../../src/parsers/bitcoind_script.cpp \
${srcdir}/../../src/parsers/bitcoind_target.cpp \
${srcdir}/../../src/parsers/block_stats.cpp \
${srcdir}/../../src/parsers/btcd_filter.cpp \
${srcdir}/../../src/parsers/descriptor.cpp \
${srcdir}/../../src/parsers/electrum_version.cpp \
${srcdir}/../../src/parsers/native_query.cpp \
${srcdir}/../../src/parsers/native_target.cpp \
${srcdir}/../../src/parsers/partial_merkle.cpp \
${srcdir}/../../src/protocols/protocol_html.cpp \
${srcdir}/../../src/protocols/protocol_http.cpp \
${srcdir}/../../src/protocols/admin/protocol_admin.cpp \
Expand Down Expand Up @@ -115,7 +118,6 @@ include_bitcoin_serverdir = \
include_bitcoin_server_HEADERS = \
${srcdir}/../../include/bitcoin/server/configuration.hpp \
${srcdir}/../../include/bitcoin/server/define.hpp \
${srcdir}/../../include/bitcoin/server/error.hpp \
${srcdir}/../../include/bitcoin/server/parser.hpp \
${srcdir}/../../include/bitcoin/server/server_node.hpp \
${srcdir}/../../include/bitcoin/server/settings.hpp \
Expand All @@ -132,6 +134,16 @@ include_bitcoin_server_channels_HEADERS = \
${srcdir}/../../include/bitcoin/server/channels/channel_stratum_v2.hpp \
${srcdir}/../../include/bitcoin/server/channels/channels.hpp

include_bitcoin_server_errordir = \
${includedir}/bitcoin/server/error

include_bitcoin_server_error_HEADERS = \
${srcdir}/../../include/bitcoin/server/error/bitcoind_error_t.hpp \
${srcdir}/../../include/bitcoin/server/error/btcd_error_t.hpp \
${srcdir}/../../include/bitcoin/server/error/electrum_error_t.hpp \
${srcdir}/../../include/bitcoin/server/error/error.hpp \
${srcdir}/../../include/bitcoin/server/error/error_t.hpp

include_bitcoin_server_impl_protocolsdir = \
${includedir}/bitcoin/server/impl/protocols

Expand Down Expand Up @@ -167,16 +179,16 @@ include_bitcoin_server_parsersdir = \
include_bitcoin_server_parsers_HEADERS = \
${srcdir}/../../include/bitcoin/server/parsers/admin_query.hpp \
${srcdir}/../../include/bitcoin/server/parsers/admin_target.hpp \
${srcdir}/../../include/bitcoin/server/parsers/bitcoind_block_stats.hpp \
${srcdir}/../../include/bitcoin/server/parsers/bitcoind_descriptor.hpp \
${srcdir}/../../include/bitcoin/server/parsers/bitcoind_merkle.hpp \
${srcdir}/../../include/bitcoin/server/parsers/bitcoind_script.hpp \
${srcdir}/../../include/bitcoin/server/parsers/bitcoind_target.hpp \
${srcdir}/../../include/bitcoin/server/parsers/block_stats.hpp \
${srcdir}/../../include/bitcoin/server/parsers/btcd_filter.hpp \
${srcdir}/../../include/bitcoin/server/parsers/descriptor.hpp \
${srcdir}/../../include/bitcoin/server/parsers/electrum_version.hpp \
${srcdir}/../../include/bitcoin/server/parsers/native_query.hpp \
${srcdir}/../../include/bitcoin/server/parsers/native_target.hpp \
${srcdir}/../../include/bitcoin/server/parsers/parsers.hpp \
${srcdir}/../../include/bitcoin/server/parsers/partial_merkle.hpp
${srcdir}/../../include/bitcoin/server/parsers/parsers.hpp

include_bitcoin_server_protocolsdir = \
${includedir}/bitcoin/server/protocols
Expand Down Expand Up @@ -251,13 +263,13 @@ test_libbitcoin_server_test_SOURCES = \
${srcdir}/../../test/mocks/blocks.cpp \
${srcdir}/../../test/parsers/admin_query.cpp \
${srcdir}/../../test/parsers/admin_target.cpp \
${srcdir}/../../test/parsers/bitcoind_block_stats.cpp \
${srcdir}/../../test/parsers/bitcoind_descriptor.cpp \
${srcdir}/../../test/parsers/bitcoind_merkle.cpp \
${srcdir}/../../test/parsers/bitcoind_target.cpp \
${srcdir}/../../test/parsers/block_stats.cpp \
${srcdir}/../../test/parsers/descriptor.cpp \
${srcdir}/../../test/parsers/electrum_version.cpp \
${srcdir}/../../test/parsers/native_query.cpp \
${srcdir}/../../test/parsers/native_target.cpp \
${srcdir}/../../test/parsers/partial_merkle.cpp \
${srcdir}/../../test/protocols/admin/admin_diagnostics.cpp \
${srcdir}/../../test/protocols/admin/admin_setup_fixture.cpp \
${srcdir}/../../test/protocols/bitcoind/bitcoind_json.cpp \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -126,15 +126,15 @@
<ClCompile Include="..\..\..\..\test\mocks\blocks.cpp" />
<ClCompile Include="..\..\..\..\test\parsers\admin_query.cpp" />
<ClCompile Include="..\..\..\..\test\parsers\admin_target.cpp" />
<ClCompile Include="..\..\..\..\test\parsers\bitcoind_block_stats.cpp" />
<ClCompile Include="..\..\..\..\test\parsers\bitcoind_descriptor.cpp" />
<ClCompile Include="..\..\..\..\test\parsers\bitcoind_merkle.cpp" />
<ClCompile Include="..\..\..\..\test\parsers\bitcoind_target.cpp" />
<ClCompile Include="..\..\..\..\test\parsers\block_stats.cpp" />
<ClCompile Include="..\..\..\..\test\parsers\descriptor.cpp" />
<ClCompile Include="..\..\..\..\test\parsers\electrum_version.cpp">
<ObjectFileName>$(IntDir)test_parsers_electrum_version.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\..\..\..\test\parsers\native_query.cpp" />
<ClCompile Include="..\..\..\..\test\parsers\native_target.cpp" />
<ClCompile Include="..\..\..\..\test\parsers\partial_merkle.cpp" />
<ClCompile Include="..\..\..\..\test\protocols\admin\admin_diagnostics.cpp" />
<ClCompile Include="..\..\..\..\test\protocols\admin\admin_setup_fixture.cpp" />
<ClCompile Include="..\..\..\..\test\protocols\bitcoind\bitcoind_json.cpp" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,16 @@
<ClCompile Include="..\..\..\..\test\parsers\admin_target.cpp">
<Filter>src\parsers</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\parsers\bitcoind_target.cpp">
<ClCompile Include="..\..\..\..\test\parsers\bitcoind_block_stats.cpp">
<Filter>src\parsers</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\parsers\bitcoind_descriptor.cpp">
<Filter>src\parsers</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\parsers\block_stats.cpp">
<ClCompile Include="..\..\..\..\test\parsers\bitcoind_merkle.cpp">
<Filter>src\parsers</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\parsers\descriptor.cpp">
<ClCompile Include="..\..\..\..\test\parsers\bitcoind_target.cpp">
<Filter>src\parsers</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\parsers\electrum_version.cpp">
Expand All @@ -81,9 +84,6 @@
<ClCompile Include="..\..\..\..\test\parsers\native_target.cpp">
<Filter>src\parsers</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\parsers\partial_merkle.cpp">
<Filter>src\parsers</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\protocols\admin\admin_diagnostics.cpp">
<Filter>src\protocols\admin</Filter>
</ClCompile>
Expand Down
23 changes: 15 additions & 8 deletions builds/msvc/vs2022/libbitcoin-server/libbitcoin-server.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -122,19 +122,22 @@
</ImportGroup>
<ItemGroup>
<ClCompile Include="..\..\..\..\src\configuration.cpp" />
<ClCompile Include="..\..\..\..\src\error.cpp" />
<ClCompile Include="..\..\..\..\src\error\bitcoind_error_t.cpp" />
<ClCompile Include="..\..\..\..\src\error\btcd_error_t.cpp" />
<ClCompile Include="..\..\..\..\src\error\electrum_error_t.cpp" />
<ClCompile Include="..\..\..\..\src\error\error_t.cpp" />
<ClCompile Include="..\..\..\..\src\parser.cpp" />
<ClCompile Include="..\..\..\..\src\parsers\admin_query.cpp" />
<ClCompile Include="..\..\..\..\src\parsers\admin_target.cpp" />
<ClCompile Include="..\..\..\..\src\parsers\bitcoind_block_stats.cpp" />
<ClCompile Include="..\..\..\..\src\parsers\bitcoind_descriptor.cpp" />
<ClCompile Include="..\..\..\..\src\parsers\bitcoind_merkle.cpp" />
<ClCompile Include="..\..\..\..\src\parsers\bitcoind_script.cpp" />
<ClCompile Include="..\..\..\..\src\parsers\bitcoind_target.cpp" />
<ClCompile Include="..\..\..\..\src\parsers\block_stats.cpp" />
<ClCompile Include="..\..\..\..\src\parsers\btcd_filter.cpp" />
<ClCompile Include="..\..\..\..\src\parsers\descriptor.cpp" />
<ClCompile Include="..\..\..\..\src\parsers\electrum_version.cpp" />
<ClCompile Include="..\..\..\..\src\parsers\native_query.cpp" />
<ClCompile Include="..\..\..\..\src\parsers\native_target.cpp" />
<ClCompile Include="..\..\..\..\src\parsers\partial_merkle.cpp" />
<ClCompile Include="..\..\..\..\src\protocols\admin\protocol_admin.cpp" />
<ClCompile Include="..\..\..\..\src\protocols\bitcoind\protocol_bitcoind.cpp" />
<ClCompile Include="..\..\..\..\src\protocols\bitcoind\protocol_bitcoind_blockchain.cpp" />
Expand Down Expand Up @@ -188,7 +191,11 @@
<ClInclude Include="..\..\..\..\include\bitcoin\server\channels\channels.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\server\configuration.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\server\define.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\server\error.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\server\error\bitcoind_error_t.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\server\error\btcd_error_t.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\server\error\electrum_error_t.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\server\error\error.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\server\error\error_t.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\server\interfaces\admin.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\server\interfaces\bitcoind_blockchain.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\server\interfaces\bitcoind_control.hpp" />
Expand All @@ -210,16 +217,16 @@
<ClInclude Include="..\..\..\..\include\bitcoin\server\parser.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\server\parsers\admin_query.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\server\parsers\admin_target.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\server\parsers\bitcoind_block_stats.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\server\parsers\bitcoind_descriptor.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\server\parsers\bitcoind_merkle.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\server\parsers\bitcoind_script.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\server\parsers\bitcoind_target.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\server\parsers\block_stats.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\server\parsers\btcd_filter.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\server\parsers\descriptor.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\server\parsers\electrum_version.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\server\parsers\native_query.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\server\parsers\native_target.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\server\parsers\parsers.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\server\parsers\partial_merkle.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\server\protocols\protocol.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\server\protocols\protocol_admin.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\server\protocols\protocol_bitcoind.hpp" />
Expand Down
Loading
Loading