Skip to content

Commit

Permalink
Allow using system astyle
Browse files Browse the repository at this point in the history
  • Loading branch information
m-kuhn committed Oct 30, 2017
1 parent 71c17b8 commit c48e006
Showing 1 changed file with 11 additions and 4 deletions.
15 changes: 11 additions & 4 deletions scripts/astyle.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,23 @@
# #
###########################################################################

for ASTYLE in ${QGISSTYLE} $(dirname $0)/qgisstyle $(dirname $0)/RelWithDebInfo/qgisstyle
min_version="3.0.0"
astyle_version_check() {
[ `printf "$($1 --version | cut -d ' ' -f4)\n$min_version" | sort -V | head -n1` = "$min_version" ]
}

for ASTYLE in ${QGISSTYLE} $(dirname $0)/qgisstyle $(dirname $0)/RelWithDebInfo/qgisstyle astyle
do
if type -p $ASTYLE >/dev/null; then
break
if type -p $ASTYLE >/dev/null ; then
if astyle_version_check $ASTYLE ; then
break
fi
fi
ASTYLE=
done

if [ -z "$ASTYLE" ]; then
echo "qgisstyle not found - please enable WITH_ASTYLE in cmake and build it" >&2
echo "qgisstyle / astyle not found - please install astyle >= $min_version or enable WITH_ASTYLE in cmake and build" >&2
exit 1
fi

Expand Down

0 comments on commit c48e006

Please sign in to comment.