Skip to content
Snippets Groups Projects
Commit 2a891842 authored by Sergey Sharybin's avatar Sergey Sharybin
Browse files

Clang-format: Speed up detection of clang-format

Don't construct the full build environment, following
feedback from Ray.
parent 49e4182b
No related branches found
No related tags found
No related merge requests found
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. REM TODO(sergey): Switch to Python from libraries when available.
set PYTHON="python.exe" set PYTHON="python.exe"
set FORMAT_PATHS=%BLENDER_DIR%\source\tools\utils_maintenance\clang_format_paths.py 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. 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 %PYTHON% %FORMAT_PATHS% --expand-tabs
......
...@@ -31,6 +31,12 @@ if "%BUILD_UPDATE%" == "1" ( ...@@ -31,6 +31,12 @@ if "%BUILD_UPDATE%" == "1" (
goto EOF goto EOF
) )
if "%FORMAT%" == "1" (
call "%BLENDER_DIR%\build_files\windows\format.cmd"
goto EOF
)
call "%BLENDER_DIR%\build_files\windows\detect_architecture.cmd" call "%BLENDER_DIR%\build_files\windows\detect_architecture.cmd"
if "%BUILD_VS_YEAR%" == "" ( if "%BUILD_VS_YEAR%" == "" (
...@@ -47,18 +53,13 @@ if "%BUILD_VS_YEAR%" == "" ( ...@@ -47,18 +53,13 @@ if "%BUILD_VS_YEAR%" == "" (
) )
) )
call "%BLENDER_DIR%\build_files\windows\check_libraries.cmd"
if errorlevel 1 goto EOF
if "%FORMAT%" == "1" (
call "%BLENDER_DIR%\build_files\windows\format.cmd"
goto EOF
)
call "%BLENDER_DIR%\build_files\windows\set_build_dir.cmd" call "%BLENDER_DIR%\build_files\windows\set_build_dir.cmd"
echo Building blender with VS%BUILD_VS_YEAR% for %BUILD_ARCH% in %BUILD_DIR% echo Building blender with VS%BUILD_VS_YEAR% for %BUILD_ARCH% in %BUILD_DIR%
call "%BLENDER_DIR%\build_files\windows\check_libraries.cmd"
if errorlevel 1 goto EOF
call "%BLENDER_DIR%\build_files\windows\check_submodules.cmd" call "%BLENDER_DIR%\build_files\windows\check_submodules.cmd"
if errorlevel 1 goto EOF if errorlevel 1 goto EOF
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment