From 7c210a16a5cdcc399cc475662cbe9ceeaf5f5b8f Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 19 May 2018 04:03:26 +0300 Subject: Add deheader script for support --std2 parameter. --- tools/ci/scripts/deheaderS.sh | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100755 tools/ci/scripts/deheaderS.sh diff --git a/tools/ci/scripts/deheaderS.sh b/tools/ci/scripts/deheaderS.sh new file mode 100755 index 000000000..6618859f6 --- /dev/null +++ b/tools/ci/scripts/deheaderS.sh @@ -0,0 +1,42 @@ +#!/bin/bash + +export var=$1 +export name=${var%.*} +export name=${name#./src/} +export name=${name##*./}.h +export dir=$(pwd) + +if [[ $var =~ .*(/sdl2gfx/|src/debug/).* ]] +then + exit 0 +fi + +if [ "$skipPath" != "" ]; +then + if [[ $var =~ .*($skipPath).* ]] + then + exit 0 + fi +fi + +echo $1 >>${LOGFILE} +echo $1 + +${dir}/deheader -q -i "\"debug.h\"" \ +-i "\"utils/checkutils.h\"" \ +-i "\"utils/sdlcheckutils.h\"" \ +-i "\"sdlshared.h\"" \ +-i "\"localconsts.h\"" \ +-i "\"utils/fuzzer.h\"" \ +-i "\"$name\"" \ +-c "$CXX" \ +-d "$FLAGS" \ +-s "-std=gnu++1z" \ +-S "-std=gnu++1z" \ +-m "-c -Werror -Wall -Wextra -Wundef -Wmissing-declarations -DLOCALEDIR=\\\"\\\" -I/usr/include $INCLUDES -I${dir}/src" $1 2>&1 | \ +grep -v "deheader: ./src/net/sdltcpnet.cpp has more than one inclusion of " | \ +grep -v "deheader: remove from ./src/net/sdltcpnet.cpp" | \ +grep -v "deheader: remove from ./src/resources/db/unitsdb.cpp" | \ +grep -v "portability requires" | \ +grep -v "SDL2_rotozoom.cpp" | \ +tee -a ${LOGFILE} -- cgit v1.2.3-60-g2f50