[build] Upgrade clang-tidy and clang-format
Version 3.8.0 was removed from mason.
This commit is contained in:
committed by
Bruno de Oliveira Abinader
parent
00bacf5951
commit
a3e9c74dc6
2
.mason
2
.mason
Submodule .mason updated: a17d47e815...639affb2b7
8
Makefile
8
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
|
||||
|
||||
@@ -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."
|
||||
|
||||
@@ -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
|
||||
Reference in New Issue
Block a user