Skip to content

Commit 83ffc49

Browse files
pmienkpmienk
authored
Merge pull request #184 from pmienk/version3
Regenerate artifacts.
2 parents 936e903 + b65090b commit 83ffc49

3 files changed

Lines changed: 107 additions & 30 deletions

File tree

‎.travis.yml‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,6 @@ matrix:
4646
- os: linux
4747
compiler: gcc
4848
env: LINK=static
49-
addons:
50-
apt:
51-
packages:
52-
- lcov
5349
fast_finish:
5450
- true
5551

@@ -81,22 +77,27 @@ install:
8177
script:
8278

8379
# Download and build libbitcoin-protocol and all dependencies.
84-
- if [[ $OSX && $CLANG && $STATIC ]]; then CC=$CC CXX=$CXX ./install.sh --disable-shared --build-boost --build-zmq --prefix=$TRAVIS_BUILD_DIR/my-prefix; fi
85-
- if [[ $LINUX && $CLANG && $STATIC ]]; then CC=$CC CXX=$CXX ./install.sh --disable-shared --build-boost --build-zmq --prefix=$TRAVIS_BUILD_DIR/my-prefix CFLAGS='-Os' CXXFLAGS='-Os'; fi
86-
- if [[ $LINUX && $GCC && $STATIC ]]; then CC=$CC CXX=$CXX ./install.sh --build-boost --build-zmq --disable-shared --build-dir=my-build --prefix=$TRAVIS_BUILD_DIR/my-prefix CFLAGS='-Og -g --coverage' CXXFLAGS='-Og -g --coverage'; fi
87-
- if [[ $OSX && $CLANG && $DYNAMIC ]]; then CC=$CC CXX=$CXX ./install.sh --build-zmq --disable-static; fi
88-
- if [[ $LINUX && $CLANG && $DYNAMIC ]]; then CC=$CC CXX=$CXX ./install.sh --build-boost --build-zmq --disable-ndebug --disable-static --prefix=$TRAVIS_BUILD_DIR/my-prefix CFLAGS='-Os' CXXFLAGS='-Os'; fi
89-
- if [[ $LINUX && $GCC && $DYNAMIC ]]; then CC=$CC CXX=$CXX ./install.sh --disable-static --build-boost --build-zmq --prefix=$TRAVIS_BUILD_DIR/my-prefix CFLAGS='-Os -s' CXXFLAGS='-Os -s'; fi
80+
- if [[ $OSX && $CLANG && $STATIC ]]; then CC=$CC CXX=$CXX ./install.sh --enable-isystem --disable-shared --build-boost --build-zmq --prefix=$TRAVIS_BUILD_DIR/my-prefix; fi
81+
- if [[ $LINUX && $CLANG && $STATIC ]]; then CC=$CC CXX=$CXX ./install.sh --enable-isystem --disable-shared --build-boost --build-zmq --prefix=$TRAVIS_BUILD_DIR/my-prefix CFLAGS='-Os' CXXFLAGS='-Os'; fi
82+
- if [[ $LINUX && $GCC && $STATIC ]]; then CC=$CC CXX=$CXX ./install.sh --enable-isystem --build-boost --build-zmq --disable-shared --build-dir=my-build --prefix=$TRAVIS_BUILD_DIR/my-prefix CFLAGS='-Og -g --coverage' CXXFLAGS='-Og -g --coverage'; fi
83+
- if [[ $OSX && $CLANG && $DYNAMIC ]]; then CC=$CC CXX=$CXX ./install.sh --enable-isystem --build-zmq --disable-static; fi
84+
- if [[ $LINUX && $CLANG && $DYNAMIC ]]; then CC=$CC CXX=$CXX ./install.sh --enable-isystem --build-boost --build-zmq --disable-ndebug --disable-static --prefix=$TRAVIS_BUILD_DIR/my-prefix CFLAGS='-Os' CXXFLAGS='-Os'; fi
85+
- if [[ $LINUX && $GCC && $DYNAMIC ]]; then CC=$CC CXX=$CXX ./install.sh --enable-isystem --disable-static --build-boost --build-zmq --prefix=$TRAVIS_BUILD_DIR/my-prefix CFLAGS='-Os -s' CXXFLAGS='-Os -s'; fi
9086

