Updated AStyle to version 3.0.1
This commit is contained in:
parent
fdbd6e688f
commit
b684e1f202
|
@ -6,7 +6,7 @@
|
||||||
|
|
||||||
# If project management wishes to take a newer astyle version into use
|
# If project management wishes to take a newer astyle version into use
|
||||||
# just change this string to match the start of astyle version string.
|
# just change this string to match the start of astyle version string.
|
||||||
ASTYLE_VERSION="Artistic Style Version 2.05.1"
|
ASTYLE_VERSION="Artistic Style Version 3.0.1"
|
||||||
ASTYLE="astyle"
|
ASTYLE="astyle"
|
||||||
|
|
||||||
DETECTED_VERSION=`$ASTYLE --version 2>&1`
|
DETECTED_VERSION=`$ASTYLE --version 2>&1`
|
||||||
|
@ -16,8 +16,8 @@ if [[ "$DETECTED_VERSION" != ${ASTYLE_VERSION}* ]]; then
|
||||||
exit 1;
|
exit 1;
|
||||||
fi
|
fi
|
||||||
|
|
||||||
style="--style=stroustrup --indent=spaces=4 --indent-namespaces --lineend=linux --min-conditional-indent=0"
|
style="--style=kr --indent=spaces=4 --indent-namespaces --lineend=linux --min-conditional-indent=0"
|
||||||
options="--options=none --pad-header --unpad-paren --suffix=none --convert-tabs --attach-inlines"
|
options="--options=none --pad-header --unpad-paren --suffix=none --convert-tabs --attach-inlines --attach-classes --attach-namespaces"
|
||||||
|
|
||||||
$ASTYLE $style $options cli/*.cpp
|
$ASTYLE $style $options cli/*.cpp
|
||||||
$ASTYLE $style $options cli/*.h
|
$ASTYLE $style $options cli/*.h
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
@REM Script to run AStyle on the sources
|
@REM Script to run AStyle on the sources
|
||||||
|
|
||||||
@SET STYLE=--style=stroustrup --indent=spaces=4 --indent-namespaces --lineend=linux --min-conditional-indent=0
|
@SET STYLE=--style=kr --indent=spaces=4 --indent-namespaces --lineend=linux --min-conditional-indent=0
|
||||||
@SET OPTIONS=--pad-header --unpad-paren --suffix=none --convert-tabs --attach-inlines
|
@SET OPTIONS=--pad-header --unpad-paren --suffix=none --convert-tabs --attach-inlines --attach-classes --attach-namespaces
|
||||||
|
|
||||||
astyle %STYLE% %OPTIONS% cli/*.cpp
|
astyle %STYLE% %OPTIONS% cli/*.cpp
|
||||||
astyle %STYLE% %OPTIONS% cli/*.h
|
astyle %STYLE% %OPTIONS% cli/*.h
|
||||||
|
|
Loading…
Reference in New Issue