From 546314fc9669f88dd501b50be159fa0219813596 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Thu, 2 Sep 2021 12:11:32 +0200 Subject: Build utils: `make_update`: Add option to choose SVN branch. Needed for studio sprite-fright frozen branch. Also do not overwrite branch for git sub-modules when it is defined, and fallback to `master` branch in case specified branch is not found in a specific sub-repository. --- build_files/utils/make_utils.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'build_files/utils/make_utils.py') diff --git a/build_files/utils/make_utils.py b/build_files/utils/make_utils.py index 9f928bb524d..7cd23baad68 100755 --- a/build_files/utils/make_utils.py +++ b/build_files/utils/make_utils.py @@ -70,9 +70,11 @@ def git_branch_release_version(branch, tag): return release_version -def svn_libraries_base_url(release_version): +def svn_libraries_base_url(release_version, branch): if release_version: svn_branch = "tags/blender-" + release_version + "-release" + elif branch: + svn_branch = "branches/" + branch else: svn_branch = "trunk" return "https://svn.blender.org/svnroot/bf-blender/" + svn_branch + "/lib/" -- cgit v1.2.3