summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorBruno de Oliveira Abinader <bruno@mapbox.com>2016-06-20 10:54:13 +0300
committerBruno de Oliveira Abinader <bruno@mapbox.com>2016-07-01 11:18:53 +0300
commitda863c6e52f656bd35c3d3346093a24d747d0bbd (patch)
tree7fffcf205e6abbb0eaaef8faa307d9ff90762881 /scripts
parenta440598e2b1dd224a03646c7e30a4d1b94769a27 (diff)
downloadqtlocation-mapboxgl-da863c6e52f656bd35c3d3346093a24d747d0bbd.tar.gz
[build] Added 'lint' Make target
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/clang-tidy.sh35
-rwxr-xr-xscripts/clang-tools.sh66
2 files changed, 66 insertions, 35 deletions
diff --git a/scripts/clang-tidy.sh b/scripts/clang-tidy.sh
deleted file mode 100755
index 7665180cf7..0000000000
--- a/scripts/clang-tidy.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-set -o pipefail
-
-export PATH="`pwd`/.mason:${PATH}" MASON_DIR="`pwd`/.mason"
-
-CLANG_TIDY=${CLANG_TIDY:-$(mason prefix clang-tidy 3.8.0)/bin/clang-tidy}
-
-command -v ${CLANG_TIDY} >/dev/null 2>&1 || {
- echo "Can't find ${CLANG_TIDY} in PATH."
- if [ -z ${CLANG_TIDY} ]; then
- echo "Alternatively, you can set CLANG_TIDY to point to clang-tidy."
- fi
- exit 1
-}
-
-cd $1
-
-function check_tidy() {
- echo "Checking $0..."
- OUTPUT=$(${CLANG_TIDY} -p=$PWD $0 2>/dev/null)
- if [[ -n $OUTPUT ]]; then
- echo "Caught clang-tidy warning/error:"
- echo -e "$OUTPUT"
- exit 1
- fi
-}
-
-export CLANG_TIDY
-export -f check_tidy
-
-echo "Running clang-tidy checks... (this might take a while)"
-git ls-files '../../../src/mbgl/*.cpp' '../../../platform/*.cpp' '../../../test/*.cpp' | \
- xargs -I{} -P ${JOBS} bash -c 'check_tidy' {}
diff --git a/scripts/clang-tools.sh b/scripts/clang-tools.sh
new file mode 100755
index 0000000000..23d5b289ef
--- /dev/null
+++ b/scripts/clang-tools.sh
@@ -0,0 +1,66 @@
+#!/usr/bin/env bash
+
+set -e
+set -o pipefail
+
+export PATH="`pwd`/.mason:${PATH}" MASON_DIR="`pwd`/.mason"
+
+CLANG_TIDY=${CLANG_TIDY:-$(mason prefix clang-tidy 3.8.0)/bin/clang-tidy}
+CLANG_FORMAT=${CLANG_FORMAT:-$(mason prefix clang-format 3.8.0)/bin/clang-format}
+
+command -v ${CLANG_TIDY} >/dev/null 2>&1 || {
+ echo "Can't find ${CLANG_TIDY} in PATH."
+ if [ -z ${CLANG_TIDY} ]; then
+ echo "Alternatively, you can set CLANG_TIDY to point to clang-tidy."
+ fi
+ exit 1
+}
+
+cd $1
+
+function check_tidy() {
+ echo "Running clang-tidy on $0..."
+ if [ -n $1 ] && [ $1 == "--fix" ]; then
+ OUTPUT=$(${CLANG_TIDY} -p=$PWD -fix -fix-errors $0 2>/dev/null)
+ else
+ OUTPUT=$(${CLANG_TIDY} -p=$PWD $0 2>/dev/null)
+ fi
+ if [[ -n $OUTPUT ]]; then
+ echo "Caught clang-tidy warning/error:"
+ echo -e "$OUTPUT"
+ exit 1
+ fi
+}
+
+function check_format() {
+ echo "Running clang-format on $0..."
+ ${CLANG_FORMAT} -i ../../../$0
+}
+
+export CLANG_TIDY CLANG_FORMAT
+export -f check_tidy check_format
+
+git diff-index --quiet HEAD || {
+ echo "Your repository contains unstaged and/or uncommitted changes."
+ echo "Please commit all changes before proceeding."
+ exit 1
+}
+
+echo "Running clang checks... (this might take a while)"
+
+if [ -n $2 ] && [ $2 == "--diff" ]; then
+ DIFF_FILES=$(for file in `git diff origin/master..HEAD --name-only | grep "pp$"`; do echo $file; done)
+ if [[ -n $DIFF_FILES ]]; then
+ echo "${DIFF_FILES}" | xargs -I{} -P ${JOBS} bash -c 'check_tidy --fix' {}
+ # XXX disabled until we run clang-format over the entire codebase.
+ #echo "${DIFF_FILES}" | xargs -I{} -P ${JOBS} bash -c 'check_format' {}
+ git diff-index --quiet HEAD || {
+ echo "Changes were made to source files - please review them before committing."
+ exit 1
+ }
+ fi
+ echo "All looks good!"
+else
+ git ls-files '../../../src/mbgl/*.cpp' '../../../platform/*.cpp' '../../../test/*.cpp' | \
+ xargs -I{} -P ${JOBS} bash -c 'check_tidy' {}
+fi