[Bf-blender-cvs] [fc0f47e3493] master: make.bat: Support running python from lib folder for make format

Lazydodo noreply at git.blender.org
Wed Aug 14 01:03:37 CEST 2019


Commit: fc0f47e3493ceb3d04117a665353de48df04c32f
Author: Lazydodo
Date:   Tue Aug 13 17:03:09 2019 -0600
Branches: master
https://developer.blender.org/rBfc0f47e3493ceb3d04117a665353de48df04c32f

make.bat: Support running python from lib folder for make format

We are no longer depended on a system python being installed.

===================================================================

M	build_files/windows/format.cmd

===================================================================

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.



More information about the Bf-blender-cvs mailing list