From a3e9c74dc6f28a25e508c4ce7e0e5424b9d646f4 Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Wed, 11 Jan 2017 14:45:53 -0800
Subject: [build] Upgrade clang-tidy and clang-format

Version 3.8.0 was removed from mason.
---
 scripts/clang-tools.sh |  4 ++--
 scripts/tidy.sh        | 17 -----------------
 2 files changed, 2 insertions(+), 19 deletions(-)
 delete mode 100755 scripts/tidy.sh

(limited to 'scripts')

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
-- 
cgit v1.2.1