From 2a891842afabcbb903897cfd56f7389f02d7e3b4 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Tue, 16 Apr 2019 17:05:31 +0200 Subject: Clang-format: Speed up detection of clang-format Don't construct the full build environment, following feedback from Ray. --- build_files/windows/format.cmd | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'build_files/windows') diff --git a/build_files/windows/format.cmd b/build_files/windows/format.cmd index 820263507fe..ca5330dc37c 100644 --- a/build_files/windows/format.cmd +++ b/build_files/windows/format.cmd @@ -1,9 +1,24 @@ +if EXIST %BLENDER_DIR%\..\lib\win64_vc14\llvm\bin\clang-format.exe ( + set CF_PATH=..\lib\win64_vc14\llvm\bin + goto detect_done +) +if EXIST %BLENDER_DIR%\..\lib\windows_vc14\llvm\bin\clang-format.exe ( + set CF_PATH=..\lib\windows_vc14\llvm\bin + goto detect_done +) + +echo clang-format not found +exit /b 1 + +:detect_done +echo found clang-format in %CF_PATH% + REM TODO(sergey): Switch to Python from libraries when available. set PYTHON="python.exe" set FORMAT_PATHS=%BLENDER_DIR%\source\tools\utils_maintenance\clang_format_paths.py REM The formatting script expects clang-format to be in the current PATH. -set PATH=%BUILD_VS_LIBDIR%\llvm\bin;%PATH% +set PATH=%CF_PATH%;%PATH% %PYTHON% %FORMAT_PATHS% --expand-tabs -- cgit v1.2.3