Repository: nifi-minifi-cpp Updated Branches: refs/heads/MINIFI-227-merge [created] 33b3759c0
http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/blob/33b3759c/thirdparty/jsoncpp/src/test_lib_json/sconscript ---------------------------------------------------------------------- diff --git a/thirdparty/jsoncpp/src/test_lib_json/sconscript b/thirdparty/jsoncpp/src/test_lib_json/sconscript new file mode 100644 index 0000000..915fd01 --- /dev/null +++ b/thirdparty/jsoncpp/src/test_lib_json/sconscript @@ -0,0 +1,10 @@ +Import( 'env_testing buildUnitTests' ) + +buildUnitTests( env_testing, Split( """ + main.cpp + jsontest.cpp + """ ), + 'test_lib_json' ) + +# For 'check' to work, 'libs' must be built first. +env_testing.Depends('test_lib_json', '#libs') http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/blob/33b3759c/thirdparty/jsoncpp/travis.sh ---------------------------------------------------------------------- diff --git a/thirdparty/jsoncpp/travis.sh b/thirdparty/jsoncpp/travis.sh new file mode 100755 index 0000000..a9811ec --- /dev/null +++ b/thirdparty/jsoncpp/travis.sh @@ -0,0 +1,31 @@ +#!/usr/bin/env sh +# This is called by `.travis.yml` via Travis CI. +# Travis supplies $TRAVIS_OS_NAME. +# http://docs.travis-ci.com/user/multi-os/ +# Our .travis.yml also defines: +# - SHARED_LIB=ON/OFF +# - STATIC_LIB=ON/OFF +# - CMAKE_PKG=ON/OFF +# - BUILD_TYPE=release/debug +# - VERBOSE_MAKE=false/true +# - VERBOSE (set or not) + +# -e: fail on error +# -v: show commands +# -x: show expanded commands +set -vex + +env | sort + +cmake -DJSONCPP_WITH_CMAKE_PACKAGE=$CMAKE_PKG -DBUILD_SHARED_LIBS=$SHARED_LIB -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_VERBOSE_MAKEFILE=$VERBOSE_MAKE . +make +cmake -DJSONCPP_WITH_CMAKE_PACKAGE=$CMAKE_PKG -DBUILD_SHARED_LIBS=$SHARED_LIB -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_VERBOSE_MAKEFILE=$VERBOSE_MAKE -DJSONCPP_USE_SECURE_MEMORY=1 . +make + +# Python is not available in Travis for osx. +# https://github.com/travis-ci/travis-ci/issues/2320 +if [ "$TRAVIS_OS_NAME" != "osx" ] +then + make jsoncpp_check + valgrind --error-exitcode=42 --leak-check=full ./src/test_lib_json/jsoncpp_test +fi http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/blob/33b3759c/thirdparty/jsoncpp/version ---------------------------------------------------------------------- diff --git a/thirdparty/jsoncpp/version b/thirdparty/jsoncpp/version new file mode 100644 index 0000000..27f9cd3 --- /dev/null +++ b/thirdparty/jsoncpp/version @@ -0,0 +1 @@ +1.8.0 http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/blob/33b3759c/thirdparty/jsoncpp/version.in ---------------------------------------------------------------------- diff --git a/thirdparty/jsoncpp/version.in b/thirdparty/jsoncpp/version.in new file mode 100644 index 0000000..bfc03f7 --- /dev/null +++ b/thirdparty/jsoncpp/version.in @@ -0,0 +1 @@ +@JSONCPP_VERSION@
