Merge pull request #540 from evoskuil/master

Update dependencies and regenerate artifacts.
libbitcoin · Mar 19, 2021 · a152efd · a152efd
2 parents b2aadc9 + 5f287cc
commit a152efd
Show file tree

Hide file tree

Showing 54 changed files with 841 additions and 1,537 deletions.
diff --git a/builds/cmake/CMakeLists.txt b/builds/cmake/CMakeLists.txt
@@ -97,7 +97,7 @@ endif()
 
 # Find boost
 #------------------------------------------------------------------------------
-find_package( Boost 1.62.0 REQUIRED COMPONENTS
+find_package( Boost 1.72.0 REQUIRED COMPONENTS
     unit_test_framework )
 
 set( boost_unit_test_framework_LIBS "-lboost_unit_test_framework" )
@@ -140,32 +140,32 @@ endif()
 # Define project common library directories
 #------------------------------------------------------------------------------
 if (BUILD_SHARED_LIBS)
-    link_directories( 
+    link_directories(
         ${bitcoin_protocol_LIBRARY_DIRS}
         ${bitcoin_node_LIBRARY_DIRS} )
 else()
-    link_directories( 
+    link_directories(
         ${bitcoin_protocol_STATIC_LIBRARY_DIRS}
         ${bitcoin_node_STATIC_LIBRARY_DIRS} )
 endif()
 
 # Define project common libraries/linker flags.
 #------------------------------------------------------------------------------
 if (BUILD_SHARED_LIBS)
-    link_libraries( 
+    link_libraries(
         "-fstack-protector"
         "-fstack-protector-all"
         ${bitcoin_protocol_LIBRARIES}
         ${bitcoin_node_LIBRARIES} )
 else()
-    link_libraries( 
+    link_libraries(
         "-fstack-protector"
         "-fstack-protector-all"
         ${bitcoin_protocol_STATIC_LIBRARIES}
         ${bitcoin_node_STATIC_LIBRARIES} )
 endif()
 
-add_definitions( 
+add_definitions(
     -DSYSCONFDIR=\"${sysconfdir}\" )
 
 # Define ${CANONICAL_LIB_NAME} project.

diff --git a/builds/msvc/vs2013/bs/bs.props b/builds/msvc/vs2013/bs/bs.props
@@ -12,9 +12,7 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <AdditionalIncludeDirectories>$(RepoRoot)include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <DisableSpecificWarnings>4290;%(DisableSpecificWarnings)</DisableSpecificWarnings>
       <EnablePREfast>false</EnablePREfast>
-      <PreprocessorDefinitions>_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
 
@@ -75,16 +73,16 @@
   <!-- 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-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"/>
+    <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>
 
 </Project>

diff --git a/builds/msvc/vs2013/bs/bs.vcxproj b/builds/msvc/vs2013/bs/bs.vcxproj
@@ -99,7 +99,7 @@
     <Import Project="$(NuGetPackageRoot)boost_regex-vc120.1.57.0.0\build\native\boost_regex-vc120.targets" Condition="Exists('$(NuGetPackageRoot)boost_regex-vc120.1.57.0.0\build\native\boost_regex-vc120.targets')" />
     <Import Project="$(NuGetPackageRoot)boost_system-vc120.1.57.0.0\build\native\boost_system-vc120.targets" Condition="Exists('$(NuGetPackageRoot)boost_system-vc120.1.57.0.0\build\native\boost_system-vc120.targets')" />
     <Import Project="$(NuGetPackageRoot)boost_thread-vc120.1.57.0.0\build\native\boost_thread-vc120.targets" Condition="Exists('$(NuGetPackageRoot)boost_thread-vc120.1.57.0.0\build\native\boost_thread-vc120.targets')" />
-    <Import Project="$(NuGetPackageRoot)secp256k1_vc120.0.1.0.17\build\native\secp256k1_vc120.targets" Condition="Exists('$(NuGetPackageRoot)secp256k1_vc120.0.1.0.17\build\native\secp256k1_vc120.targets')" />
+    <Import Project="$(NuGetPackageRoot)secp256k1_vc120.0.1.0.19\build\native\secp256k1_vc120.targets" Condition="Exists('$(NuGetPackageRoot)secp256k1_vc120.0.1.0.19\build\native\secp256k1_vc120.targets')" />
     <Import Project="$(NuGetPackageRoot)libzmq_vc120.4.3.2\build\native\libzmq_vc120.targets" Condition="Exists('$(NuGetPackageRoot)libzmq_vc120.4.3.2\build\native\libzmq_vc120.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
@@ -119,7 +119,7 @@
     <Error Condition="!Exists('$(NuGetPackageRoot)boost_regex-vc120.1.57.0.0\build\native\boost_regex-vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_regex-vc120.1.57.0.0\build\native\boost_regex-vc120.targets'))" />
     <Error Condition="!Exists('$(NuGetPackageRoot)boost_system-vc120.1.57.0.0\build\native\boost_system-vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_system-vc120.1.57.0.0\build\native\boost_system-vc120.targets'))" />
     <Error Condition="!Exists('$(NuGetPackageRoot)boost_thread-vc120.1.57.0.0\build\native\boost_thread-vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_thread-vc120.1.57.0.0\build\native\boost_thread-vc120.targets'))" />
-    <Error Condition="!Exists('$(NuGetPackageRoot)secp256k1_vc120.0.1.0.17\build\native\secp256k1_vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)secp256k1_vc120.0.1.0.17\build\native\secp256k1_vc120.targets'))" />
+    <Error Condition="!Exists('$(NuGetPackageRoot)secp256k1_vc120.0.1.0.19\build\native\secp256k1_vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)secp256k1_vc120.0.1.0.19\build\native\secp256k1_vc120.targets'))" />
     <Error Condition="!Exists('$(NuGetPackageRoot)libzmq_vc120.4.3.2\build\native\libzmq_vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)libzmq_vc120.4.3.2\build\native\libzmq_vc120.targets'))" />
   </Target>
   <ItemGroup>

diff --git a/builds/msvc/vs2013/bs/packages.config b/builds/msvc/vs2013/bs/packages.config
@@ -19,6 +19,6 @@
   <package id="boost_regex-vc120" version="1.57.0.0" targetFramework="Native" />
   <package id="boost_system-vc120" version="1.57.0.0" targetFramework="Native" />
   <package id="boost_thread-vc120" version="1.57.0.0" targetFramework="Native" />
-  <package id="secp256k1_vc120" version="0.1.0.17" targetFramework="Native" />
+  <package id="secp256k1_vc120" version="0.1.0.19" targetFramework="Native" />
   <package id="libzmq_vc120" version="4.3.2" targetFramework="Native" />
 </packages>
diff --git a/builds/msvc/vs2013/libbitcoin-blockchain.import.props b/builds/msvc/vs2013/libbitcoin-blockchain.import.props
@@ -23,12 +23,25 @@
     </Link>
     <Link Condition="($(PlatformToolset) == 'v120') Or ($(PlatformToolset) == 'CTP_Nov2013')">
       <!-- $(PlatformToolset) is hard wired to CTP_Nov2013 to allow for linkage by PlatformToolset=v120 (and CTP_Nov2013) callers. -->
-      <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Debug')) != -1">$(ProjectDir)..\..\..\..\..\libbitcoin-blockchain\bin\$(PlatformName)\Debug\CTP_Nov2013\$(Linkage-libbitcoin-blockchain)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Release')) != -1">$(ProjectDir)..\..\..\..\..\libbitcoin-blockchain\bin\$(PlatformName)\Release\CTP_Nov2013\$(Linkage-libbitcoin-blockchain)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Debug')) != -1">
+        $(ProjectDir)..\..\..\..\..\libbitcoin-blockchain\bin\$(PlatformName)\Debug\CTP_Nov2013\$(Linkage-libbitcoin-blockchain)\;
+        $(ProjectDir)..\..\..\..\..\libbitcoin-blockchain\obj\libbitcoin-blockchain\$(PlatformName)\Debug\CTP_Nov2013\$(Linkage-libbitcoin-blockchain)\;%(AdditionalLibraryDirectories)
+      </AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Release')) != -1">
+        $(ProjectDir)..\..\..\..\..\libbitcoin-blockchain\bin\$(PlatformName)\Release\CTP_Nov2013\$(Linkage-libbitcoin-blockchain)\;
+        $(ProjectDir)..\..\..\..\..\libbitcoin-blockchain\obj\libbitcoin-blockchain\$(PlatformName)\Release\CTP_Nov2013\$(Linkage-libbitcoin-blockchain)\;%(AdditionalLibraryDirectories)
+        %(AdditionalLibraryDirectories)
+      </AdditionalLibraryDirectories>
     </Link>
     <Link Condition="($(PlatformToolset) != 'v120') And ($(PlatformToolset) != 'CTP_Nov2013')">
-      <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Debug')) != -1">$(ProjectDir)..\..\..\..\..\libbitcoin-blockchain\bin\$(PlatformName)\Debug\$(PlatformToolset)\$(Linkage-libbitcoin-blockchain)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Release')) != -1">$(ProjectDir)..\..\..\..\..\libbitcoin-blockchain\bin\$(PlatformName)\Release\$(PlatformToolset)\$(Linkage-libbitcoin-blockchain)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Debug')) != -1">
+        $(ProjectDir)..\..\..\..\..\libbitcoin-blockchain\bin\$(PlatformName)\Debug\$(PlatformToolset)\$(Linkage-libbitcoin-blockchain)\;
+        $(ProjectDir)..\..\..\..\..\libbitcoin-blockchain\obj\libbitcoin-blockchain\$(PlatformName)\Debug\$(PlatformToolset)\$(Linkage-libbitcoin-blockchain)\;%(AdditionalLibraryDirectories)
+      </AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Release')) != -1">
+        $(ProjectDir)..\..\..\..\..\libbitcoin-blockchain\bin\$(PlatformName)\Release\$(PlatformToolset)\$(Linkage-libbitcoin-blockchain)\;
+        $(ProjectDir)..\..\..\..\..\libbitcoin-blockchain\obj\libbitcoin-blockchain\$(PlatformName)\Release\$(PlatformToolset)\$(Linkage-libbitcoin-blockchain)\;%(AdditionalLibraryDirectories)
+      </AdditionalLibraryDirectories>
     </Link>
     <Link Condition="$(PlatformToolset) == 'v120'">
       <!-- Need to link $(VC_CTP_Nov2013_LibraryPath_x86), $(VC_CTP_Nov2013_LibraryPath_x64), or $(VC_CTP_Nov2013_LibraryPath_ARM).-->
@@ -37,44 +50,4 @@
       <AdditionalLibraryDirectories Condition="$(PlatformName) == 'Win32'">$(ProgramFiles)\Microsoft Visual C++ Compiler Nov 2013 CTP\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
-
-  <!-- Copy -->
-
-  <!-- $(PlatformToolset) is hard wired to CTP_Nov2013 to allow for linkage by PlatformToolset=v120 (and CTP_Nov2013) callers. -->
-  <Target Name="Linkage-libbitcoin-blockchain-dynamic" AfterTargets="AfterBuild" Condition="('$(Linkage-libbitcoin-blockchain)' == 'dynamic') And (($(PlatformToolset) == 'v120') Or ($(PlatformToolset) == 'CTP_Nov2013'))">
-    <Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libbitcoin-blockchain\bin\$(PlatformName)\Debug\CTP_Nov2013\dynamic\libbitcoin-blockchain.dll"
-          DestinationFiles="$(TargetDir)libbitcoin-blockchain.dll"
-          SkipUnchangedFiles="true" />
-    <Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libbitcoin-blockchain\bin\$(PlatformName)\Debug\CTP_Nov2013\dynamic\libbitcoin-blockchain.pdb"
-          DestinationFiles="$(TargetDir)libbitcoin-blockchain.pdb"
-          SkipUnchangedFiles="true" />
-    <Copy Condition="$(Configuration.IndexOf('Release')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libbitcoin-blockchain\bin\$(PlatformName)\Release\CTP_Nov2013\dynamic\libbitcoin-blockchain.dll"
-          DestinationFiles="$(TargetDir)libbitcoin-blockchain.dll"
-          SkipUnchangedFiles="true" />
-  </Target>
-  <Target Name="Linkage-libbitcoin-blockchain-dynamic" AfterTargets="AfterBuild" Condition="('$(Linkage-libbitcoin-blockchain)' == 'dynamic') And (($(PlatformToolset) != 'v120') And ($(PlatformToolset) != 'CTP_Nov2013'))">
-    <Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libbitcoin-blockchain\bin\$(PlatformName)\Debug\$(PlatformToolset)\dynamic\libbitcoin-blockchain.dll"
-          DestinationFiles="$(TargetDir)libbitcoin-blockchain.dll"
-          SkipUnchangedFiles="true" />
-    <Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libbitcoin-blockchain\bin\$(PlatformName)\Debug\$(PlatformToolset)\dynamic\libbitcoin-blockchain.pdb"
-          DestinationFiles="$(TargetDir)libbitcoin-blockchain.pdb"
-          SkipUnchangedFiles="true" />
-    <Copy Condition="$(Configuration.IndexOf('Release')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libbitcoin-blockchain\bin\$(PlatformName)\Release\$(PlatformToolset)\dynamic\libbitcoin-blockchain.dll"
-          DestinationFiles="$(TargetDir)libbitcoin-blockchain.dll"
-          SkipUnchangedFiles="true" />
-  </Target>
-
-  <!-- Messages -->
-
-  <Target Name="libbitcoin-blockchain-info" BeforeTargets="AfterBuild" Condition="'$(Linkage-libbitcoin-blockchain)' == 'dynamic'">
-    <Message Text="Copying libbitcoin-blockchain.dll -&gt; $(TargetDir)libbitcoin-blockchain.dll" Importance="high"/>
-    <Message Text="Copying libbitcoin-blockchain.pdb -&gt; $(TargetDir)libbitcoin-blockchain.pdb" Importance="high" Condition="$(Configuration.IndexOf('Debug')) != -1" />
-  </Target>
-
 </Project>