9187
after_success:
9288

93-
# Install coveralls and current lcov.
89+
# Download and unpack lcov > 1.10
90+
- if [[ $LINUX && $GCC && $STATIC ]]; then wget https://github.com/linux-test-project/lcov/releases/download/v1.12/lcov-1.12.tar.gz; fi
91+
- if [[ $LINUX && $GCC && $STATIC ]]; then tar xzf lcov-1.12.tar.gz; fi
92+
- if [[ $LINUX && $GCC && $STATIC ]]; then cd lcov-1.12; PREFIX="$TRAVIS_BUILD_DIR/my-prefix" make install; cd ..; fi
93+
94+
# Install coveralls.
9495
- if [[ $LINUX && $GCC && $STATIC ]]; then gem install coveralls-lcov; fi
9596

9697
# Capture coverage info, filter out system and test code, and debug before upload.
97-
- if [[ $LINUX && $GCC && $STATIC ]]; then lcov --directory . --capture --output-file coverage.info; fi
98-
- if [[ $LINUX && $GCC && $STATIC ]]; then lcov --remove coverage.info "/usr/*" "$TRAVIS_BUILD_DIR/my-prefix/*" "my-build/*" "test/*" "interface.pb.*" --output-file coverage.info; fi
99-
- if [[ $LINUX && $GCC && $STATIC ]]; then lcov --list coverage.info; fi
98+
- if [[ $LINUX && $GCC && $STATIC ]]; then $TRAVIS_BUILD_DIR/my-prefix/usr/bin/lcov --directory . --capture --output-file coverage.info; fi
99+
- if [[ $LINUX && $GCC && $STATIC ]]; then $TRAVIS_BUILD_DIR/my-prefix/usr/bin/lcov --remove coverage.info "/usr/*" "$TRAVIS_BUILD_DIR/my-prefix/*" "my-build/*" "test/*" "interface.pb.*" --output-file coverage.info; fi
100+
- if [[ $LINUX && $GCC && $STATIC ]]; then $TRAVIS_BUILD_DIR/my-prefix/usr/bin/lcov --list coverage.info; fi
100101

101102
# Upload coverage info to coveralls service (--repo-token <private coveralls repo token>).
102103
- if [[ $LINUX && $GCC && $STATIC ]]; then coveralls-lcov coverage.info; fi

‎Makefile.am‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ doc_DATA = \
3232
# src/libbitcoin-protocol.la => ${libdir}
3333
#------------------------------------------------------------------------------
3434
lib_LTLIBRARIES = src/libbitcoin-protocol.la
35-
src_libbitcoin_protocol_la_CPPFLAGS = -I${srcdir}/include ${zmq_CPPFLAGS} ${bitcoin_CPPFLAGS}
35+
src_libbitcoin_protocol_la_CPPFLAGS = -I${srcdir}/include ${zmq_BUILD_CPPFLAGS} ${bitcoin_BUILD_CPPFLAGS}
3636
src_libbitcoin_protocol_la_LIBADD = ${zmq_LIBS} ${bitcoin_LIBS}
3737
src_libbitcoin_protocol_la_SOURCES = \
3838
src/settings.cpp \
@@ -54,7 +54,7 @@ if WITH_TESTS
5454
TESTS = libbitcoin-protocol-test_runner.sh
5555

