From 0c29afe214370b6c2481971de0c7cd3d26a0433f Mon Sep 17 00:00:00 2001 From: Ray Molenkamp Date: Mon, 26 Feb 2024 16:45:57 -0700 Subject: [PATCH 1/2] make.bat: only warn about python if lib folder is cloned First time builders get spooked by this warning and start installing python trying to resolve it. This isn't needed and we should only warn about python being missing if the lib folder is cloned, but python is still somehow not found. This was "fixed" a few times before, but it took a bit to find the right filename to check for the new library folder. --- build_files/windows/find_dependencies.cmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_files/windows/find_dependencies.cmd b/build_files/windows/find_dependencies.cmd index abcb92dc2f7..c697da2bccf 100644 --- a/build_files/windows/find_dependencies.cmd +++ b/build_files/windows/find_dependencies.cmd @@ -24,7 +24,7 @@ if EXIST %PYTHON% ( ) if NOT EXIST %PYTHON% ( - if EXIST %BLENDER_DIR%\lib\windows_x64\ ( + if EXIST %BLENDER_DIR%\lib\windows_x64\.git ( echo Warning: Python not found, there is likely an issue with the library folder ) set PYTHON="" From 2330e2564f69a2dea1cbb9c8e2bfd3a2f31812f6 Mon Sep 17 00:00:00 2001 From: Ray Molenkamp Date: Mon, 26 Feb 2024 16:49:08 -0700 Subject: [PATCH 2/2] make.bat: give status updates during initial lib clone This implements #118673 for make.bat as it is not using the python script for the initial clone. --- build_files/windows/check_libraries.cmd | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build_files/windows/check_libraries.cmd b/build_files/windows/check_libraries.cmd index 68e36c6cd55..8c92ac72aa8 100644 --- a/build_files/windows/check_libraries.cmd +++ b/build_files/windows/check_libraries.cmd @@ -26,7 +26,10 @@ if NOT EXIST "%BUILD_VS_LIBDIR%\.git" ( echo ********************************************************* :RETRY "%GIT%" -C "%BLENDER_DIR%\" config --local "submodule.%BUILD_VS_LIBDIR%.update" "checkout" + set GIT_LFS_SKIP_SMUDGE=1 "%GIT%" -C "%BLENDER_DIR%\" submodule update --progress --init "%BUILD_VS_LIBDIR%" + set GIT_LFS_SKIP_SMUDGE= + "%GIT%" -C "./%BUILD_VS_LIBDIR%" lfs pull if errorlevel 1 ( set /p LibRetry= "Error during download, retry? y/n" if /I "!LibRetry!"=="Y" (