minetest-stuffs/dragonfire-client-dragonfire
1
0
Fork 0
Code Issues 10 Pull Requests 2 Packages Projects Releases 3 Wiki Activity

Update embedded jsoncpp from unk version to 0.10.6 + move libs to lib/ instead of src/ (#5473)

Browse Source 
* 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
This commit is contained in:
Loïc Blot
2017-04-02 10:51:50 +02:00
committed by GitHub
parent 75fb3e4730
commit 86b1542181
75 changed files with 6986 additions and 6345 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
util/travis/script.sh
View File

@@ -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