From 86b1542181a92841d174e1caec94d084a34e5158 Mon Sep 17 00:00:00 2001 From: Loïc Blot Date: Sun, 2 Apr 2017 10:51:50 +0200 Subject: Update embedded jsoncpp from unk version to 0.10.6 + move libs to lib/ instead of src/ (#5473) * Update embedded jsoncpp from unk version to 0.10.6 0.10.6 is last release without c++11 * Make jsoncpp more compliant with its amalgamate Jsoncpp cpp file should be upper, make the library like it does in amalgamate * Reorganization: move minetest embedded libs outside of source tree to /lib * Fix a dead grep in LINT --- util/travis/script.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'util') diff --git a/util/travis/script.sh b/util/travis/script.sh index ef42916b0..4a12df5f6 100755 --- a/util/travis/script.sh +++ b/util/travis/script.sh @@ -10,10 +10,10 @@ function perform_lint() { if [ "$TRAVIS_EVENT_TYPE" = "pull_request" ]; then # Get list of every file modified in this pull request - files_to_lint="$(git diff --name-only --diff-filter=ACMRTUXB $TRAVIS_COMMIT_RANGE | grep '^src/[^.]*[.]\(cpp\|h\)$' | egrep -v '^src/(gmp|lua|jsoncpp)/' || true)" + files_to_lint="$(git diff --name-only --diff-filter=ACMRTUXB $TRAVIS_COMMIT_RANGE | grep '^src/[^.]*[.]\(cpp\|h\)$' | true)" else # Check everything for branch pushes - files_to_lint="$(find src/ -name '*.cpp' -or -name '*.h' | egrep -v '^src/(gmp|lua|jsoncpp)/')" + files_to_lint="$(find src/ -name '*.cpp' -or -name '*.h')" fi local errorcount=0 -- cgit v1.2.3