5656
check_PROGRAMS = test/libbitcoin-protocol-test
57-
test_libbitcoin_protocol_test_CPPFLAGS = -I${srcdir}/include ${zmq_CPPFLAGS} ${bitcoin_CPPFLAGS}
57+
test_libbitcoin_protocol_test_CPPFLAGS = -I${srcdir}/include ${zmq_BUILD_CPPFLAGS} ${bitcoin_BUILD_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 = \
6060
test/converter.cpp \

‎configure.ac‎

Lines changed: 90 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@ AC_PROG_CXX
4444
# Enable shared libraries if available, and static if they don't conflict.
4545
AC_PROG_LIBTOOL
4646

47+
# Enable sed for substitution.
48+
AC_PROG_SED
49+
4750
# Compute the canonical host-system type variable host, including host_os.
4851
AC_CANONICAL_HOST
4952

@@ -52,6 +55,9 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
5255

5356
# Check for pkg-config.
5457
PKG_PROG_PKG_CONFIG
58+
AS_IF([test -n "$PKG_CONFIG"], [],
59+
[AC_MSG_ERROR([pkg-config is required but was not found.])])
60+
5561

5662
# Declare environment variables that affect the build.
5763
#------------------------------------------------------------------------------
@@ -103,6 +109,16 @@ AS_CASE([${enable_ndebug}], [yes], AC_DEFINE([NDEBUG]))
103109
#------------------------------------------------------------------------------
104110
AS_CASE([${enable_shared}], [yes], AC_DEFINE([BOOST_ALL_DYN_LINK]))
105111

112+
# Implement --enable-isystem.
113+
#------------------------------------------------------------------------------
114+
AC_MSG_CHECKING([--enable-isystem option])
115+
AC_ARG_ENABLE([isystem],
116+
AS_HELP_STRING([--enable-isystem],
117+
[Substitute -isystem for -I in dependencies. @<:@default=no@:>@]),
118+
[enable_isystem=$enableval],
119+
[enable_isystem=no])
120+
AC_MSG_RESULT([$enable_isystem])
121+
106122

107123
# Check dependencies.
108124
#==============================================================================
@@ -111,11 +127,19 @@ AS_CASE([${enable_shared}], [yes], AC_DEFINE([BOOST_ALL_DYN_LINK]))
111127
AS_CASE([${CC}], [*],
112128
[AX_BOOST_BASE([1.57.0],
113129
[AC_SUBST([boost_CPPFLAGS], [${BOOST_CPPFLAGS}])
130+
AC_SUBST([boost_ISYS_CPPFLAGS], [`echo ${BOOST_CPPFLAGS} | $SED s/^-I/-isystem/g | $SED s/' -I'/' -isystem'/g`])
114131
AC_SUBST([boost_LDFLAGS], [${BOOST_LDFLAGS}])
115132
AC_MSG_NOTICE([boost_CPPFLAGS : ${boost_CPPFLAGS}])
133+
AC_MSG_NOTICE([boost_ISYS_CPPFLAGS : ${boost_ISYS_CPPFLAGS}])
116134
AC_MSG_NOTICE([boost_LDFLAGS : ${boost_LDFLAGS}])],
117135
[AC_MSG_ERROR([Boost 1.57.0 or later is required but was not found.])])])
118136

137+
AS_CASE([${enable_isystem}],[yes],
138+
[AC_SUBST([boost_BUILD_CPPFLAGS], [${boost_ISYS_CPPFLAGS}])],
139+
[AC_SUBST([boost_BUILD_CPPFLAGS], [${boost_CPPFLAGS}])])
140+
141+
AC_MSG_NOTICE([boost_BUILD_CPPFLAGS : ${boost_BUILD_CPPFLAGS}])
142+
119143
AS_CASE([${with_tests}], [yes],
120144
[AX_BOOST_UNIT_TEST_FRAMEWORK
121145
AC_SUBST([boost_unit_test_framework_LIBS], [${BOOST_UNIT_TEST_FRAMEWORK_LIB}])
@@ -124,20 +148,52 @@ AS_CASE([${with_tests}], [yes],
124148

125149
# Require zmq of at least version 4.2.0 and output ${zmq_CPPFLAGS/LIBS/PKG}.
126150
#------------------------------------------------------------------------------
127-
PKG_CHECK_MODULES([zmq], [libzmq >= 4.2.0])
151+
PKG_CHECK_MODULES([zmq], [libzmq >= 4.2.0],
152+
[zmq_INCLUDEDIR="`$PKG_CONFIG --variable=includedir "libzmq >= 4.2.0" 2>/dev/null`"
153+
zmq_OTHER_CFLAGS="`$PKG_CONFIG --cflags-only-other "libzmq >= 4.2.0" 2>/dev/null`"],
154+
[zmq_INCLUDEDIR=""
155+
zmq_OTHER_CFLAGS=""])
128156
AC_SUBST([zmq_PKG], ['libzmq >= 4.2.0'])
129157
AC_SUBST([zmq_CPPFLAGS], [${zmq_CFLAGS}])
158+
AS_IF([test x${zmq_INCLUDEDIR} != "x"],
159+
[AC_SUBST([zmq_ISYS_CPPFLAGS], ["-isystem${zmq_INCLUDEDIR} ${zmq_OTHER_CFLAGS}"])],
160+
[AC_SUBST([zmq_ISYS_CPPFLAGS], [${zmq_OTHER_CFLAGS}])])
130161
AC_MSG_NOTICE([zmq_CPPFLAGS : ${zmq_CPPFLAGS}])
162+
AC_MSG_NOTICE([zmq_ISYS_CPPFLAGS : ${zmq_ISYS_CPPFLAGS}])
163+
AC_MSG_NOTICE([zmq_OTHER_CFLAGS : ${zmq_OTHER_CFLAGS}])
164+
AC_MSG_NOTICE([zmq_INCLUDEDIR : ${zmq_INCLUDEDIR}])
131165
AC_MSG_NOTICE([zmq_LIBS : ${zmq_LIBS}])
132166

167+
AS_CASE([${enable_isystem}],[yes],
168+
[AC_SUBST([zmq_BUILD_CPPFLAGS], [${zmq_ISYS_CPPFLAGS}])],
169+
[AC_SUBST([zmq_BUILD_CPPFLAGS], [${zmq_CPPFLAGS}])])
170+
171+
AC_MSG_NOTICE([zmq_BUILD_CPPFLAGS : ${zmq_BUILD_CPPFLAGS}])
172+
133173
# Require bitcoin of at least version 3.4.0 and output ${bitcoin_CPPFLAGS/LIBS/PKG}.
134174
#------------------------------------------------------------------------------
135-
PKG_CHECK_MODULES([bitcoin], [libbitcoin >= 3.4.0])
175+
PKG_CHECK_MODULES([bitcoin], [libbitcoin >= 3.4.0],
176+
[bitcoin_INCLUDEDIR="`$PKG_CONFIG --variable=includedir "libbitcoin >= 3.4.0" 2>/dev/null`"
177+
bitcoin_OTHER_CFLAGS="`$PKG_CONFIG --cflags-only-other "libbitcoin >= 3.4.0" 2>/dev/null`"],
178+
[bitcoin_INCLUDEDIR=""
179+
bitcoin_OTHER_CFLAGS=""])
136180
AC_SUBST([bitcoin_PKG], ['libbitcoin >= 3.4.0'])
137181
AC_SUBST([bitcoin_CPPFLAGS], [${bitcoin_CFLAGS}])
182+
AS_IF([test x${bitcoin_INCLUDEDIR} != "x"],
183+
[AC_SUBST([bitcoin_ISYS_CPPFLAGS], ["-isystem${bitcoin_INCLUDEDIR} ${bitcoin_OTHER_CFLAGS}"])],
184+
[AC_SUBST([bitcoin_ISYS_CPPFLAGS], [${bitcoin_OTHER_CFLAGS}])])
138185
AC_MSG_NOTICE([bitcoin_CPPFLAGS : ${bitcoin_CPPFLAGS}])
186+
AC_MSG_NOTICE([bitcoin_ISYS_CPPFLAGS : ${bitcoin_ISYS_CPPFLAGS}])
187+
AC_MSG_NOTICE([bitcoin_OTHER_CFLAGS : ${bitcoin_OTHER_CFLAGS}])
188+
AC_MSG_NOTICE([bitcoin_INCLUDEDIR : ${bitcoin_INCLUDEDIR}])
139189
AC_MSG_NOTICE([bitcoin_LIBS : ${bitcoin_LIBS}])
140190

191+
AS_CASE([${enable_isystem}],[yes],
192+
[AC_SUBST([bitcoin_BUILD_CPPFLAGS], [${bitcoin_ISYS_CPPFLAGS}])],
193+
[AC_SUBST([bitcoin_BUILD_CPPFLAGS], [${bitcoin_CPPFLAGS}])])
194+
195+
AC_MSG_NOTICE([bitcoin_BUILD_CPPFLAGS : ${bitcoin_BUILD_CPPFLAGS}])
196+
141197

142198
# Set flags.
143199
#==============================================================================
@@ -153,12 +209,24 @@ AS_CASE([${CC}], [*],
153209
[AX_CHECK_COMPILE_FLAG([-Wall],
154210
[CFLAGS="$CFLAGS -Wall"])])
155211

212+
# Warn on all stuff.
213+
#------------------------------------------------------------------------------
214+
AS_CASE([${CC}], [*],
215+
[AX_CHECK_COMPILE_FLAG([-Wall],
216+
[CXXFLAGS="$CXXFLAGS -Wall"])])
217+
156218
# Warn on extra stuff.
157219
#------------------------------------------------------------------------------
158220
AS_CASE([${CC}], [*],
159221
[AX_CHECK_COMPILE_FLAG([-Wextra],
160222
[CFLAGS="$CFLAGS -Wextra"])])
161223

224+
# Warn on extra stuff.
225+
#------------------------------------------------------------------------------
226+
AS_CASE([${CC}], [*],
227+
[AX_CHECK_COMPILE_FLAG([-Wextra],
228+
[CXXFLAGS="$CXXFLAGS -Wextra"])])
229+
162230
# Be really annoying.
163231
#------------------------------------------------------------------------------
164232
AS_CASE([${CC}], [*],
@@ -167,6 +235,26 @@ AS_CASE([${CC}], [*],
167235
[AX_CHECK_COMPILE_FLAG([-pedantic],
168236
[CFLAGS="$CFLAGS -pedantic"])])])
169237

238+
# Be really annoying.
239+
#------------------------------------------------------------------------------
240+
AS_CASE([${CC}], [*],
241+
[AX_CHECK_COMPILE_FLAG([-Wpedantic],
242+
[CXXFLAGS="$CXXFLAGS -Wpedantic"],
243+
[AX_CHECK_COMPILE_FLAG([-pedantic],
244+
[CXXFLAGS="$CXXFLAGS -pedantic"])])])
245+
246+
# Disallow warning on style order of declarations.
247+
#------------------------------------------------------------------------------
248+
AS_CASE([${CC}], [*],
249+
[AX_CHECK_COMPILE_FLAG([-Wno-reorder],
250+
[CXXFLAGS="$CXXFLAGS -Wno-reorder"])])
251+
252+
# Suppress warning for incomplete field initialization.
253+
#------------------------------------------------------------------------------
254+
AS_CASE([${CC}], [*],
255+
[AX_CHECK_COMPILE_FLAG([-Wno-missing-field-initializers],
256+
[CXXFLAGS="$CXXFLAGS -Wno-missing-field-initializers"])])
257+
170258
# Conform to style.
171259
#------------------------------------------------------------------------------
172260
AS_CASE([${CC}], [*],
@@ -179,12 +267,6 @@ AS_CASE([${CC}], [*clang*],
179267
[AX_CHECK_COMPILE_FLAG([-Wno-mismatched-tags],
180268
[CXXFLAGS="$CXXFLAGS -Wno-mismatched-tags"])])
181269

182-
# Clean up boost 1.55 headers. Enabled in gcc only.
183-
#------------------------------------------------------------------------------
184-
AS_CASE([${CC}], [*gcc*],
185-
[AX_CHECK_COMPILE_FLAG([-Wno-deprecated-declarations],
186-
[CXXFLAGS="$CXXFLAGS -Wno-deprecated-declarations"])])
187-
188270
# Protect stack.
189271
#------------------------------------------------------------------------------
190272
AS_CASE([${CC}], [*],
@@ -197,12 +279,6 @@ AS_CASE([${CC}], [*],
197279
[AX_CHECK_LINK_FLAG([-fstack-protector-all],
198280
[LDFLAGS="$LDFLAGS -fstack-protector-all"])])
199281

200-
# Hide internal functions from external libs. Enabled in gcc only.
201-
#------------------------------------------------------------------------------
202-
AS_CASE([${CC}], [*gcc*],
203-
[AX_CHECK_COMPILE_FLAG([-fvisibility-hidden],
204-
[CXXFLAGS="$CXXFLAGS -fvisibility-hidden"])])
205-
206282
# Hide inlines from external libs. Enabled in gcc only.
207283
#------------------------------------------------------------------------------
208284
AS_CASE([${CC}], [*gcc*],

0 commit comments

Comments
 (0)