summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2017-01-11 14:45:53 -0800
committerBruno de Oliveira Abinader <bruno@mapbox.com>2017-01-13 14:53:39 +0200
commita3e9c74dc6f28a25e508c4ce7e0e5424b9d646f4 (patch)
treef1407a752827355451e73565ae35d4f2abc8ce29
parent00bacf59517668227412aa35041417372489394c (diff)
downloadqtlocation-mapboxgl-a3e9c74dc6f28a25e508c4ce7e0e5424b9d646f4.tar.gz
[build] Upgrade clang-tidy and clang-format
Version 3.8.0 was removed from mason.
m---------.mason0
-rw-r--r--Makefile8
-rwxr-xr-xscripts/clang-tools.sh4
-rwxr-xr-xscripts/tidy.sh17
4 files changed, 6 insertions, 23 deletions
diff --git a/.mason b/.mason
-Subproject a17d47e8158824449bc93b894639c78b4d33cb5
+Subproject 639affb2b78cfebf12b437df0ada9c519742489
diff --git a/Makefile b/Makefile
index 79aed8222c..c6ed494f4d 100644
--- a/Makefile
+++ b/Makefile
@@ -188,8 +188,8 @@ compdb: $(BUILD_DEPS) $(TEST_DEPS) $(MACOS_COMPDB_PATH)/Makefile
.PHONY: clang-tools
clang-tools: compdb
- if test -z $(CLANG_TIDY); then .mason/mason install clang-tidy 3.8.0; fi
- if test -z $(CLANG_FORMAT); then .mason/mason install clang-format 3.8.0; fi
+ if test -z $(CLANG_TIDY); then .mason/mason install clang-tidy 3.9.1; fi
+ if test -z $(CLANG_FORMAT); then .mason/mason install clang-format 3.9.1; fi
$(MAKE) -C $(MACOS_COMPDB_PATH) mbgl-headers
.PHONY: tidy
@@ -355,8 +355,8 @@ compdb: $(LINUX_BUILD)
.PHONY: clang-tools
clang-tools: compdb
- if test -z $(CLANG_TIDY); then .mason/mason install clang-tidy 3.8.0; fi
- if test -z $(CLANG_FORMAT); then .mason/mason install clang-format 3.8.0; fi
+ if test -z $(CLANG_TIDY); then .mason/mason install clang-tidy 3.9.1; fi
+ if test -z $(CLANG_FORMAT); then .mason/mason install clang-format 3.9.1; fi
$(NINJA) $(NINJA_ARGS) -j$(JOBS) -C $(LINUX_OUTPUT_PATH) mbgl-headers
.PHONY: tidy
diff --git a/scripts/clang-tools.sh b/scripts/clang-tools.sh
index b49aadf520..ae3a5fa0e7 100755
--- a/scripts/clang-tools.sh
+++ b/scripts/clang-tools.sh
@@ -5,8 +5,8 @@ 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}
+CLANG_TIDY=${CLANG_TIDY:-$(mason prefix clang-tidy 3.9.1)/bin/clang-tidy}
+CLANG_FORMAT=${CLANG_FORMAT:-$(mason prefix clang-format 3.9.1)/bin/clang-format}
command -v ${CLANG_TIDY} >/dev/null 2>&1 || {
echo "Can't find ${CLANG_TIDY} in PATH."
diff --git a/scripts/tidy.sh b/scripts/tidy.sh
deleted file mode 100755
index 424c82c3cd..0000000000
--- a/scripts/tidy.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-set -o pipefail
-
-# Ensure mason is on the PATH
-export PATH="`pwd`/.mason:${PATH}" MASON_DIR="`pwd`/.mason"
-
-BUILDTYPE=${BUILDTYPE:-Release}
-
-export CLANG_TIDY=clang-tidy-3.8
-
-mapbox_time "config" \
-make config
-
-mapbox_time "tidy" \
-make tidy