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

Revert "Fix issues with make_update.py when run from release branch"

Browse Source 
This reverts commit 8e9e58895b.

The change broke behavior when typing `make update` from the root of
the sources: tests folder wouldn't be updated anymore.

Getting quite close to release now, so will revert to a safer change.
This commit is contained in:
Sergey Sharybin
2019-11-12 14:27:04 +01:00
parent 8e9e58895b
commit 1e19ff8bfd
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
build_files/utils/make_update.py
View File

@@ -41,11 +41,6 @@ def svn_update(args, release_version):
lib_dirpath = os.path.join(get_blender_git_root(), '..', 'lib')
svn_url = make_utils.svn_libraries_base_url(release_version)
# List of directory names which corresponds to used SVN checkouts.
# Is used to ensure the checkout points to a valid branch/tag.
# Should consists only of directory name, such as "win64_vc14", for example.
used_lib_dir_names = []
# Checkout precompiled libraries
if sys.platform == 'darwin':
lib_platform = "darwin"
@@ -63,8 +58,6 @@ def svn_update(args, release_version):
if lib_platform:
lib_platform_dirpath = os.path.join(lib_dirpath, lib_platform)
used_lib_dir_names.append(lib_platform)
if not os.path.exists(lib_platform_dirpath):
print_stage("Checking out Precompiled Libraries")
@@ -79,8 +72,6 @@ def svn_update(args, release_version):
lib_tests = "tests"
lib_tests_dirpath = os.path.join(lib_dirpath, lib_tests)
used_lib_dir_names.append(lib_tests)
if not os.path.exists(lib_tests_dirpath):
print_stage("Checking out Tests")
@@ -95,13 +86,20 @@ def svn_update(args, release_version):
print_stage("Updating Precompiled Libraries and Tests")
if os.path.isdir(lib_dirpath):
for dirname in used_lib_dir_names:
print_stage("Updating {}" . format(dirname))
for dirname in os.listdir(lib_dirpath):
dirpath = os.path.join(lib_dirpath, dirname)
svn_dirpath = os.path.join(dirpath, ".svn")
if dirname == ".svn":
# Cleanup must be run from svn root directory if it exists.
if not make_utils.command_missing(args.svn_command):
call(svn_non_interactive + ["cleanup", lib_dirpath])
continue
if os.path.isdir(dirpath) and os.path.exists(svn_dirpath):
svn_dirpath = os.path.join(dirpath, ".svn")
svn_root_dirpath = os.path.join(lib_dirpath, ".svn")
if os.path.isdir(dirpath) and \
(os.path.exists(svn_dirpath) or os.path.exists(svn_root_dirpath)):
if make_utils.command_missing(args.svn_command):
sys.stderr.write("svn not found, can't update libraries\n")
sys.exit(1)