From 7a5351f8b502f0ef33ec445e3a532ca354abfdec Mon Sep 17 00:00:00 2001 From: Tom Reynolds Date: Mon, 30 Jan 2017 14:35:42 +0100 Subject: [PATCH 1/2] Updating reference for masterserver submodule --- source/masterserver | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/masterserver b/source/masterserver index f6e36bb18..2a2d48ac6 160000 --- a/source/masterserver +++ b/source/masterserver @@ -1 +1 @@ -Subproject commit f6e36bb1821041254bf3d8d887e8ef6eb5391192 +Subproject commit 2a2d48ac6a3ffe948ae1d9f3e0a859a1d58bc2ab From a3c930b2da46f2c233de6326f1a5a5c1c6731420 Mon Sep 17 00:00:00 2001 From: Tom Reynolds Date: Mon, 30 Jan 2017 14:57:38 +0100 Subject: [PATCH 2/2] Moderate changes to cppcheck script skipci --- mk/linux/mg_cppcheck.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mk/linux/mg_cppcheck.sh b/mk/linux/mg_cppcheck.sh index 38150bc6a..f4b152e3c 100755 --- a/mk/linux/mg_cppcheck.sh +++ b/mk/linux/mg_cppcheck.sh @@ -4,12 +4,12 @@ # Written by Mark Vejvoda # Copyright (c) 2011 Mark Vejvoda under GNU GPL v3.0+ -OUTFILE=./cppcheck.log +CPPCHECK=$(which cppcheck) +LOGFILE=/tmp/cppcheck.log CPUS=`lscpu -p | grep -cv '^#'` if [ "$CPUS" = '' ]; then CPUS=1; fi -#~/cppcheck-1.62/cppcheck ../../source/ -i ../../source/win32_deps -i ../../source/configurator -i ../../source/shared_lib/sources/libircclient -i ../../source/shared_lib/sources/platform/miniupnpc -j $CPUS --enable=all --force --verbose 2> $OUTFILE -cppcheck ../../source/ -i ../../source/win32_deps -i ../../source/configurator -i ../../source/shared_lib/sources/libircclient -i ../../source/shared_lib/sources/platform/miniupnpc -i ../../source/shared_lib/sources/streflop -j $CPUS --enable=all --force --verbose 2> $OUTFILE +$CPPCHECK ../../source/ -i ../../source/win32_deps -i ../../source/configurator -i ../../source/shared_lib/sources/libircclient -i ../../source/shared_lib/sources/platform/miniupnpc -i ../../source/shared_lib/sources/streflop -j $CPUS --enable=all --force --verbose 2> $LOGFILE -echo "Results from cppcheck were written to $OUTFILE" +echo "Results from cppcheck were written to $LOGFILE"