Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Build: use non-interactive svn commands for "make update"

Browse Source 
Needed for buildbot, but interactively solving svn conflicts in the middle
of manual make update is also not ideal.
This commit is contained in:
Brecht Van Lommel
2019-08-31 14:55:38 +02:00
parent 82ef1edce4
commit a098bd094c
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
build_files/utils/make_update.py
View File

@@ -27,6 +27,7 @@ args = parse_arguments()
only_code = args.only_code only_code = args.only_code
git_command = args.git_command git_command = args.git_command
svn_command = args.svn_command svn_command = args.svn_command
svn_non_interactive = [args.svn_command, '--non-interactive']
if shutil.which(git_command) is None: if shutil.which(git_command) is None:
sys.stderr.write("git not found, can't update code\n") sys.stderr.write("git not found, can't update code\n")
@@ -68,7 +69,7 @@ if not only_code:
print_stage("Checking out Precompiled Libraries") print_stage("Checking out Precompiled Libraries")
svn_url_platform = svn_url + lib_platform svn_url_platform = svn_url + lib_platform
call([svn_command, "checkout", svn_url_platform, lib_platform_dirpath]) call(svn_non_interactive + ["checkout", svn_url_platform, lib_platform_dirpath])
# Update precompiled libraries and tests # Update precompiled libraries and tests
print_stage("Updating Precompiled Libraries and Tests") print_stage("Updating Precompiled Libraries and Tests")
@@ -84,9 +85,9 @@ if not only_code:
if os.path.isdir(dirpath) and \ if os.path.isdir(dirpath) and \
(os.path.exists(svn_dirpath) or os.path.exists(svn_root_dirpath)): (os.path.exists(svn_dirpath) or os.path.exists(svn_root_dirpath)):
call([svn_command, "cleanup", dirpath]) call(svn_non_interactive + ["cleanup", dirpath])
call([svn_command, "switch", svn_url + dirname, dirpath]) call(svn_non_interactive + ["switch", svn_url + dirname, dirpath])
call([svn_command, "update", dirpath]) call(svn_non_interactive + ["update", dirpath])
# Update blender repository and submodules. # Update blender repository and submodules.
print_stage("Updating Blender Git Repository and Submodules") print_stage("Updating Blender Git Repository and Submodules")