Skip to content

Remove zmq, protocol, and blockchain server .props deps, regn artifacts. #585

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
evoskuil merged 3 commits into from
Jan 2, 2026
Merged

Remove zmq, protocol, and blockchain server .props deps, regn artifacts. #585

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e952f85
Remove zmq, protocol, and blockchain server .props dependencies.
evoskuil Jan 2, 2026
c17db36
Regenerate artifacts.
evoskuil Jan 2, 2026
497b4da
Resolve inheritance ambiguities.
evoskuil Jan 2, 2026
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
173 changes: 173 additions & 0 deletions Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,176 @@ doc_DATA = \

# src/libbitcoin-server.la => ${libdir}
#------------------------------------------------------------------------------
lib_LTLIBRARIES = src/libbitcoin-server.la
src_libbitcoin_server_la_CPPFLAGS = -I${srcdir}/include -DSYSCONFDIR=\"${sysconfdir}\" ${bitcoin_node_BUILD_CPPFLAGS}
src_libbitcoin_server_la_LIBADD = ${bitcoin_node_LIBS}
src_libbitcoin_server_la_SOURCES = \
src/configuration.cpp \
src/error.cpp \
src/parser.cpp \
src/server_node.cpp \
src/settings.cpp \
src/parsers/bitcoind_query.cpp \
src/parsers/bitcoind_target.cpp \
src/parsers/explore_query.cpp \
src/parsers/explore_target.cpp \
src/protocols/protocol_bitcoind_rest.cpp \
src/protocols/protocol_bitcoind_rpc.cpp \
src/protocols/protocol_electrum.cpp \
src/protocols/protocol_electrum_version.cpp \
src/protocols/protocol_explore.cpp \
src/protocols/protocol_html.cpp \
src/protocols/protocol_http.cpp \
src/protocols/protocol_stratum_v1.cpp

# local: test/libbitcoin-server-test
#------------------------------------------------------------------------------
if WITH_TESTS

TESTS = libbitcoin-server-test_runner.sh

check_PROGRAMS = test/libbitcoin-server-test
test_libbitcoin_server_test_CPPFLAGS = -I${srcdir}/include ${bitcoin_node_BUILD_CPPFLAGS}
test_libbitcoin_server_test_LDADD = src/libbitcoin-server.la ${boost_unit_test_framework_LIBS} ${bitcoin_node_LIBS}
test_libbitcoin_server_test_SOURCES = \
test/error.cpp \
test/main.cpp \
test/test.cpp \
test/test.hpp

endif WITH_TESTS

# console/bs => ${bindir}
#------------------------------------------------------------------------------
if WITH_CONSOLE

bin_PROGRAMS = console/bs
console_bs_CPPFLAGS = -I${srcdir}/include ${bitcoin_node_BUILD_CPPFLAGS}
console_bs_LDADD = src/libbitcoin-server.la ${bitcoin_node_LIBS}
console_bs_SOURCES = \
console/executor.cpp \
console/executor.hpp \
console/executor_commands.cpp \
console/executor_dumps.cpp \
console/executor_events.cpp \
console/executor_logging.cpp \
console/executor_options.cpp \
console/executor_runner.cpp \
console/executor_scans.cpp \
console/executor_store.cpp \
console/executor_test_reader.cpp \
console/executor_test_writer.cpp \
console/localize.hpp \
console/main.cpp \
console/stack_trace.cpp \
console/stack_trace.hpp \
console/embedded/embedded.hpp \
console/embedded/explore_css.cpp \
console/embedded/explore_ecma.cpp \
console/embedded/explore_font.cpp \
console/embedded/explore_html.cpp \
console/embedded/explore_icon.cpp \
console/embedded/web_css.cpp \
console/embedded/web_ecma.cpp \
console/embedded/web_font.cpp \
console/embedded/web_html.cpp \
console/embedded/web_icon.cpp

endif WITH_CONSOLE

