generic-library/cppzmq
1
0
Fork 0
mirror of https://github.com/zeromq/cppzmq.git synced 2025-05-03 07:52:33 +02:00
Code Issues Projects Releases Wiki Activity

Problem: Only one version of libzmq tested

Browse Source 
Solution: use libzmq 4.2.4, last two releases in use now.
This commit is contained in:
Pawel Kurdybacha 2018-05-13 15:21:06 +01:00
parent a5578a6f25
commit 21350a3fd3
2 changed files with 13 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.travis.yml
View File

@ -17,13 +17,12 @@ addons:
env: env:
matrix: matrix:
# - ZMQ_BUILD_TYPE=cmake DRAFT=enabled - ZMQ_VERSION=4.2.5
- ZMQ_BUILD_TYPE=cmake ZMQ_VERSION=4.2.5 - ZMQ_VERSION=4.2.4
- ZMQ_BUILD_TYPE=pkgconf ZMQ_VERSION=4.2.0
matrix: matrix:
include: include:
# - env: ZMQ_BUILD_TYPE=cmake DO_CLANG_FORMAT_CHECK=1 CLANG_FORMAT=/usr/local/clang-5.0.0/bin/clang-format # - env: BUILD_TYPE=cmake DO_CLANG_FORMAT_CHECK=1 CLANG_FORMAT=/usr/local/clang-5.0.0/bin/clang-format
# os: linux # os: linux
# addons: # addons:
# apt: # apt:
@ -39,14 +38,14 @@ matrix:
packages: packages:
- g++-7 - g++-7
env: env:
- MATRIX_EVAL="CC=gcc-7 && CXX=g++-7" ZMQ_BUILD_TYPE=cmake ZMQ_VERSION=4.2.5 DRAFT=1 - MATRIX_EVAL="CC=gcc-7 && CXX=g++-7" ZMQ_VERSION=4.2.5 DRAFT=1
sudo: required sudo: required
before_install: before_install:
- pip install --user cpp-coveralls - pip install --user cpp-coveralls
# Build and check this project according to the ZMQ_BUILD_TYPE # Build and check this project
script: script:
- eval "${MATRIX_EVAL}" - eval "${MATRIX_EVAL}"
- ./ci_build.sh - ./ci_build.sh

18
ci_build.sh
View File

@ -3,6 +3,9 @@
set -x set -x
set -e set -e
LIBZMQ=${PWD}/libzmq-build
CPPZMQ=${PWD}/cppzmq-build
if [ "$DRAFT" = "1" ] ; then if [ "$DRAFT" = "1" ] ; then
# if we enable drafts during the libzmq cmake build, the pkgconfig # if we enable drafts during the libzmq cmake build, the pkgconfig
# data should set ZMQ_BUILD_DRAFT_API in dependent builds, but this # data should set ZMQ_BUILD_DRAFT_API in dependent builds, but this
@ -10,29 +13,15 @@ if [ "$DRAFT" = "1" ] ; then
export ZEROMQ_CMAKE_FLAGS="-DENABLE_DRAFTS=ON" export ZEROMQ_CMAKE_FLAGS="-DENABLE_DRAFTS=ON"
fi fi
LIBZMQ=${PWD}/libzmq-build
CPPZMQ=${PWD}/cppzmq-build
install_zeromq() { install_zeromq() {
curl -L https://github.com/zeromq/libzmq/archive/v${ZMQ_VERSION}.tar.gz \ curl -L https://github.com/zeromq/libzmq/archive/v${ZMQ_VERSION}.tar.gz \
>zeromq.tar.gz >zeromq.tar.gz
tar -xvzf zeromq.tar.gz tar -xvzf zeromq.tar.gz
if [ "${ZMQ_BUILD_TYPE}" = "cmake" ] ; then
cmake -Hlibzmq-${ZMQ_VERSION} -B${LIBZMQ} -DWITH_PERF_TOOL=OFF \ cmake -Hlibzmq-${ZMQ_VERSION} -B${LIBZMQ} -DWITH_PERF_TOOL=OFF \
-DZMQ_BUILD_TESTS=OFF \ -DZMQ_BUILD_TESTS=OFF \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
${ZEROMQ_CMAKE_FLAGS} ${ZEROMQ_CMAKE_FLAGS}
cmake --build ${LIBZMQ} cmake --build ${LIBZMQ}
elif [ "${ZMQ_BUILD_TYPE}" = "pkgconf" ] ; then
pushd .
cd libzmq-${ZMQ_VERSION}
./autogen.sh
./configure
sudo make VERBOSE=1 -j5 install
popd
else
echo "Unsupported build type ${ZMQ_BUILD_TYPE}."
exit 1
fi
} }
# build zeromq first # build zeromq first
@ -40,7 +29,6 @@ install_zeromq() {
if [ "${ZMQ_VERSION}" != "" ] ; then install_zeromq ; fi if [ "${ZMQ_VERSION}" != "" ] ; then install_zeromq ; fi
# build cppzmq # build cppzmq
# for pkgconf ZMQ_BUILD_TYPE ZeroMQ_DIR is invalid but it should still work
pushd . pushd .
ZeroMQ_DIR=${LIBZMQ} cmake -H. -B${CPPZMQ} ${ZEROMQ_CMAKE_FLAGS} ZeroMQ_DIR=${LIBZMQ} cmake -H. -B${CPPZMQ} ${ZEROMQ_CMAKE_FLAGS}
cmake --build ${CPPZMQ} cmake --build ${CPPZMQ}