diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-10-06 18:48:28 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-10-06 19:02:03 +0300 |
| commit | 620feabd032fb9e1e1092fc50240b69569007f93 (patch) | |
| tree | 70da8e5ddeb2ab1e0deb1dafc9a4c5b029b5278f /tools/ci/scripts | |
| parent | 491695e60e95668e8170e290388f976190859314 (diff) | |
| download | manaverse-620feabd032fb9e1e1092fc50240b69569007f93.tar.gz manaverse-620feabd032fb9e1e1092fc50240b69569007f93.tar.bz2 manaverse-620feabd032fb9e1e1092fc50240b69569007f93.tar.xz manaverse-620feabd032fb9e1e1092fc50240b69569007f93.zip | |
Join deheader jobs into single jobs.
Also add deheader jobs with other flags.
Diffstat (limited to 'tools/ci/scripts')
| -rwxr-xr-x | tools/ci/scripts/deheader.sh | 14 |
1 files changed, 14 insertions, 0 deletions
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} |