blender/blender
166
522
Fork 797
Code Issues 6.8k Pull Requests 949 Projects 21 Wiki Activity

Make update: Fixes for blender 3.3 release branch #104878

Merged
Sergey Sharybin merged 3 commits from Sergey/blender:buildbot_293 into blender-v2.93-release 2023-02-17 15:24:50 +01:00
Conversation 0 Commits 3 Files Changed 1 +16 -3
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6af531d552 - Show all commits

19
build_files/utils/make_update.py
View File

@ -40,6 +40,8 @@ def parse_arguments():
parser.add_argument("--use-centos-libraries", action="store_true")
parser.add_argument("--use-linux-libraries", action="store_true")
parser.add_argument("--architecture", type=str, choices=("x86_64", "arm64",))
return parser.parse_args()
@ -48,6 +50,16 @@ def get_blender_git_root():
# Setup for precompiled libraries and tests from svn.
def get_effective_architecture(args):
if args.architecture:
return args.architecture
# Check platform.version to detect arm64 with x86_64 python binary.
if "ARM64" in platform.version():
return "arm64"
return platform.machine().lower()
def svn_update(args, release_version):
svn_non_interactive = [args.svn_command, '--non-interactive']
@ -56,11 +68,12 @@ def svn_update(args, release_version):
svn_url = make_utils.svn_libraries_base_url(release_version)
# Checkout precompiled libraries
architecture = get_effective_architecture(args)
if sys.platform == 'darwin':
if platform.machine() == 'x86_64':
lib_platform = "darwin"
elif platform.machine() == 'arm64':
if architecture == 'arm64':
lib_platform = "darwin_arm64"
elif architecture == 'x86_64':
lib_platform = "darwin"
else:
lib_platform = None
elif sys.platform == 'win32':