shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "remove tools/vpx-style.sh"

--- 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

--- a/tools/vpx-astyle.sh

+++ /dev/null

@@ -1,27 +1,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' \

-      "$@"