Skip to content

Commit 99df930

Browse files
pmienkpmienk
committed
ZeroMQ verion check 4.2.0, msvc artifact cleanup, target renaming (- replaces _).
1 parent beea699 commit 99df930

17 files changed

Lines changed: 66 additions & 62 deletions

‎Makefile.am‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,13 @@ src_libbitcoin_protocol_la_SOURCES = \
4747
src/zmq/worker.cpp \
4848
src/zmq/zeromq.cpp
4949

50-
# local: test/libbitcoin_protocol_test
50+
# local: test/libbitcoin-protocol-test
5151
#------------------------------------------------------------------------------
5252
if WITH_TESTS
5353

54-
TESTS = libbitcoin_protocol_test_runner.sh
54+
TESTS = libbitcoin-protocol-test_runner.sh
5555

56-
check_PROGRAMS = test/libbitcoin_protocol_test
56+
check_PROGRAMS = test/libbitcoin-protocol-test
5757
test_libbitcoin_protocol_test_CPPFLAGS = -I${srcdir}/include ${zmq_CPPFLAGS} ${bitcoin_CPPFLAGS}
5858
test_libbitcoin_protocol_test_LDADD = src/libbitcoin-protocol.la ${boost_unit_test_framework_LIBS} ${zmq_LIBS} ${bitcoin_LIBS}
5959
test_libbitcoin_protocol_test_SOURCES = \