# files => ${includedir}/bitcoin
#------------------------------------------------------------------------------
include_bitcoindir = ${includedir}/bitcoin
include_bitcoin_HEADERS = \
include/bitcoin/server.hpp

include_bitcoin_serverdir = ${includedir}/bitcoin/server
include_bitcoin_server_HEADERS = \
include/bitcoin/server/configuration.hpp \
include/bitcoin/server/define.hpp \
include/bitcoin/server/error.hpp \
include/bitcoin/server/parser.hpp \
include/bitcoin/server/server_node.hpp \
include/bitcoin/server/settings.hpp \
include/bitcoin/server/version.hpp

include_bitcoin_server_channelsdir = ${includedir}/bitcoin/server/channels
include_bitcoin_server_channels_HEADERS = \
include/bitcoin/server/channels/channel_electrum.hpp \
include/bitcoin/server/channels/channel_http.hpp \
include/bitcoin/server/channels/channel_stratum_v1.hpp \
include/bitcoin/server/channels/channel_stratum_v2.hpp \
include/bitcoin/server/channels/channel_ws.hpp \
include/bitcoin/server/channels/channels.hpp

include_bitcoin_server_interfacesdir = ${includedir}/bitcoin/server/interfaces
include_bitcoin_server_interfaces_HEADERS = \
include/bitcoin/server/interfaces/bitcoind_rest.hpp \
include/bitcoin/server/interfaces/bitcoind_rpc.hpp \
include/bitcoin/server/interfaces/electrum.hpp \
include/bitcoin/server/interfaces/explore.hpp \
include/bitcoin/server/interfaces/interfaces.hpp \
include/bitcoin/server/interfaces/stratum_v1.hpp \
include/bitcoin/server/interfaces/stratum_v2.hpp \
include/bitcoin/server/interfaces/types.hpp

include_bitcoin_server_parsersdir = ${includedir}/bitcoin/server/parsers
include_bitcoin_server_parsers_HEADERS = \
include/bitcoin/server/parsers/bitcoind_query.hpp \
include/bitcoin/server/parsers/bitcoind_target.hpp \
include/bitcoin/server/parsers/electrum_version.hpp \
include/bitcoin/server/parsers/explore_query.hpp \
include/bitcoin/server/parsers/explore_target.hpp \
include/bitcoin/server/parsers/parsers.hpp

include_bitcoin_server_protocolsdir = ${includedir}/bitcoin/server/protocols
include_bitcoin_server_protocols_HEADERS = \
include/bitcoin/server/protocols/protocol.hpp \
include/bitcoin/server/protocols/protocol_bitcoind_rest.hpp \
include/bitcoin/server/protocols/protocol_bitcoind_rpc.hpp \
include/bitcoin/server/protocols/protocol_electrum.hpp \
include/bitcoin/server/protocols/protocol_electrum_version.hpp \
include/bitcoin/server/protocols/protocol_explore.hpp \
include/bitcoin/server/protocols/protocol_html.hpp \
include/bitcoin/server/protocols/protocol_http.hpp \
include/bitcoin/server/protocols/protocol_rpc.hpp \
include/bitcoin/server/protocols/protocol_stratum_v1.hpp \
include/bitcoin/server/protocols/protocol_stratum_v2.hpp \
include/bitcoin/server/protocols/protocol_web.hpp \
include/bitcoin/server/protocols/protocols.hpp

include_bitcoin_server_sessionsdir = ${includedir}/bitcoin/server/sessions
include_bitcoin_server_sessions_HEADERS = \
include/bitcoin/server/sessions/session_handshake.hpp \
include/bitcoin/server/sessions/session_server.hpp \
include/bitcoin/server/sessions/sessions.hpp

# files => ${bash_completiondir}
#------------------------------------------------------------------------------
if BASH_COMPLETIONDIR

dist_bash_completion_DATA = \
data/bs

