Skip to content

Commit aee9bba

Browse files
author
John Nonweiler
committed
Use new Doxygen script in Travis CI
Remove the old `travis_doxygen.sh` script and associated part of `run_diff.sh`, and change `.travis.yml` to use the new `run_doxygen.sh` instead. The new script should report new problems (and not report already existing problems) more reliably than the old script which relied on the line numbers reported by Doxygen.
1 parent f33dc9d commit aee9bba

File tree

3 files changed

+2
-35
lines changed

3 files changed

+2
-35
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ jobs:
7272
script:
7373
- echo $PATH
7474
- doxygen --version
75-
- scripts/travis_doxygen.sh
75+
- scripts/run_doxygen.sh
7676
before_cache:
7777
after_success:
7878
# Google Cloud Integration

scripts/run_diff.sh

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ set -e
55
script_folder=$(dirname "$0")
66
absolute_repository_root=$(git rev-parse --show-toplevel)
77
mode=$1
8-
modes="CPPLINT | DOXYGEN"
8+
modes="CPPLINT"
99

1010
if [[ "$#" -gt 3 ]]
1111
then
@@ -39,23 +39,6 @@ then
3939
else
4040
cmd='${script_folder}/cpplint.py --filter=-whitespace/operators,-readability/identifier_spacing $file 2>&1 >/dev/null'
4141
fi
42-
elif [[ "$mode" == "DOXYGEN" ]]
43-
then
44-
doxygen=doxygen
45-
doxygenlogdir="doc/html"
46-
doxygenlog="$doxygenlogdir/doxygen.log"
47-
suppress_warnings=(
48-
"warning: Included by graph for .* not generated, too many nodes. Consider increasing DOT_GRAPH_MAX_NODES.")
49-
if ! $doxygen --version &>/dev/null
50-
then
51-
echo "Doxygen is not installed on this PC"
52-
echo "Please install before running this script"
53-
exit 1
54-
else
55-
mkdir -p $doxygenlogdir && cd src && $doxygen &> ../$doxygenlog && cd ..
56-
suppress_warnings_regex=$(IFS="|" ; echo "${suppress_warnings[*]}")
57-
cmd='grep -Ev "$suppress_warnings_regex" $doxygenlog'
58-
fi
5942
else
6043
echo "Mode $mode not recognized"
6144
echo "Possible values: $modes"

scripts/travis_doxygen.sh

Lines changed: 0 additions & 16 deletions
This file was deleted.

0 commit comments

Comments
 (0)