diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2020-01-30 15:32:54 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2020-01-30 15:32:54 +0300 |
commit | e207cba8cca58c0e5a7de41fe86233e0f28ccb0c (patch) | |
tree | 668dd57066071e50fbcb18d61305b75ff4026e4b /build_files | |
parent | 9112d19cf72d1f5b19046935ec018744a243efd3 (diff) | |
parent | 8285a12f4ed40901ba191a9b5b237ebdeab295c4 (diff) |
Merge branch 'blender-v2.82-release'
Diffstat (limited to 'build_files')
-rw-r--r-- | build_files/buildbot/buildbot_utils.py | 13 | ||||
-rw-r--r-- | build_files/buildbot/slave_pack.py | 4 |
2 files changed, 13 insertions, 4 deletions
diff --git a/build_files/buildbot/buildbot_utils.py b/build_files/buildbot/buildbot_utils.py index eded6646671..b99fab78827 100644 --- a/build_files/buildbot/buildbot_utils.py +++ b/build_files/buildbot/buildbot_utils.py @@ -24,6 +24,14 @@ import re import subprocess import sys +def is_tool(name): + """Check whether `name` is on PATH and marked as executable.""" + + # from whichcraft import which + from shutil import which + + return which(name) is not None + class Builder: def __init__(self, name, branch): self.name = name @@ -42,7 +50,10 @@ class Builder: self.command_prefix = [] elif name.startswith('linux'): self.platform = 'linux' - self.command_prefix = ['scl', 'enable', 'devtoolset-6', '--'] + if is_tool('scl'): + self.command_prefix = ['scl', 'enable', 'devtoolset-6', '--'] + else: + self.command_prefix = [] elif name.startswith('win'): self.platform = 'win' self.command_prefix = [] diff --git a/build_files/buildbot/slave_pack.py b/build_files/buildbot/slave_pack.py index bbacedca0ce..f47cfe0347e 100644 --- a/build_files/buildbot/slave_pack.py +++ b/build_files/buildbot/slave_pack.py @@ -160,8 +160,6 @@ def pack_linux(builder): blender_executable = os.path.join(builder.install_dir, 'blender') info = buildbot_utils.VersionInfo(builder) - blender_glibc = builder.name.split('_')[1] - blender_arch = 'x86_64' # Strip all unused symbols from the binaries print("Stripping binaries...") @@ -172,7 +170,7 @@ def pack_linux(builder): buildbot_utils.call(builder.command_prefix + ['find', py_target, '-iname', '*.so', '-exec', 'strip', '-s', '{}', ';']) # Construct package name - platform_name = 'linux-' + blender_glibc + '-' + blender_arch + platform_name = 'linux64' package_name = get_package_name(builder, platform_name) package_filename = package_name + ".tar.xz" |