mirror of
https://github.com/PX4/PX4-Autopilot.git
synced 2026-05-30 15:08:16 +08:00
Astyle: allow version 3.1
This commit is contained in:
committed by
Daniel Agar
parent
873e036e85
commit
b299d6222a
@@ -5,6 +5,7 @@ set -eu
|
|||||||
ASTYLE_VER_REQUIRED_1="Artistic Style Version 2.06"
|
ASTYLE_VER_REQUIRED_1="Artistic Style Version 2.06"
|
||||||
ASTYLE_VER_REQUIRED_2="Artistic Style Version 3.0"
|
ASTYLE_VER_REQUIRED_2="Artistic Style Version 3.0"
|
||||||
ASTYLE_VER_REQUIRED_3="Artistic Style Version 3.0.1"
|
ASTYLE_VER_REQUIRED_3="Artistic Style Version 3.0.1"
|
||||||
|
ASTYLE_VER_REQUIRED_4="Artistic Style Version 3.1"
|
||||||
|
|
||||||
astyle_ver() {
|
astyle_ver() {
|
||||||
echo "PX4 requires at least ${ASTYLE_VER_REQUIRED_1}"
|
echo "PX4 requires at least ${ASTYLE_VER_REQUIRED_1}"
|
||||||
@@ -23,10 +24,11 @@ else
|
|||||||
|
|
||||||
if [ "$ASTYLE_VER" != "$ASTYLE_VER_REQUIRED_1" -a \
|
if [ "$ASTYLE_VER" != "$ASTYLE_VER_REQUIRED_1" -a \
|
||||||
"$ASTYLE_VER" != "$ASTYLE_VER_REQUIRED_2" -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
|
then
|
||||||
echo "Error: you're using ${ASTYLE_VER}"
|
echo "Error: you're using ${ASTYLE_VER}"
|
||||||
echo "but should be using ${ASTYLE_VER_REQUIRED_1}, ${ASTYLE_VER_REQUIRED_2}, or ${ASTYLE_VER_REQUIRED_3} instead"
|
echo "but should be using ${ASTYLE_VER_REQUIRED_1}, ${ASTYLE_VER_REQUIRED_2}, ${ASTYLE_VER_REQUIRED_3}, or ${ASTYLE_VER_REQUIRED_4} instead"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|||||||
Reference in New Issue
Block a user