Merge pull request #375 from evoskuil/master

evoskuil · web-flow · commit c8a9bf151fae · 2026-01-02T14:19:11.000-05:00
Remove zmq, protocol, and blockchain server .props dependencies.
diff --git a/generate4.xml b/generate4.xml
@@ -1581,7 +1581,6 @@
       <dependency name="bash-completion" version="2.0.0" option="bash-completiondir" unprefixed="true" extract="completionsdir" default="${datadir}/bash-completion/completions" />
 
       <dependency name="bitcoin-node" version="4.0.0" />
-      <!--<dependency name="bitcoin-protocol" version="4.0.0" />-->
 
       <!-- General flags -->
       <flag name="std=c++20" comment="Require c++20 for all c++ products." context="c++" />
@@ -1621,7 +1620,6 @@
       </product>
       <product prefix="lib" path="src" uuid="73ce0ac2-ecb2-4e8d-a136-17840c0371a0" >
         <flag define="sysconfdir" />
-        <!--<library name="bitcoin-protocol" />-->
         <library name="bitcoin-node" />
         <headers path="include" />
         <sources path="src" />
@@ -1656,14 +1654,6 @@
         <option value="${with_boost}" />
         <option value="${with_pkgconfigdir}" />
       </build>
-      <!--
-      <build name="bitcoin-protocol" github="libbitcoin" repository="libbitcoin-protocol" branch="master" parallel="true" >
-        <option value="--without-tests" cmake="-Dwith-tests=no" />
-        <option value="--without-examples" cmake="-Dwith-examples=no" />
-        <option value="${with_boost}" />
-        <option value="${with_pkgconfigdir}" />
-      </build>
-      -->
       <build name="bitcoin-server" github="libbitcoin" repository="libbitcoin-server" branch="master" parallel="true" >
         <option value="${with_boost}" />
         <option value="${with_pkgconfigdir}" />
@@ -1672,7 +1662,6 @@
 
     <presets>
       <mapping name="bitcoin-server" type="base" />
-      <!--<mapping name="bitcoin-protocol" type="base" />-->
       <mapping name="bitcoin-node" type="base" />
       <mapping name="bitcoin-network" type="base" />
       <mapping name="bitcoin-database" type="base" />
@@ -1780,20 +1769,17 @@
       <job system="osx" image="xcode12.2" compiler="clang" link="dynamic" >
         <get name="boost" />
         <get name="bash-completion" />
-        <!--<option value="--build-zmq" />-->
         <option value="--disable-static" />
         <option value="--with-bash-completiondir" />
       </job>
       <job system="osx" compiler="clang" link="static" >
         <!-- these allow unused build to complete -->
         <option value="--disable-shared" />
         <option value="--build-boost" />
-        <!--<option value="--build-zmq" />-->
         <option value="--prefix=$TRAVIS_BUILD_DIR/my-prefix" />
       </job>
       <job system="linux" compiler="clang" link="dynamic" sudo="false" >
         <option value="--build-boost" />
-        <!--<option value="--build-zmq" />-->
         <option value="--disable-ndebug" />
         <option value="--disable-static" />
         <option value="--prefix=$TRAVIS_BUILD_DIR/my-prefix" />
@@ -1803,7 +1789,6 @@
       <job system="linux" compiler="clang" link="static" version="5.0" >
         <option value="--disable-shared" />
         <option value="--build-boost" />
-        <!--<option value="--build-zmq" />-->
         <option value="--prefix=$TRAVIS_BUILD_DIR/my-prefix" />
         <option value="CFLAGS='-Os'" />
         <option value="CXXFLAGS='-Os'" />
@@ -1812,7 +1797,6 @@
         <get name="bash-completion" />
         <option value="--disable-static" />
         <option value="--build-boost" />
-        <!--<option value="--build-zmq" />-->
         <option value="--with-bash-completiondir=$TRAVIS_BUILD_DIR/my-prefix/share/bash-completion/completions" />
         <option value="--prefix=$TRAVIS_BUILD_DIR/my-prefix" />
         <option value="CFLAGS='-Os -s'" />
@@ -1821,7 +1805,6 @@
       <job system="linux" compiler="gcc" link="static" coverage="true" >
         <get name="bash-completion" />
         <option value="--build-boost" />
-        <!--<option value="--build-zmq" />-->
         <option value="--disable-shared" />
         <option value="--build-dir=my-build" />
         <option value="--prefix=$TRAVIS_BUILD_DIR/my-prefix" />
diff --git a/props/version4/project/libbitcoin-server/bs/bs.props b/props/version4/project/libbitcoin-server/bs/bs.props
@@ -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>
 
@@ -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>
 
diff --git a/props/version4/project/libbitcoin-server/libbitcoin-server-test/libbitcoin-server-test.props b/props/version4/project/libbitcoin-server/libbitcoin-server-test/libbitcoin-server-test.props
@@ -22,12 +22,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>
 
@@ -36,54 +33,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>
 
diff --git a/props/version4/project/libbitcoin-server/libbitcoin-server/libbitcoin-server.props b/props/version4/project/libbitcoin-server/libbitcoin-server/libbitcoin-server.props
@@ -28,64 +28,45 @@
 
   <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" />
   </ImportGroup>
 
   <PropertyGroup Condition="'$(NuGetPackageRoot)' == ''">
     <NuGetPackageRoot>..\..\..\..\..\.nuget\packages\</NuGetPackageRoot>
   </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>
   </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>
   </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>
   </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-_network  : $(Linkage-libbitcoin-network)" Importance="high"/>
     <Message Text="Linkage-_node     : $(Linkage-libbitcoin-node)" Importance="high"/>
-    <Message Text="Linkage-_protocol : $(Linkage-libbitcoin-protocol)" Importance="high"/>
   </Target>
 
 </Project>
