diff options
| author | Ray Molenkamp <github@lazydodo.com> | 2022-10-29 20:25:33 +0300 |
|---|---|---|
| committer | Ray Molenkamp <github@lazydodo.com> | 2022-10-29 20:25:33 +0300 |
| commit | d1d2f002c7caaf4ab457ec27bbc44666d7aac624 (patch) | |
| tree | fb79e6db1086d2523429031c8ec739c971d61b3c /make.bat | |
| parent | 78fe6d7ab1952503d1eef66c18e36dc7e07147bf (diff) | |
make.bat: skip SVN update when running make code_update
regression from rB116d7b0042bba7d6cabd8e04c7d020ac3816caf3
Diffstat (limited to 'make.bat')
| -rw-r--r-- | make.bat | 12 |
1 files changed, 7 insertions, 5 deletions
@@ -65,11 +65,13 @@ if "%BUILD_UPDATE%" == "1" ( REM First see if the SVN libs are there and check them out if they are not. call "%BLENDER_DIR%\build_files\windows\check_libraries.cmd" if errorlevel 1 goto EOF - REM Then update SVN platform libraries, since updating python while python is - REM running tends to be problematic. The python script that update_sources - REM calls later on may still try to switch branches and run into trouble, - REM but for *most* people this will side step the problem. - call "%BLENDER_DIR%\build_files\windows\svn_update.cmd" + if "%BUILD_UPDATE_SVN%" == "1" ( + REM Then update SVN platform libraries, since updating python while python is + REM running tends to be problematic. The python script that update_sources + REM calls later on may still try to switch branches and run into trouble, + REM but for *most* people this will side step the problem. + call "%BLENDER_DIR%\build_files\windows\svn_update.cmd" + ) REM Finally call the python script shared between all platforms that updates git REM and does any other SVN work like update the tests or branch switches REM if required. |