forked from bartvdbraak/blender
win/make.bat: Add svnfix convenience target
SVN seems to die randomly *a lot* during large updates for some users, and I'm no closer to finding out why that keeps happening. "The internet" seems to imply some AV vendors may be at fault here but nothing conclusive. The solution however is repeatedly running `svn cleanup`and `svn update` in the library folder to repair the corruption and finish the update. This change adds a small convenience helper to automate the repair. This is done inside the make.bat code rather than the shared python based update code, since python lives in the library folder and may or may not exist when this corruption occurs.
This commit is contained in:
parent
8d8ce64435
commit
99a2a73706
@ -116,6 +116,9 @@ if NOT "%1" == "" (
|
|||||||
) else if "%1" == "doc_py" (
|
) else if "%1" == "doc_py" (
|
||||||
set DOC_PY=1
|
set DOC_PY=1
|
||||||
goto EOF
|
goto EOF
|
||||||
|
) else if "%1" == "svnfix" (
|
||||||
|
set SVN_FIX=1
|
||||||
|
goto EOF
|
||||||
) else (
|
) else (
|
||||||
echo Command "%1" unknown, aborting!
|
echo Command "%1" unknown, aborting!
|
||||||
goto ERR
|
goto ERR
|
||||||
|
26
build_files/windows/svn_fix.cmd
Normal file
26
build_files/windows/svn_fix.cmd
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
if "%BUILD_VS_YEAR%"=="2017" set BUILD_VS_LIBDIRPOST=vc15
|
||||||
|
if "%BUILD_VS_YEAR%"=="2019" set BUILD_VS_LIBDIRPOST=vc15
|
||||||
|
if "%BUILD_VS_YEAR%"=="2022" set BUILD_VS_LIBDIRPOST=vc15
|
||||||
|
|
||||||
|
set BUILD_VS_SVNDIR=win64_%BUILD_VS_LIBDIRPOST%
|
||||||
|
set BUILD_VS_LIBDIR="%BLENDER_DIR%..\lib\%BUILD_VS_SVNDIR%"
|
||||||
|
|
||||||
|
echo Starting cleanup in %BUILD_VS_LIBDIR%.
|
||||||
|
cd %BUILD_VS_LIBDIR%
|
||||||
|
:RETRY
|
||||||
|
"%SVN%" cleanup
|
||||||
|
"%SVN%" update
|
||||||
|
if errorlevel 1 (
|
||||||
|
set /p LibRetry= "Error during update, retry? y/n"
|
||||||
|
if /I "!LibRetry!"=="Y" (
|
||||||
|
goto RETRY
|
||||||
|
)
|
||||||
|
echo.
|
||||||
|
echo Error: Download of external libraries failed.
|
||||||
|
echo This is needed for building, please manually run 'svn cleanup' and 'svn update' in
|
||||||
|
echo %BUILD_VS_LIBDIR% , until this is resolved you CANNOT make a successful blender build
|
||||||
|
echo.
|
||||||
|
exit /b 1
|
||||||
|
)
|
||||||
|
echo Cleanup complete
|
||||||
|
|
5
make.bat
5
make.bat
@ -56,6 +56,11 @@ if "%BUILD_VS_YEAR%" == "" (
|
|||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if "%SVN_FIX%" == "1" (
|
||||||
|
call "%BLENDER_DIR%\build_files\windows\svn_fix.cmd"
|
||||||
|
goto EOF
|
||||||
|
)
|
||||||
|
|
||||||
if "%BUILD_UPDATE%" == "1" (
|
if "%BUILD_UPDATE%" == "1" (
|
||||||
call "%BLENDER_DIR%\build_files\windows\check_libraries.cmd"
|
call "%BLENDER_DIR%\build_files\windows\check_libraries.cmd"
|
||||||
if errorlevel 1 goto EOF
|
if errorlevel 1 goto EOF
|
||||||
|
Loading…
Reference in New Issue
Block a user