diff options
author | Bastien Montagne <bastien@blender.org> | 2021-09-02 13:11:32 +0300 |
---|---|---|
committer | Bastien Montagne <bastien@blender.org> | 2021-09-02 15:56:46 +0300 |
commit | 546314fc9669f88dd501b50be159fa0219813596 (patch) | |
tree | 1ca7e654b8dce2dd66793b16d79d08b9243a9345 /build_files/utils/make_utils.py | |
parent | 799a2b07ad13b879d1148b8ffe8ccd8e7e421212 (diff) |
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.
Diffstat (limited to 'build_files/utils/make_utils.py')
-rwxr-xr-x | build_files/utils/make_utils.py | 4 |
1 files changed, 3 insertions, 1 deletions
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/" |