diff options
| author | Lazydodo <github@lazydodo.com> | 2019-08-14 02:03:09 +0300 |
|---|---|---|
| committer | Lazydodo <github@lazydodo.com> | 2019-08-14 02:03:09 +0300 |
| commit | fc0f47e3493ceb3d04117a665353de48df04c32f (patch) | |
| tree | 5eae2bddc1a00578408fa4863f5762979355af25 /build_files/windows | |
| parent | c538903558d8c648817f5921e6f7acd284645214 (diff) | |
make.bat: Support running python from lib folder for make format
We are no longer depended on a system python being installed.
Diffstat (limited to 'build_files/windows')
| -rw-r--r-- | build_files/windows/format.cmd | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/build_files/windows/format.cmd b/build_files/windows/format.cmd index c291dc581ae..f036257e220 100644 --- a/build_files/windows/format.cmd +++ b/build_files/windows/format.cmd @@ -9,8 +9,17 @@ 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" +if EXIST %BLENDER_DIR%\..\lib\win64_vc14\python\37\bin\python.exe ( + set PYTHON=%BLENDER_DIR%\..\lib\win64_vc14\python\37\bin\python.exe + goto detect_python_done +) + +echo python not found in lib folder +exit /b 1 + +:detect_python_done +echo found python (%PYTHON%) + 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. |