endif BASH_COMPLETIONDIR

# files => ${sysconfdir}/libbitcoin
#------------------------------------------------------------------------------
if WITH_CONSOLE

sysconf_libbitcoindir = ${sysconfdir}/libbitcoin
sysconf_libbitcoin_DATA = \
data/bs.cfg

endif WITH_CONSOLE


# Custom make targets.
#==============================================================================
# make target: console
#------------------------------------------------------------------------------
target_console = \
console/bs

console: ${target_console}

15 changes: 0 additions & 15 deletions builds/cmake/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,33 +171,27 @@ find_package( Bitcoin-Node 4.0.0 REQUIRED )
# Define project common includes for build.
#------------------------------------------------------------------------------
if (BUILD_SHARED_LIBS)
set( bitcoin_protocol_FOR_BUILD_INCLUDE_DIRS ${bitcoin_protocol_INCLUDE_DIRS} CACHE STRING "Placeholder" )
set( bitcoin_node_FOR_BUILD_INCLUDE_DIRS ${bitcoin_node_INCLUDE_DIRS} CACHE STRING "Placeholder" )
else()
set( bitcoin_protocol_FOR_BUILD_INCLUDE_DIRS ${bitcoin_protocol_STATIC_INCLUDE_DIRS} CACHE STRING "Placeholder" )
set( bitcoin_node_FOR_BUILD_INCLUDE_DIRS ${bitcoin_node_STATIC_INCLUDE_DIRS} CACHE STRING "Placeholder" )
endif()

# Define project common includes directories
#------------------------------------------------------------------------------
include_directories( SYSTEM
${bitcoin_protocol_FOR_BUILD_INCLUDE_DIRS}
${bitcoin_node_FOR_BUILD_INCLUDE_DIRS} )

# Define project common library directories for build.
#------------------------------------------------------------------------------
if (BUILD_SHARED_LIBS)
set( bitcoin_protocol_FOR_BUILD_LIBRARY_DIRS ${bitcoin_protocol_LIBRARY_DIRS} CACHE STRING "Placeholder" )
set( bitcoin_node_FOR_BUILD_LIBRARY_DIRS ${bitcoin_node_LIBRARY_DIRS} CACHE STRING "Placeholder" )
else()
set( bitcoin_protocol_FOR_BUILD_LIBRARY_DIRS ${bitcoin_protocol_STATIC_LIBRARY_DIRS} CACHE STRING "Placeholder" )
set( bitcoin_node_FOR_BUILD_LIBRARY_DIRS ${bitcoin_node_STATIC_LIBRARY_DIRS} CACHE STRING "Placeholder" )
endif()

# Define project common library directories
#------------------------------------------------------------------------------
link_directories(
${bitcoin_protocol_FOR_BUILD_LIBRARY_DIRS}
${bitcoin_node_FOR_BUILD_LIBRARY_DIRS} )

# Define project common linker flags.
Expand All @@ -224,17 +218,14 @@ endif()
# Define common library usage for build.
#------------------------------------------------------------------------------
if (BUILD_SHARED_LIBS)
set( bitcoin_protocol_FOR_BUILD_LIBRARIES ${bitcoin_protocol_LIBRARIES} CACHE STRING "Placeholder" )
set( bitcoin_node_FOR_BUILD_LIBRARIES ${bitcoin_node_LIBRARIES} CACHE STRING "Placeholder" )
else()
set( bitcoin_protocol_FOR_BUILD_LIBRARIES ${bitcoin_protocol_STATIC_LIBRARIES} CACHE STRING "Placeholder" )
set( bitcoin_node_FOR_BUILD_LIBRARIES ${bitcoin_node_STATIC_LIBRARIES} CACHE STRING "Placeholder" )
endif()

# Define project common libraries.
#------------------------------------------------------------------------------
link_libraries(
${bitcoin_protocol_FOR_BUILD_LIBRARIES}
${bitcoin_node_FOR_BUILD_LIBRARIES} )

add_definitions(
Expand Down Expand Up @@ -264,18 +255,15 @@ add_library( ${CANONICAL_LIB_NAME}
# ${CANONICAL_LIB_NAME} project specific include directory normalization for build.
#------------------------------------------------------------------------------
if (BUILD_SHARED_LIBS)
set( bitcoin_protocol_FOR_BUILD_INCLUDE_DIRS ${bitcoin_protocol_INCLUDE_DIRS} CACHE STRING "Placeholder" )
set( bitcoin_node_FOR_BUILD_INCLUDE_DIRS ${bitcoin_node_INCLUDE_DIRS} CACHE STRING "Placeholder" )
else()
set( bitcoin_protocol_FOR_BUILD_INCLUDE_DIRS ${bitcoin_protocol_STATIC_INCLUDE_DIRS} CACHE STRING "Placeholder" )
set( bitcoin_node_FOR_BUILD_INCLUDE_DIRS ${bitcoin_node_STATIC_INCLUDE_DIRS} CACHE STRING "Placeholder" )
endif()

# ${CANONICAL_LIB_NAME} project specific include directories.
#------------------------------------------------------------------------------
target_include_directories( ${CANONICAL_LIB_NAME} PRIVATE
"../../include"
${bitcoin_protocol_FOR_BUILD_INCLUDE_DIRS}
${bitcoin_node_FOR_BUILD_INCLUDE_DIRS} )

target_include_directories( ${CANONICAL_LIB_NAME} PUBLIC
Expand All @@ -284,17 +272,14 @@ target_include_directories( ${CANONICAL_LIB_NAME} PUBLIC
# ${CANONICAL_LIB_NAME} project specific libraries noramalization for build.
#------------------------------------------------------------------------------
if (BUILD_SHARED_LIBS)
set( bitcoin_protocol_FOR_BUILD_LIBRARIES ${bitcoin_protocol_LIBRARIES} CACHE STRING "Placeholder" )
set( bitcoin_node_FOR_BUILD_LIBRARIES ${bitcoin_node_LIBRARIES} CACHE STRING "Placeholder" )
else()
set( bitcoin_protocol_FOR_BUILD_LIBRARIES ${bitcoin_protocol_STATIC_LIBRARIES} CACHE STRING "Placeholder" )
set( bitcoin_node_FOR_BUILD_LIBRARIES ${bitcoin_node_STATIC_LIBRARIES} CACHE STRING "Placeholder" )
endif()

# ${CANONICAL_LIB_NAME} project specific libraries/linker flags.
#------------------------------------------------------------------------------
target_link_libraries( ${CANONICAL_LIB_NAME}
${bitcoin_protocol_FOR_BUILD_LIBRARIES}
${bitcoin_node_FOR_BUILD_LIBRARIES} )

# Define libbitcoin-server-test project.
Expand Down
19 changes: 0 additions & 19 deletions builds/msvc/vs2022/bs/bs.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,9 @@

<ImportGroup Label="PropertySheets">
<Import Project="$(SolutionDir)libbitcoin-system.import.props" />
<Import Project="$(SolutionDir)libbitcoin-consensus.import.props" />
<Import Project="$(SolutionDir)libbitcoin-database.import.props" />
<Import Project="$(SolutionDir)libbitcoin-blockchain.import.props" />
<Import Project="$(SolutionDir)libbitcoin-network.import.props" />
<Import Project="$(SolutionDir)libbitcoin-node.import.props" />
<Import Project="$(SolutionDir)libbitcoin-protocol.import.props" />
<Import Project="$(SolutionDir)libbitcoin-server.import.props" />
</ImportGroup>

Expand All @@ -34,54 +31,38 @@
</PropertyGroup>

<PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
<Linkage-libzmq>dynamic</Linkage-libzmq>
<Linkage-secp256k1>dynamic</Linkage-secp256k1>
<Linkage-libbitcoin-system>dynamic</Linkage-libbitcoin-system>
<Linkage-libbitcoin-consensus>dynamic</Linkage-libbitcoin-consensus>
<Linkage-libbitcoin-database>dynamic</Linkage-libbitcoin-database>
<Linkage-libbitcoin-blockchain>dynamic</Linkage-libbitcoin-blockchain>
<Linkage-libbitcoin-network>dynamic</Linkage-libbitcoin-network>
<Linkage-libbitcoin-node>dynamic</Linkage-libbitcoin-node>
<Linkage-libbitcoin-protocol>dynamic</Linkage-libbitcoin-protocol>
<Linkage-libbitcoin-server>dynamic</Linkage-libbitcoin-server>
</PropertyGroup>
<PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
<Linkage-libzmq>ltcg</Linkage-libzmq>
<Linkage-secp256k1>ltcg</Linkage-secp256k1>
<Linkage-libbitcoin-system>ltcg</Linkage-libbitcoin-system>
<Linkage-libbitcoin-consensus>ltcg</Linkage-libbitcoin-consensus>
<Linkage-libbitcoin-database>ltcg</Linkage-libbitcoin-database>
<Linkage-libbitcoin-blockchain>ltcg</Linkage-libbitcoin-blockchain>
<Linkage-libbitcoin-network>ltcg</Linkage-libbitcoin-network>
<Linkage-libbitcoin-node>ltcg</Linkage-libbitcoin-node>
<Linkage-libbitcoin-protocol>ltcg</Linkage-libbitcoin-protocol>
<Linkage-libbitcoin-server>ltcg</Linkage-libbitcoin-server>
</PropertyGroup>
<PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
<Linkage-libzmq>static</Linkage-libzmq>
<Linkage-secp256k1>static</Linkage-secp256k1>
<Linkage-libbitcoin-system>static</Linkage-libbitcoin-system>
<Linkage-libbitcoin-consensus>static</Linkage-libbitcoin-consensus>
<Linkage-libbitcoin-database>static</Linkage-libbitcoin-database>
<Linkage-libbitcoin-blockchain>static</Linkage-libbitcoin-blockchain>
<Linkage-libbitcoin-network>static</Linkage-libbitcoin-network>
<Linkage-libbitcoin-node>static</Linkage-libbitcoin-node>
<Linkage-libbitcoin-protocol>static</Linkage-libbitcoin-protocol>
<Linkage-libbitcoin-server>static</Linkage-libbitcoin-server>
</PropertyGroup>

<!-- Messages -->

<Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
<Message Text="Linkage-libzmq : $(Linkage-libzmq)" Importance="high"/>
<Message Text="Linkage-secp256k1 : $(Linkage-secp256k1)" Importance="high"/>
<Message Text="Linkage-_system : $(Linkage-libbitcoin-system)" Importance="high"/>
<Message Text="Linkage-_consensus: $(Linkage-libbitcoin-consensus)" Importance="high"/>
<Message Text="Linkage-_database : $(Linkage-libbitcoin-database)" Importance="high"/>
<Message Text="Linkage-_blockchain: $(Linkage-libbitcoin-blockchain)" Importance="high"/>
<Message Text="Linkage-_node : $(Linkage-libbitcoin-node)" Importance="high"/>
<Message Text="Linkage-_network : $(Linkage-libbitcoin-network)" Importance="high"/>
<Message Text="Linkage-_protocol : $(Linkage-libbitcoin-protocol)" Importance="high"/>
<Message Text="Linkage-_server : $(Linkage-libbitcoin-server)" Importance="high"/>
</Target>

Expand Down
35 changes: 0 additions & 35 deletions builds/msvc/vs2022/libbitcoin-blockchain.import.props
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions builds/msvc/vs2022/libbitcoin-blockchain.import.xml
View file
Open in desktop

This file was deleted.

Loading
Loading