diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-08-23 20:35:02 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-08-30 18:57:18 +0300 |
| commit | e218d8c24bfbd5384e040417e533ede96c4e831b (patch) | |
| tree | 962ef76ad77e62e4c1eb66bcac093e55c10cd2e1 /build_files/windows/update_sources.cmd | |
| parent | fd48e17461e391c90ff9af96650480b35190e37e (diff) | |
Build: integrate make_update.py into Windows make.bat
Diffstat (limited to 'build_files/windows/update_sources.cmd')
| -rw-r--r-- | build_files/windows/update_sources.cmd | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/build_files/windows/update_sources.cmd b/build_files/windows/update_sources.cmd index 1f571eaf92d..f8fbd383090 100644 --- a/build_files/windows/update_sources.cmd +++ b/build_files/windows/update_sources.cmd @@ -1,18 +1,13 @@ -if "%BUILD_UPDATE_SVN%" == "1" ( - if "%SVN%" == "" ( - echo svn not found, cannot update libraries - goto UPDATE_GIT - ) - "%SVN%" up "%BLENDER_DIR%/../lib/*" +if EXIST %PYTHON% ( + goto detect_python_done ) -:UPDATE_GIT -if "%BUILD_UPDATE_GIT%" == "1" ( - if "%GIT%" == "" ( - echo Git not found, cannot update code - goto EOF - ) - "%GIT%" pull --rebase - "%GIT%" submodule foreach git pull --rebase origin master -) +echo python not found in lib folder +exit /b 1 + +:detect_python_done + +REM Use -B to avoid writing __pycache__ in lib directory and causing update conflicts. +%PYTHON% -B %BLENDER_DIR%\build_files\utils\make_update.py --git-command "%GIT%" --svn-command "%SVN%" %BUILD_UPDATE_ARGS% + :EOF |