‎builds/msvc/vs2013/libbitcoin-protocol-test/libbitcoin-protocol-test.vcxproj‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -92,40 +92,42 @@
9292
<ImportGroup Label="ExtensionTargets" />
9393
<ImportGroup Label="ExtensionSettings">
9494
<Import Project="$(NuGetPackageRoot)boost.1.57.0.0\build\native\boost.targets" Condition="Exists('$(NuGetPackageRoot)boost.1.57.0.0\build\native\boost.targets')" />
95+
<Import Project="$(NuGetPackageRoot)libzmq_vc120.4.2.30\build\native\libzmq_vc120.targets" Condition="Exists('$(NuGetPackageRoot)libzmq_vc120.4.2.30\build\native\libzmq_vc120.targets')" />
96+
<Import Project="$(NuGetPackageRoot)boost_atomic-vc120.1.57.0.0\build\native\boost_atomic-vc120.targets" Condition="Exists('$(NuGetPackageRoot)boost_atomic-vc120.1.57.0.0\build\native\boost_atomic-vc120.targets')" />
9597
<Import Project="$(NuGetPackageRoot)boost_chrono-vc120.1.57.0.0\build\native\boost_chrono-vc120.targets" Condition="Exists('$(NuGetPackageRoot)boost_chrono-vc120.1.57.0.0\build\native\boost_chrono-vc120.targets')" />
9698
<Import Project="$(NuGetPackageRoot)boost_date_time-vc120.1.57.0.0\build\native\boost_date_time-vc120.targets" Condition="Exists('$(NuGetPackageRoot)boost_date_time-vc120.1.57.0.0\build\native\boost_date_time-vc120.targets')" />
9799
<Import Project="$(NuGetPackageRoot)boost_filesystem-vc120.1.57.0.0\build\native\boost_filesystem-vc120.targets" Condition="Exists('$(NuGetPackageRoot)boost_filesystem-vc120.1.57.0.0\build\native\boost_filesystem-vc120.targets')" />
98100
<Import Project="$(NuGetPackageRoot)boost_iostreams-vc120.1.57.0.0\build\native\boost_iostreams-vc120.targets" Condition="Exists('$(NuGetPackageRoot)boost_iostreams-vc120.1.57.0.0\build\native\boost_iostreams-vc120.targets')" />
99101
<Import Project="$(NuGetPackageRoot)boost_locale-vc120.1.57.0.0\build\native\boost_locale-vc120.targets" Condition="Exists('$(NuGetPackageRoot)boost_locale-vc120.1.57.0.0\build\native\boost_locale-vc120.targets')" />
100-
<Import Project="$(NuGetPackageRoot)boost_log-vc120.1.57.0.0\build\native\boost_log-vc120.targets" Condition="Exists('$(NuGetPackageRoot)boost_log-vc120.1.57.0.0\build\native\boost_log-vc120.targets')" />
101102
<Import Project="$(NuGetPackageRoot)boost_log_setup-vc120.1.57.0.0\build\native\boost_log_setup-vc120.targets" Condition="Exists('$(NuGetPackageRoot)boost_log_setup-vc120.1.57.0.0\build\native\boost_log_setup-vc120.targets')" />
103+
<Import Project="$(NuGetPackageRoot)boost_log-vc120.1.57.0.0\build\native\boost_log-vc120.targets" Condition="Exists('$(NuGetPackageRoot)boost_log-vc120.1.57.0.0\build\native\boost_log-vc120.targets')" />
102104
<Import Project="$(NuGetPackageRoot)boost_program_options-vc120.1.57.0.0\build\native\boost_program_options-vc120.targets" Condition="Exists('$(NuGetPackageRoot)boost_program_options-vc120.1.57.0.0\build\native\boost_program_options-vc120.targets')" />
103105
<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')" />
104106
<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')" />
105107
<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')" />
106-
<Import Project="$(NuGetPackageRoot)boost_unit_test_framework-vc120.1.57.0.0\build\native\boost_unit_test_framework-vc120.targets" Condition="Exists('$(NuGetPackageRoot)boost_unit_test_framework-vc120.1.57.0.0\build\native\boost_unit_test_framework-vc120.targets')" />
107-
<Import Project="$(NuGetPackageRoot)libzmq_vc120.4.2.30\build\native\libzmq_vc120.targets" Condition="Exists('$(NuGetPackageRoot)libzmq_vc120.4.2.30\build\native\libzmq_vc120.targets')" />
108108
<Import Project="$(NuGetPackageRoot)secp256k1_vc120.0.1.0.16\build\native\secp256k1_vc120.targets" Condition="Exists('$(NuGetPackageRoot)secp256k1_vc120.0.1.0.16\build\native\secp256k1_vc120.targets')" />
109+
<Import Project="$(NuGetPackageRoot)boost_unit_test_framework-vc120.1.57.0.0\build\native\boost_unit_test_framework-vc120.targets" Condition="Exists('$(NuGetPackageRoot)boost_unit_test_framework-vc120.1.57.0.0\build\native\boost_unit_test_framework-vc120.targets')" />
109110
</ImportGroup>
110111
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
111112
<PropertyGroup>
112113
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
113114
</PropertyGroup>
114115
<Error Condition="!Exists('$(NuGetPackageRoot)boost.1.57.0.0\build\native\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost.1.57.0.0\build\native\boost.targets'))" />
116+
<Error Condition="!Exists('$(NuGetPackageRoot)libzmq_vc120.4.2.30\build\native\libzmq_vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)libzmq_vc120.4.2.30\build\native\libzmq_vc120.targets'))" />
117+
<Error Condition="!Exists('$(NuGetPackageRoot)boost_atomic-vc120.1.57.0.0\build\native\boost_atomic-vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_atomic-vc120.1.57.0.0\build\native\boost_atomic-vc120.targets'))" />
115118
<Error Condition="!Exists('$(NuGetPackageRoot)boost_chrono-vc120.1.57.0.0\build\native\boost_chrono-vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_chrono-vc120.1.57.0.0\build\native\boost_chrono-vc120.targets'))" />
116119
<Error Condition="!Exists('$(NuGetPackageRoot)boost_date_time-vc120.1.57.0.0\build\native\boost_date_time-vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_date_time-vc120.1.57.0.0\build\native\boost_date_time-vc120.targets'))" />
117120
<Error Condition="!Exists('$(NuGetPackageRoot)boost_filesystem-vc120.1.57.0.0\build\native\boost_filesystem-vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_filesystem-vc120.1.57.0.0\build\native\boost_filesystem-vc120.targets'))" />
118121
<Error Condition="!Exists('$(NuGetPackageRoot)boost_iostreams-vc120.1.57.0.0\build\native\boost_iostreams-vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_iostreams-vc120.1.57.0.0\build\native\boost_iostreams-vc120.targets'))" />
119122
<Error Condition="!Exists('$(NuGetPackageRoot)boost_locale-vc120.1.57.0.0\build\native\boost_locale-vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_locale-vc120.1.57.0.0\build\native\boost_locale-vc120.targets'))" />
120-
<Error Condition="!Exists('$(NuGetPackageRoot)boost_log-vc120.1.57.0.0\build\native\boost_log-vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_log-vc120.1.57.0.0\build\native\boost_log-vc120.targets'))" />
121123
<Error Condition="!Exists('$(NuGetPackageRoot)boost_log_setup-vc120.1.57.0.0\build\native\boost_log_setup-vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_log_setup-vc120.1.57.0.0\build\native\boost_log_setup-vc120.targets'))" />
124+
<Error Condition="!Exists('$(NuGetPackageRoot)boost_log-vc120.1.57.0.0\build\native\boost_log-vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_log-vc120.1.57.0.0\build\native\boost_log-vc120.targets'))" />
122125
<Error Condition="!Exists('$(NuGetPackageRoot)boost_program_options-vc120.1.57.0.0\build\native\boost_program_options-vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_program_options-vc120.1.57.0.0\build\native\boost_program_options-vc120.targets'))" />
123126
<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'))" />
124127
<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'))" />
125128
<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'))" />
126-
<Error Condition="!Exists('$(NuGetPackageRoot)boost_unit_test_framework-vc120.1.57.0.0\build\native\boost_unit_test_framework-vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_unit_test_framework-vc120.1.57.0.0\build\native\boost_unit_test_framework-vc120.targets'))" />
127-
<Error Condition="!Exists('$(NuGetPackageRoot)libzmq_vc120.4.2.30\build\native\libzmq_vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)libzmq_vc120.4.2.30\build\native\libzmq_vc120.targets'))" />
128129
<Error Condition="!Exists('$(NuGetPackageRoot)secp256k1_vc120.0.1.0.16\build\native\secp256k1_vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)secp256k1_vc120.0.1.0.16\build\native\secp256k1_vc120.targets'))" />
130+
<Error Condition="!Exists('$(NuGetPackageRoot)boost_unit_test_framework-vc120.1.57.0.0\build\native\boost_unit_test_framework-vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_unit_test_framework-vc120.1.57.0.0\build\native\boost_unit_test_framework-vc120.targets'))" />
129131
</Target>
130132
<ItemGroup>
131133
<ProjectReference Include="..\libbitcoin-protocol\libbitcoin-protocol.vcxproj">

