Merge changes from topic 'clang-format' into nextgenv2
* changes:
remove tools/vpx-style.sh
README: add a note about clang-format
diff --git a/README b/README
index 460ad73..0f95a8f 100644
--- a/README
+++ b/README
@@ -127,6 +127,21 @@
$ ./configure --enable-unit-tests
$ LIBVPX_TEST_DATA_PATH=../libvpx-test-data make testdata
+CODE STYLE:
+ The coding style used by this project is enforced with clang-format using the
+ configuration contained in the .clang-format file in the root of the
+ repository.
+
+ Before pushing changes for review you can format your code with:
+ # Apply clang-format to modified .c, .h and .cc files
+ $ clang-format -i --style=file \
+ $(git diff --name-only --diff-filter=ACMR '*.[hc]' '*.cc')
+
+ Check the .clang-format file for the version used to generate it if there is
+ any difference between your local formatting and the review system.
+
+ See also: http://clang.llvm.org/docs/ClangFormat.html
+
SUPPORT
This library is an open source project supported by its community. Please
please email webm-discuss@webmproject.org for help.
diff --git a/tools/ftfy.sh b/tools/ftfy.sh
index 29ae95e..c005918 100755
--- a/tools/ftfy.sh
+++ b/tools/ftfy.sh
@@ -32,7 +32,7 @@
for f; do
case "$f" in
*.h|*.c|*.cc)
- "${dirname_self}"/vpx-astyle.sh "$f"
+ clang-format -i --style=file "$f"
;;
esac
done
@@ -102,9 +102,8 @@
# Preconditions
[ $# -lt 2 ] || usage
-# Check that astyle supports pad-header and align-pointer=name
-if ! astyle --pad-header --align-pointer=name < /dev/null; then
- log "Install astyle v1.24 or newer"
+if ! clang-format -version >/dev/null 2>&1; then
+ log "clang-format not found"
exit 1
fi
diff --git a/tools/vpx-astyle.sh b/tools/vpx-astyle.sh
deleted file mode 100755
index 6340426..0000000
--- a/tools/vpx-astyle.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-set -e
-astyle --style=java --indent=spaces=2 --indent-switches\
- --min-conditional-indent=0 \
- --pad-oper --pad-header --unpad-paren \
- --align-pointer=name \
- --indent-preprocessor --convert-tabs --indent-labels \
- --suffix=none --quiet --max-instatement-indent=80 "$@"
-# Disabled, too greedy?
-#sed -i 's;[[:space:]]\{1,\}\[;[;g' "$@"
-
-sed_i() {
- # Incompatible sed parameter parsing.
- if sed -i 2>&1 | grep -q 'requires an argument'; then
- sed -i '' "$@"
- else
- sed -i "$@"
- fi
-}
-
-sed_i -e 's/[[:space:]]\{1,\}\([,;]\)/\1/g' \
- -e 's/[[:space:]]\{1,\}\([+-]\{2\};\)/\1/g' \
- -e 's/,[[:space:]]*}/}/g' \
- -e 's;//\([^/[:space:]].*$\);// \1;g' \
- -e 's/^\(public\|private\|protected\):$/ \1:/g' \
- -e 's/[[:space:]]\{1,\}$//g' \
- "$@"
