check_code_style_all: accept astyle version 3.0.1

This commit is contained in:
Julian Oes 2017-07-04 08:55:38 +02:00 committed by Lorenz Meier
parent a5e435808f
commit d64b7706f5
1 changed files with 4 additions and 2 deletions

View File

@ -5,9 +5,10 @@ set -eu
ASTYLE_VER_REQUIRED_1="Artistic Style Version 2.05.1"
ASTYLE_VER_REQUIRED_2="Artistic Style Version 2.06"
ASTYLE_VER_REQUIRED_3="Artistic Style Version 3.0"
ASTYLE_VER_REQUIRED_4="Artistic Style Version 3.0.1"
astyle_ver() {
echo "PX4 requires ${ASTYLE_VER_REQUIRED}"
echo "PX4 requires at least ${ASTYLE_VER_REQUIRED_1}"
echo "You can get the correct version here: https://sourceforge.net/projects/astyle/files/astyle/astyle%202.06/"
}
@ -23,7 +24,8 @@ else
if [ "$ASTYLE_VER" != "$ASTYLE_VER_REQUIRED_1" -a \
"$ASTYLE_VER" != "$ASTYLE_VER_REQUIRED_2" -a \
"$ASTYLE_VER" != "$ASTYLE_VER_REQUIRED_3" ];
"$ASTYLE_VER" != "$ASTYLE_VER_REQUIRED_3" -a \
"$ASTYLE_VER" != "$ASTYLE_VER_REQUIRED_4" ];
then
echo "Error: you're using ${ASTYLE_VER}"
echo "but should be using ${ASTYLE_VER_REQUIRED} instead"