diff --git a/Makefile.am b/Makefile.am index 0cef2f54..265db9ac 100644 --- a/Makefile.am +++ b/Makefile.am @@ -47,13 +47,13 @@ src_libbitcoin_protocol_la_SOURCES = \ src/zmq/worker.cpp \ src/zmq/zeromq.cpp -# local: test/libbitcoin_protocol_test +# local: test/libbitcoin-protocol-test #------------------------------------------------------------------------------ if WITH_TESTS -TESTS = libbitcoin_protocol_test_runner.sh +TESTS = libbitcoin-protocol-test_runner.sh -check_PROGRAMS = test/libbitcoin_protocol_test +check_PROGRAMS = test/libbitcoin-protocol-test test_libbitcoin_protocol_test_CPPFLAGS = -I${srcdir}/include ${zmq_CPPFLAGS} ${bitcoin_CPPFLAGS} test_libbitcoin_protocol_test_LDADD = src/libbitcoin-protocol.la ${boost_unit_test_framework_LIBS} ${zmq_LIBS} ${bitcoin_LIBS} test_libbitcoin_protocol_test_SOURCES = \ diff --git a/builds/msvc/vs2013/libbitcoin-protocol-test/libbitcoin-protocol-test.vcxproj b/builds/msvc/vs2013/libbitcoin-protocol-test/libbitcoin-protocol-test.vcxproj index d813f3dd..45c4d004 100644 --- a/builds/msvc/vs2013/libbitcoin-protocol-test/libbitcoin-protocol-test.vcxproj +++ b/builds/msvc/vs2013/libbitcoin-protocol-test/libbitcoin-protocol-test.vcxproj @@ -92,40 +92,42 @@ + + - + - - + 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}. + + - + - - + diff --git a/builds/msvc/vs2013/libbitcoin-protocol-test/packages.config b/builds/msvc/vs2013/libbitcoin-protocol-test/packages.config index 8b9da2fb..e5d16c4c 100644 --- a/builds/msvc/vs2013/libbitcoin-protocol-test/packages.config +++ b/builds/msvc/vs2013/libbitcoin-protocol-test/packages.config @@ -7,18 +7,19 @@ --> + + - + - - + diff --git a/builds/msvc/vs2013/libbitcoin-protocol/libbitcoin-protocol.vcxproj b/builds/msvc/vs2013/libbitcoin-protocol/libbitcoin-protocol.vcxproj index 4c09298c..4473e6fb 100644 --- a/builds/msvc/vs2013/libbitcoin-protocol/libbitcoin-protocol.vcxproj +++ b/builds/msvc/vs2013/libbitcoin-protocol/libbitcoin-protocol.vcxproj @@ -108,18 +108,19 @@ + + - + - @@ -127,18 +128,19 @@ 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}. + + - + - diff --git a/builds/msvc/vs2013/libbitcoin-protocol/packages.config b/builds/msvc/vs2013/libbitcoin-protocol/packages.config index 34cb110d..91c5bdcf 100644 --- a/builds/msvc/vs2013/libbitcoin-protocol/packages.config +++ b/builds/msvc/vs2013/libbitcoin-protocol/packages.config @@ -7,17 +7,18 @@ --> + + - + - diff --git a/builds/msvc/vs2015/libbitcoin-protocol-test/libbitcoin-protocol-test.vcxproj b/builds/msvc/vs2015/libbitcoin-protocol-test/libbitcoin-protocol-test.vcxproj index cb21de08..ba1f3ed0 100644 --- a/builds/msvc/vs2015/libbitcoin-protocol-test/libbitcoin-protocol-test.vcxproj +++ b/builds/msvc/vs2015/libbitcoin-protocol-test/libbitcoin-protocol-test.vcxproj @@ -92,42 +92,42 @@ + - + - - + 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}. + - + - - + diff --git a/builds/msvc/vs2015/libbitcoin-protocol-test/packages.config b/builds/msvc/vs2015/libbitcoin-protocol-test/packages.config index 254bc969..1d7c96bb 100644 --- a/builds/msvc/vs2015/libbitcoin-protocol-test/packages.config +++ b/builds/msvc/vs2015/libbitcoin-protocol-test/packages.config @@ -7,19 +7,19 @@ --> + - + - - + diff --git a/builds/msvc/vs2015/libbitcoin-protocol/libbitcoin-protocol.vcxproj b/builds/msvc/vs2015/libbitcoin-protocol/libbitcoin-protocol.vcxproj index 35dfa766..9e43ed23 100644 --- a/builds/msvc/vs2015/libbitcoin-protocol/libbitcoin-protocol.vcxproj +++ b/builds/msvc/vs2015/libbitcoin-protocol/libbitcoin-protocol.vcxproj @@ -108,19 +108,19 @@ + - + - @@ -128,19 +128,19 @@ 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}. + - + - diff --git a/builds/msvc/vs2015/libbitcoin-protocol/packages.config b/builds/msvc/vs2015/libbitcoin-protocol/packages.config index 64ebf343..000d8c84 100644 --- a/builds/msvc/vs2015/libbitcoin-protocol/packages.config +++ b/builds/msvc/vs2015/libbitcoin-protocol/packages.config @@ -7,18 +7,18 @@ --> + - + - diff --git a/builds/msvc/vs2017/libbitcoin-protocol-test/libbitcoin-protocol-test.vcxproj b/builds/msvc/vs2017/libbitcoin-protocol-test/libbitcoin-protocol-test.vcxproj index 8974089d..e54c3941 100644 --- a/builds/msvc/vs2017/libbitcoin-protocol-test/libbitcoin-protocol-test.vcxproj +++ b/builds/msvc/vs2017/libbitcoin-protocol-test/libbitcoin-protocol-test.vcxproj @@ -92,42 +92,42 @@ + - + - - + 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}. + - + - - + diff --git a/builds/msvc/vs2017/libbitcoin-protocol-test/packages.config b/builds/msvc/vs2017/libbitcoin-protocol-test/packages.config index 382931ec..692902a0 100644 --- a/builds/msvc/vs2017/libbitcoin-protocol-test/packages.config +++ b/builds/msvc/vs2017/libbitcoin-protocol-test/packages.config @@ -7,19 +7,19 @@ --> + - + - - + diff --git a/builds/msvc/vs2017/libbitcoin-protocol/libbitcoin-protocol.vcxproj b/builds/msvc/vs2017/libbitcoin-protocol/libbitcoin-protocol.vcxproj index b80b346c..bcfb6e80 100644 --- a/builds/msvc/vs2017/libbitcoin-protocol/libbitcoin-protocol.vcxproj +++ b/builds/msvc/vs2017/libbitcoin-protocol/libbitcoin-protocol.vcxproj @@ -108,19 +108,19 @@ + - + - @@ -128,19 +128,19 @@ 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}. + - + - diff --git a/builds/msvc/vs2017/libbitcoin-protocol/packages.config b/builds/msvc/vs2017/libbitcoin-protocol/packages.config index 407a50dc..d0c055b4 100644 --- a/builds/msvc/vs2017/libbitcoin-protocol/packages.config +++ b/builds/msvc/vs2017/libbitcoin-protocol/packages.config @@ -7,18 +7,18 @@ --> + - + - diff --git a/configure.ac b/configure.ac index 19b4209f..1465f6cb 100644 --- a/configure.ac +++ b/configure.ac @@ -122,10 +122,10 @@ AS_CASE([${with_tests}], [yes], AC_MSG_NOTICE([boost_unit_test_framework_LIBS : ${boost_unit_test_framework_LIBS}])], [AC_SUBST([boost_unit_test_framework_LIBS], [])]) -# Require zmq of at least version 4.2.3 and output ${zmq_CPPFLAGS/LIBS/PKG}. +# Require zmq of at least version 4.2.0 and output ${zmq_CPPFLAGS/LIBS/PKG}. #------------------------------------------------------------------------------ -PKG_CHECK_MODULES([zmq], [libzmq >= 4.2.3]) -AC_SUBST([zmq_PKG], ['libzmq >= 4.2.3']) +PKG_CHECK_MODULES([zmq], [libzmq >= 4.2.0]) +AC_SUBST([zmq_PKG], ['libzmq >= 4.2.0']) AC_SUBST([zmq_CPPFLAGS], [${zmq_CFLAGS}]) AC_MSG_NOTICE([zmq_CPPFLAGS : ${zmq_CPPFLAGS}]) AC_MSG_NOTICE([zmq_LIBS : ${zmq_LIBS}]) diff --git a/install.sh b/install.sh index 917db95b..17980179 100755 --- a/install.sh +++ b/install.sh @@ -9,6 +9,7 @@ # # Script options: # --build-boost Builds Boost libraries. +# --build-zmq Build ZeroMQ libraries. # --build-dir= Location of downloaded and intermediate files. # --prefix= Library install location (defaults to /usr/local). # --disable-shared Disables shared library builds. @@ -32,8 +33,8 @@ BUILD_DIR="build-libbitcoin-protocol" # ZMQ archive. #------------------------------------------------------------------------------ -ZMQ_URL="https://github.com/zeromq/libzmq/releases/download/v4.2.3/zeromq-4.2.3.tar.gz" -ZMQ_ARCHIVE="zeromq-4.2.3.tar.gz" +ZMQ_URL="https://github.com/zeromq/libzmq/releases/download/v4.2.0/zeromq-4.2.0.tar.gz" +ZMQ_ARCHIVE="zeromq-4.2.0.tar.gz" # Boost archive. #------------------------------------------------------------------------------ @@ -73,23 +74,19 @@ create_directory() display_heading_message() { - local MESSAGE="$1" - echo - echo "********************** $MESSAGE **********************" + echo "********************** $@ **********************" echo } display_message() { - local MESSAGE="$1" - echo "$MESSAGE" + echo "$@" } display_error() { - local MESSAGE="$1" - >&2 echo "$MESSAGE" + >&2 echo "$@" } initialize_git() @@ -313,6 +310,7 @@ display_message "--------------------------------------------------------------- # Define boost options. #------------------------------------------------------------------------------ BOOST_OPTIONS=( +"--with-atomic" \ "--with-chrono" \ "--with-date_time" \ "--with-filesystem" \ diff --git a/libbitcoin_protocol_test_runner.sh b/libbitcoin-protocol-test_runner.sh similarity index 91% rename from libbitcoin_protocol_test_runner.sh rename to libbitcoin-protocol-test_runner.sh index 21eedbe9..76926be3 100755 --- a/libbitcoin_protocol_test_runner.sh +++ b/libbitcoin-protocol-test_runner.sh @@ -18,4 +18,4 @@ BOOST_UNIT_TEST_OPTIONS=\ # Run tests. #============================================================================== -./test/libbitcoin_protocol_test ${BOOST_UNIT_TEST_OPTIONS} > test.log +./test/libbitcoin-protocol-test ${BOOST_UNIT_TEST_OPTIONS} > test.log diff --git a/libbitcoin-protocol.pc.in b/libbitcoin-protocol.pc.in index 88170416..0c1b0625 100644 --- a/libbitcoin-protocol.pc.in +++ b/libbitcoin-protocol.pc.in @@ -25,7 +25,7 @@ Version: @PACKAGE_VERSION@ #============================================================================== # Dependencies that publish package configuration. #------------------------------------------------------------------------------ -Requires: libzmq >= 4.2.3 libbitcoin >= 3.4.0 +Requires: libzmq >= 4.2.0 libbitcoin >= 3.4.0 # Include directory and any other required compiler flags. #------------------------------------------------------------------------------