summaryrefslogtreecommitdiff
path: root/tools/ci
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-10-06 18:48:28 +0300
committerAndrei Karas <akaras@inbox.ru>2017-10-06 19:02:03 +0300
commit620feabd032fb9e1e1092fc50240b69569007f93 (patch)
tree70da8e5ddeb2ab1e0deb1dafc9a4c5b029b5278f /tools/ci
parent491695e60e95668e8170e290388f976190859314 (diff)
downloadplus-620feabd032fb9e1e1092fc50240b69569007f93.tar.gz
plus-620feabd032fb9e1e1092fc50240b69569007f93.tar.bz2
plus-620feabd032fb9e1e1092fc50240b69569007f93.tar.xz
plus-620feabd032fb9e1e1092fc50240b69569007f93.zip
Join deheader jobs into single jobs.
Also add deheader jobs with other flags.
Diffstat (limited to 'tools/ci')
-rwxr-xr-xtools/ci/jobs/deheader2.sh1
-rwxr-xr-xtools/ci/scripts/deheader.sh14
2 files changed, 15 insertions, 0 deletions
diff --git a/tools/ci/jobs/deheader2.sh b/tools/ci/jobs/deheader2.sh
index 55e33d503..e5d25cee3 100755
--- a/tools/ci/jobs/deheader2.sh
+++ b/tools/ci/jobs/deheader2.sh
@@ -25,6 +25,7 @@ grep "deheader:" ${LOGFILE} \
| grep -v "deheader: remove <climits> from ./src/resources/map/map.cpp" \
| grep -v "deheader: remove <vector> from ./src/utils/vector.h" \
| grep -v "has more than one inclusion of \"resources/dye/dyepalette_replace" \
+| grep -v "/sdl2gfx/" \
| grep -v "deheader: remove <climits> from ./src/units.cpp" > ${LOGFILE2}
export DATA=$(cat ${LOGFILE2})
diff --git a/tools/ci/scripts/deheader.sh b/tools/ci/scripts/deheader.sh
index 4e142679b..f15417166 100755
--- a/tools/ci/scripts/deheader.sh
+++ b/tools/ci/scripts/deheader.sh
@@ -6,6 +6,19 @@ 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
@@ -24,4 +37,5 @@ grep -v "deheader: ./src/net/sdltcpnet.cpp has more than one inclusion of <netin
grep -v "deheader: remove <netinet/tcp.h> from ./src/net/sdltcpnet.cpp" | \
grep -v "deheader: remove <climits> from ./src/resources/db/unitsdb.cpp" | \
grep -v "portability requires" | \
+grep -v "SDL2_rotozoom.cpp" | \
tee -a ${LOGFILE}