diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-10-09 10:42:42 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-10-09 10:42:42 +0300 |
commit | 40a55be82cf50849ae1df3b32b81da91f0894e38 (patch) | |
tree | 857068f447262edb77b7f2597815ce39841b780b /build_files | |
parent | 340b9c1dfc6e81efc0fb1e1ffff78203ba6aeddc (diff) |
Buildbot: Checkout precomiled CentOS libraries
Diffstat (limited to 'build_files')
-rw-r--r-- | build_files/buildbot/slave_update.py | 2 | ||||
-rwxr-xr-x | build_files/utils/make_update.py | 8 |
2 files changed, 8 insertions, 2 deletions
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 |