Pārlūkot izejas kodu

Style: Don't apply clang-format to platform/android/java/src/com

Rémi Verschelde 6 gadi atpakaļ
vecāks
revīzija
bd9f6c23cb
2 mainītis faili ar 4 papildinājumiem un 1 dzēšanām
  1. 3 0
      misc/hooks/pre-commit-clang-format
  2. 1 1
      misc/travis/clang-format.sh

+ 3 - 0
misc/hooks/pre-commit-clang-format

@@ -86,6 +86,9 @@ do
     if grep -q "thirdparty" <<< $file; then
         continue;
     fi
+    if grep -q "platform/android/java/src/com" <<< $file; then
+        continue;
+    fi
 
     # ignore file if we do check for file extensions and the file
     # does not match any of the extensions specified in $FILE_EXTS

+ 1 - 1
misc/travis/clang-format.sh

@@ -11,7 +11,7 @@ else
     RANGE=HEAD
 fi
 
-FILES=$(git diff-tree --no-commit-id --name-only -r $RANGE | grep -v thirdparty/ | grep -E "\.(c|h|cpp|hpp|cc|hh|cxx|m|mm|inc|java|glsl)$")
+FILES=$(git diff-tree --no-commit-id --name-only -r $RANGE | grep -v thirdparty/ | grep -v platform/android/java/src/com/ | grep -E "\.(c|h|cpp|hpp|cc|hh|cxx|m|mm|inc|java|glsl)$")
 echo "Checking files:\n$FILES"
 
 # create a random filename to store our generated patch