diff options
| author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-06-10 17:34:08 +0300 |
|---|---|---|
| committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2016-06-10 17:35:01 +0300 |
| commit | 83a3c18bdb2637b9eff9a0f510debfe9dd86d6cb (patch) | |
| tree | 8208e5c6f28f836aaef121d70203efe74e1354b0 | |
| parent | 07da939a76e3bc8953b675a3bbeb2727c8f0dde4 (diff) | |
| download | qtlocation-mapboxgl-83a3c18bdb2637b9eff9a0f510debfe9dd86d6cb.tar.gz | |
[build] Update compdb & tidy for Linux & OS X
| -rw-r--r-- | Makefile | 20 | ||||
| -rwxr-xr-x | scripts/clang-tidy.sh | 5 |
2 files changed, 22 insertions, 3 deletions
@@ -288,16 +288,30 @@ check: test scripts/collect-coverage.sh $(LINUX_OUTPUT_PATH)/$(BUILDTYPE) # Generates a compilation database with ninja for use in clang tooling -compdb: platform/linux/platform.gyp $(LINUX_OUTPUT_PATH)/config.gypi +compdb: compdb-$(HOST_PLATFORM) + +compdb-linux: platform/linux/platform.gyp $(LINUX_OUTPUT_PATH)/config.gypi $(GYP) -f ninja -I $(LINUX_OUTPUT_PATH)/config.gypi \ --generator-output=$(LINUX_OUTPUT_PATH) $< deps/ninja/ninja-linux -C $(LINUX_OUTPUT_PATH)/$(BUILDTYPE) \ -t compdb cc cc_s cxx objc objcxx > $(LINUX_OUTPUT_PATH)/$(BUILDTYPE)/compile_commands.json -tidy: compdb - deps/ninja/ninja-linux -C $(LINUX_OUTPUT_PATH)/$(BUILDTYPE) version shaders +compdb-osx: platform/osx/platform.gyp $(OSX_OUTPUT_PATH)/config.gypi + $(GYP) -f ninja -I $(OSX_OUTPUT_PATH)/config.gypi \ + --generator-output=$(OSX_OUTPUT_PATH) $< + deps/ninja/ninja-osx -C $(OSX_OUTPUT_PATH)/$(BUILDTYPE) \ + -t compdb cc cc_s cxx objc objcxx > $(OSX_OUTPUT_PATH)/$(BUILDTYPE)/compile_commands.json + +tidy: compdb tidy-$(HOST_PLATFORM) + +tidy-linux: + deps/ninja/ninja-linux -C $(LINUX_OUTPUT_PATH)/$(BUILDTYPE) platform-lib test scripts/clang-tidy.sh $(LINUX_OUTPUT_PATH)/$(BUILDTYPE) +tidy-osx: + deps/ninja/ninja-osx -C $(OSX_OUTPUT_PATH)/$(BUILDTYPE) platform-lib test + scripts/clang-tidy.sh $(OSX_OUTPUT_PATH)/$(BUILDTYPE) + #### Miscellaneous targets ##################################################### style-code: diff --git a/scripts/clang-tidy.sh b/scripts/clang-tidy.sh index 9420518747..76773e475a 100755 --- a/scripts/clang-tidy.sh +++ b/scripts/clang-tidy.sh @@ -12,6 +12,11 @@ command -v ${CLANG_TIDY:-clang-tidy} >/dev/null 2>&1 || { if [ -z ${CLANG_TIDY} ]; then echo "Alternatively, you can set CLANG_TIDY to point to clang-tidy." fi + if [ `uname -s` = 'Linux' ]; then + echo "On Debian-based distros, you can install them via 'apt-get install clang-tidy'" + elif [ `uname -s` = 'Darwin' ]; then + echo "On OS X, you can install them via 'brew install llvm --with-clang --with-clang-extra-tools'" + fi exit 1 } |