[Bf-blender-cvs] [40a55be82cf] master: Buildbot: Checkout precomiled CentOS libraries

[Sergey Sharybin]

Commit: 40a55be82cf50849ae1df3b32b81da91f0894e38
Author: Sergey Sharybin
Date:   Wed Oct 9 09:42:42 2019 +0200
Branches: master
https://developer.blender.org/rB40a55be82cf50849ae1df3b32b81da91f0894e38

Buildbot: Checkout precomiled CentOS libraries

===================================================================

M	build_files/buildbot/slave_update.py
M	build_files/utils/make_update.py
M	release/scripts/addons

===================================================================

diff --git a/build_files/buildbot/slave_update.py b/build_files/buildbot/slave_update.py
index 39f449b87bc..36a7ae31c84 100644
--- a/build_files/buildbot/slave_update.py
+++ b/build_files/buildbot/slave_update.py
@@ -28,4 +28,4 @@ if __name__ == "__main__":
 
     # Run make update which handles all libraries and submodules.
     make_update = os.path.join(builder.blender_dir, "build_files", "utils", "make_update.py")
-    buildbot_utils.call([sys.executable, make_update, '--no-blender', "--use-tests"])
+    buildbot_utils.call([sys.executable, make_update, '--no-blender', "--use-tests", "--use-centos-libraries"])
diff --git a/build_files/utils/make_update.py b/build_files/utils/make_update.py
index 48158d540c4..bf2e6e9fab8 100755
--- a/build_files/utils/make_update.py
+++ b/build_files/utils/make_update.py
@@ -28,13 +28,17 @@ def parse_arguments():
     parser.add_argument("--use-tests", action="store_true")
     parser.add_argument("--svn-command", default="svn")
     parser.add_argument("--git-command", default="git")
+    parser.add_argument("--use-centos-libraries", action="store_true")
     return parser.parse_args()
 
+def get_blender_git_root():
+    return check_output([args.git_command, "rev-parse", "--show-toplevel"])
+
 # Setup for precompiled libraries and tests from svn.
 def svn_update(args, release_version):
     svn_non_interactive = [args.svn_command, '--non-interactive']
 
-    lib_dirpath = os.path.join('..', 'lib')
+    lib_dirpath = os.path.join(get_blender_git_root(), '..', 'lib')
     svn_url = make_utils.svn_libraries_base_url(release_version)
 
     # Checkout precompiled libraries
@@ -45,6 +49,8 @@ def svn_update(args, release_version):
         # this script is bundled as part of the precompiled libraries. However it
         # is used by the buildbot.
         lib_platform = "win64_vc14"
+    elif args.use_centos_libraries:
+        lib_platform = "linux_centos7_x86_64"
     else:
         # No precompiled libraries for Linux.
         lib_platform = None
diff --git a/release/scripts/addons b/release/scripts/addons
index b25958d1542..a17cabe4c99 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit b25958d1542648c890a9199694b4a9f6ec5ffcb3
+Subproject commit a17cabe4c9976547b20078149a99c9bb58152d1d