2019-08-20 10:05:03 +00:00
|
|
|
#!/usr/bin/env python3
|
2019-08-23 17:35:02 +00:00
|
|
|
#
|
|
|
|
# "make update" for all platforms, updating svn libraries and tests and Blender
|
|
|
|
# git repository and submodules.
|
|
|
|
#
|
|
|
|
# For release branches, this will check out the appropriate branches of
|
|
|
|
# submodules and libraries.
|
|
|
|
|
|
|
|
import argparse
|
2019-08-20 10:05:03 +00:00
|
|
|
import os
|
2019-08-23 17:35:02 +00:00
|
|
|
import shutil
|
2019-08-20 10:05:03 +00:00
|
|
|
import sys
|
|
|
|
|
2019-08-29 09:13:41 +00:00
|
|
|
import make_utils
|
2019-09-08 12:17:58 +00:00
|
|
|
from make_utils import call, check_output
|
2019-08-30 12:20:29 +00:00
|
|
|
|
2019-09-08 12:17:58 +00:00
|
|
|
def print_stage(text):
|
|
|
|
print("")
|
|
|
|
print(text)
|
|
|
|
print("")
|
2019-08-23 17:35:02 +00:00
|
|
|
|
2019-09-08 12:17:58 +00:00
|
|
|
# Parse arguments
|
2019-08-23 17:35:02 +00:00
|
|
|
def parse_arguments():
|
|
|
|
parser = argparse.ArgumentParser()
|
2019-09-03 15:38:40 +00:00
|
|
|
parser.add_argument("--no-libraries", action="store_true")
|
|
|
|
parser.add_argument("--no-blender", action="store_true")
|
|
|
|
parser.add_argument("--no-submodules", action="store_true")
|
2019-09-05 10:34:17 +00:00
|
|
|
parser.add_argument("--use-tests", action="store_true")
|
2019-08-23 17:35:02 +00:00
|
|
|
parser.add_argument("--svn-command", default="svn")
|
|
|
|
parser.add_argument("--git-command", default="git")
|
2019-10-09 07:42:42 +00:00
|
|
|
parser.add_argument("--use-centos-libraries", action="store_true")
|
2019-08-23 17:35:02 +00:00
|
|
|
return parser.parse_args()
|
|
|
|
|
2019-10-09 07:42:42 +00:00
|
|
|
def get_blender_git_root():
|
|
|
|
return check_output([args.git_command, "rev-parse", "--show-toplevel"])
|
|
|
|
|
2019-08-23 17:35:02 +00:00
|
|
|
# Setup for precompiled libraries and tests from svn.
|
2019-09-08 12:17:58 +00:00
|
|
|
def svn_update(args, release_version):
|
|
|
|
svn_non_interactive = [args.svn_command, '--non-interactive']
|
|
|
|
|
2019-10-09 07:42:42 +00:00
|
|
|
lib_dirpath = os.path.join(get_blender_git_root(), '..', 'lib')
|
2019-08-29 09:13:41 +00:00
|
|
|
svn_url = make_utils.svn_libraries_base_url(release_version)
|
2019-08-23 17:35:02 +00:00
|
|
|
|
|
|
|
# Checkout precompiled libraries
|
|
|
|
if sys.platform == 'darwin':
|
|
|
|
lib_platform = "darwin"
|
|
|
|
elif sys.platform == 'win32':
|
|
|
|
# Windows checkout is usually handled by bat scripts since python3 to run
|
|
|
|
# this script is bundled as part of the precompiled libraries. However it
|
|
|
|
# is used by the buildbot.
|
2019-11-09 02:09:59 +00:00
|
|
|
lib_platform = "win64_vc15"
|
2019-10-09 07:42:42 +00:00
|
|
|
elif args.use_centos_libraries:
|
|
|
|
lib_platform = "linux_centos7_x86_64"
|
2019-08-23 17:35:02 +00:00
|
|
|
else:
|
|
|
|
# No precompiled libraries for Linux.
|
|
|
|
lib_platform = None
|
|
|
|
|
|
|
|
if lib_platform:
|
|
|
|
lib_platform_dirpath = os.path.join(lib_dirpath, lib_platform)
|
|
|
|
|
|
|
|
if not os.path.exists(lib_platform_dirpath):
|
|
|
|
print_stage("Checking out Precompiled Libraries")
|
|
|
|
|
2019-09-30 08:19:55 +00:00
|
|
|
if make_utils.command_missing(args.svn_command):
|
2019-08-31 16:43:31 +00:00
|
|
|
sys.stderr.write("svn not found, can't checkout libraries\n")
|
|
|
|
sys.exit(1)
|
|
|
|
|
2019-08-23 17:35:02 +00:00
|
|
|
svn_url_platform = svn_url + lib_platform
|
2019-08-31 12:55:38 +00:00
|
|
|
call(svn_non_interactive + ["checkout", svn_url_platform, lib_platform_dirpath])
|
2019-08-23 17:35:02 +00:00
|
|
|
|
2019-09-08 12:17:58 +00:00
|
|
|
if args.use_tests:
|
2019-09-05 10:34:17 +00:00
|
|
|
lib_tests = "tests"
|
|
|
|
lib_tests_dirpath = os.path.join(lib_dirpath, lib_tests)
|
|
|
|
|
|
|
|
if not os.path.exists(lib_tests_dirpath):
|
|
|
|
print_stage("Checking out Tests")
|
|
|
|
|
2019-09-30 08:19:55 +00:00
|
|
|
if make_utils.command_missing(args.svn_command):
|
2019-09-05 10:34:17 +00:00
|
|
|
sys.stderr.write("svn not found, can't checkout tests\n")
|
|
|
|
sys.exit(1)
|
|
|
|
|
|
|
|
svn_url_tests = svn_url + lib_tests
|
|
|
|
call(svn_non_interactive + ["checkout", svn_url_tests, lib_tests_dirpath])
|
|
|
|
|
2019-08-23 17:35:02 +00:00
|
|
|
# Update precompiled libraries and tests
|
|
|
|
print_stage("Updating Precompiled Libraries and Tests")
|
|
|
|
|
|
|
|
if os.path.isdir(lib_dirpath):
|
2019-11-12 13:27:04 +00:00
|
|
|
for dirname in os.listdir(lib_dirpath):
|
2019-10-09 19:35:57 +00:00
|
|
|
dirpath = os.path.join(lib_dirpath, dirname)
|
|
|
|
|
2019-11-12 13:27:04 +00:00
|
|
|
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
|
|
|
|
|
2019-08-23 17:35:02 +00:00
|
|
|
svn_dirpath = os.path.join(dirpath, ".svn")
|
2019-11-12 13:27:04 +00:00
|
|
|
svn_root_dirpath = os.path.join(lib_dirpath, ".svn")
|
2019-08-23 17:35:02 +00:00
|
|
|
|
2019-11-12 13:27:04 +00:00
|
|
|
if os.path.isdir(dirpath) and \
|
|
|
|
(os.path.exists(svn_dirpath) or os.path.exists(svn_root_dirpath)):
|
2019-09-30 08:19:55 +00:00
|
|
|
if make_utils.command_missing(args.svn_command):
|
2019-08-31 16:43:31 +00:00
|
|
|
sys.stderr.write("svn not found, can't update libraries\n")
|
|
|
|
sys.exit(1)
|
|
|
|
|
2019-10-09 19:35:57 +00:00
|
|
|
# Cleanup to continue with interrupted downloads.
|
|
|
|
if os.path.exists(svn_dirpath):
|
|
|
|
call(svn_non_interactive + ["cleanup", dirpath])
|
|
|
|
# Switch to appropriate branch and update.
|
2019-11-12 13:28:39 +00:00
|
|
|
call(svn_non_interactive + ["switch", svn_url + dirname, dirpath], exit_on_error=False)
|
2019-08-31 12:55:38 +00:00
|
|
|
call(svn_non_interactive + ["update", dirpath])
|
2019-08-23 17:35:02 +00:00
|
|
|
|
2019-10-09 12:41:34 +00:00
|
|
|
# Test if git repo can be updated.
|
2019-10-09 19:35:57 +00:00
|
|
|
def git_update_skip(args, check_remote_exists=True):
|
2019-09-30 08:19:55 +00:00
|
|
|
if make_utils.command_missing(args.git_command):
|
2019-09-03 15:38:40 +00:00
|
|
|
sys.stderr.write("git not found, can't update code\n")
|
|
|
|
sys.exit(1)
|
|
|
|
|
2019-09-08 12:17:58 +00:00
|
|
|
# Abort if a rebase is still progress.
|
2019-10-08 13:11:55 +00:00
|
|
|
rebase_merge = check_output([args.git_command, 'rev-parse', '--git-path', 'rebase-merge'], exit_on_error=False)
|
|
|
|
rebase_apply = check_output([args.git_command, 'rev-parse', '--git-path', 'rebase-apply'], exit_on_error=False)
|
|
|
|
merge_head = check_output([args.git_command, 'rev-parse', '--git-path', 'MERGE_HEAD'], exit_on_error=False)
|
2019-09-08 12:17:58 +00:00
|
|
|
if os.path.exists(rebase_merge) or \
|
|
|
|
os.path.exists(rebase_apply) or \
|
|
|
|
os.path.exists(merge_head):
|
|
|
|
return "rebase or merge in progress, complete it first"
|
|
|
|
|
|
|
|
# Abort if uncommitted changes.
|
|
|
|
changes = check_output([args.git_command, 'status', '--porcelain', '--untracked-files=no'])
|
|
|
|
if len(changes) != 0:
|
|
|
|
return "you have unstaged changes"
|
|
|
|
|
|
|
|
# Test if there is an upstream branch configured
|
2019-10-09 19:35:57 +00:00
|
|
|
if check_remote_exists:
|
|
|
|
branch = check_output([args.git_command, "rev-parse", "--abbrev-ref", "HEAD"])
|
|
|
|
remote = check_output([args.git_command, "config", "branch." + branch + ".remote"], exit_on_error=False)
|
|
|
|
if len(remote) == 0:
|
|
|
|
return "no remote branch to pull from"
|
2019-09-08 12:17:58 +00:00
|
|
|
|
2019-10-09 12:41:34 +00:00
|
|
|
return ""
|
2019-09-08 12:17:58 +00:00
|
|
|
|
2019-10-09 12:41:34 +00:00
|
|
|
# Update blender repository.
|
2019-09-08 12:17:58 +00:00
|
|
|
def blender_update(args):
|
|
|
|
print_stage("Updating Blender Git Repository")
|
|
|
|
call([args.git_command, "pull", "--rebase"])
|
|
|
|
|
2019-09-03 15:38:40 +00:00
|
|
|
|
2019-09-08 12:17:58 +00:00
|
|
|
# Update submodules.
|
2019-10-09 12:41:34 +00:00
|
|
|
def submodules_update(args, release_version, branch):
|
2019-09-03 15:38:40 +00:00
|
|
|
print_stage("Updating Submodules")
|
2019-09-30 08:19:55 +00:00
|
|
|
if make_utils.command_missing(args.git_command):
|
2019-09-03 15:38:40 +00:00
|
|
|
sys.stderr.write("git not found, can't update code\n")
|
|
|
|
sys.exit(1)
|
|
|
|
|
2019-10-09 12:41:34 +00:00
|
|
|
# Update submodules to latest master or appropriate release branch.
|
2019-09-03 15:38:40 +00:00
|
|
|
if not release_version:
|
2019-10-09 12:41:34 +00:00
|
|
|
branch = "master"
|
|
|
|
|
|
|
|
submodules = [
|
|
|
|
("release/scripts/addons", branch),
|
|
|
|
("release/scripts/addons_contrib", branch),
|
|
|
|
("release/datafiles/locale", branch),
|
2019-10-11 19:43:45 +00:00
|
|
|
("source/tools", branch),
|
2019-10-09 12:41:34 +00:00
|
|
|
]
|
|
|
|
|
|
|
|
# Initialize submodules only if needed.
|
|
|
|
for submodule_path, submodule_branch in submodules:
|
|
|
|
if not os.path.exists(os.path.join(submodule_path, ".git")):
|
|
|
|
call([args.git_command, "submodule", "update", "--init", "--recursive"])
|
|
|
|
break
|
|
|
|
|
|
|
|
# Checkout appropriate branch and pull changes.
|
|
|
|
skip_msg = ""
|
|
|
|
for submodule_path, submodule_branch in submodules:
|
|
|
|
cwd = os.getcwd()
|
|
|
|
try:
|
|
|
|
os.chdir(submodule_path)
|
2019-10-09 19:35:57 +00:00
|
|
|
msg = git_update_skip(args, check_remote_exists=False)
|
2019-10-09 12:41:34 +00:00
|
|
|
if msg:
|
|
|
|
skip_msg += submodule_path + " skipped: " + msg + "\n"
|
|
|
|
else:
|
2019-10-11 10:21:55 +00:00
|
|
|
if make_utils.git_branch(args.git_command) != submodule_branch:
|
2019-10-11 11:11:10 +00:00
|
|
|
call([args.git_command, "fetch", "origin"])
|
2019-10-11 10:21:55 +00:00
|
|
|
call([args.git_command, "checkout", submodule_branch])
|
|
|
|
call([args.git_command, "pull", "--rebase", "origin", submodule_branch])
|
2019-10-09 12:41:34 +00:00
|
|
|
finally:
|
|
|
|
os.chdir(cwd)
|
|
|
|
|
|
|
|
return skip_msg
|
2019-09-08 12:17:58 +00:00
|
|
|
|
|
|
|
|
|
|
|
if __name__ == "__main__":
|
|
|
|
args = parse_arguments()
|
2019-10-09 12:41:34 +00:00
|
|
|
blender_skip_msg = ""
|
|
|
|
submodules_skip_msg = ""
|
2019-09-08 12:17:58 +00:00
|
|
|
|
|
|
|
# Test if we are building a specific release version.
|
2019-10-09 12:41:34 +00:00
|
|
|
branch = make_utils.git_branch(args.git_command)
|
|
|
|
release_version = make_utils.git_branch_release_version(branch)
|
2019-09-08 12:17:58 +00:00
|
|
|
|
|
|
|
if not args.no_libraries:
|
|
|
|
svn_update(args, release_version)
|
|
|
|
if not args.no_blender:
|
2019-10-09 12:41:34 +00:00
|
|
|
blender_skip_msg = git_update_skip(args)
|
|
|
|
if blender_skip_msg:
|
|
|
|
blender_skip_msg = "Blender repository skipped: " + blender_skip_msg + "\n"
|
|
|
|
else:
|
2019-09-08 12:17:58 +00:00
|
|
|
blender_update(args)
|
|
|
|
if not args.no_submodules:
|
2019-10-09 12:41:34 +00:00
|
|
|
submodules_skip_msg = submodules_update(args, release_version, branch)
|
|
|
|
|
|
|
|
# Report any skipped repositories at the end, so it's not as easy to miss.
|
|
|
|
skip_msg = blender_skip_msg + submodules_skip_msg
|
|
|
|
if skip_msg:
|
|
|
|
print_stage(skip_msg.strip())
|
|
|
|
|
|
|
|
# For failed submodule update we throw an error, since not having correct
|
|
|
|
# submodules can make Blender throw errors.
|
|
|
|
# For Blender itself we don't and consider "make update" to be a command
|
|
|
|
# you can use while working on uncommitted code.
|
|
|
|
if submodules_skip_msg:
|
|
|
|
sys.exit(1)
|