From 7dcd4993bb6adfe9ff27218dc05da993c8669905 Mon Sep 17 00:00:00 2001
From: James Zern <jzern@google.com>
Date: Thu, 4 Aug 2016 20:17:09 -0700
Subject: [PATCH] remove tools/vpx-style.sh
update ftfy.sh to use clang-format
Change-Id: I8ac740c5b3842beed2b8878fbe506f381f4c57e4
(cherry picked from commit 958ae5af9c892e5328ec0363d1a69afbfe0e0907)
---
tools/ftfy.sh | 7 +++----
tools/vpx-astyle.sh | 27 ---------------------------
2 files changed, 3 insertions(+), 31 deletions(-)
delete mode 100755 tools/vpx-astyle.sh
diff --git a/tools/ftfy.sh b/tools/ftfy.sh
index 29ae95e9ba..c005918fe7 100755
--- a/tools/ftfy.sh
+++ b/tools/ftfy.sh
@@ -32,7 +32,7 @@ vpx_style() {
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 @@ CLEAN_FILES="${CLEAN_FILES} ${ORIG_COMMIT_MSG} ${NEW_COMMIT_MSG}"
# 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 6340426bdc..0000000000
--- 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' \
- "$@"
--
GitLab