‎builds/msvc/vs2013/libbitcoin-protocol-test/packages.config‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,19 @@
77
-->
88
<packages>
99
<package id="boost" version="1.57.0.0" targetFramework="Native" />
10+
<package id="libzmq_vc120" version="4.2.30" targetFramework="Native" />
11+
<package id="boost_atomic-vc120" version="1.57.0.0" targetFramework="Native" />
1012
<package id="boost_chrono-vc120" version="1.57.0.0" targetFramework="Native" />
1113
<package id="boost_date_time-vc120" version="1.57.0.0" targetFramework="Native" />
1214
<package id="boost_filesystem-vc120" version="1.57.0.0" targetFramework="Native" />
1315
<package id="boost_iostreams-vc120" version="1.57.0.0" targetFramework="Native" />
1416
<package id="boost_locale-vc120" version="1.57.0.0" targetFramework="Native" />
15-
<package id="boost_log-vc120" version="1.57.0.0" targetFramework="Native" />
1617
<package id="boost_log_setup-vc120" version="1.57.0.0" targetFramework="Native" />
18+
<package id="boost_log-vc120" version="1.57.0.0" targetFramework="Native" />
1719
<package id="boost_program_options-vc120" version="1.57.0.0" targetFramework="Native" />
1820
<package id="boost_regex-vc120" version="1.57.0.0" targetFramework="Native" />
1921
<package id="boost_system-vc120" version="1.57.0.0" targetFramework="Native" />
2022
<package id="boost_thread-vc120" version="1.57.0.0" targetFramework="Native" />
21-
<package id="boost_unit_test_framework-vc120" version="1.57.0.0" targetFramework="Native" />
22-
<package id="libzmq_vc120" version="4.2.30" targetFramework="Native" />
2323
<package id="secp256k1_vc120" version="0.1.0.16" targetFramework="Native" />
24+
<package id="boost_unit_test_framework-vc120" version="1.57.0.0" targetFramework="Native" />
2425
</packages>

0 commit comments

Comments
 (0)