From 1e19ff8bfd7c050d056002836694eea048175547 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Tue, 12 Nov 2019 14:27:04 +0100 Subject: Revert "Fix issues with make_update.py when run from release branch" This reverts commit 8e9e58895b32afc38f856053335c9b27324c6f9e. 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. --- build_files/utils/make_update.py | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) (limited to 'build_files/utils') diff --git a/build_files/utils/make_update.py b/build_files/utils/make_update.py index 82a95d8ae5b..ec72514fdfc 100755 --- a/build_files/utils/make_update.py +++ b/build_files/utils/make_update.py @@ -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) + 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 + 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): + 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) -- cgit v1.2.3