diff options
Diffstat (limited to 'build_files/buildbot/slave_pack.py')
| -rw-r--r-- | build_files/buildbot/slave_pack.py | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/build_files/buildbot/slave_pack.py b/build_files/buildbot/slave_pack.py index 27bebeb109e..b29b078ca85 100644 --- a/build_files/buildbot/slave_pack.py +++ b/build_files/buildbot/slave_pack.py @@ -126,7 +126,6 @@ if builder.find('cmake') != -1: elif builder.startswith('linux_'): blender = os.path.join(install_dir, 'blender') - blenderplayer = os.path.join(install_dir, 'blenderplayer') buildinfo_h = os.path.join(build_dir, "source", "creator", "buildinfo.h") blender_h = os.path.join(blender_dir, "source", "blender", "blenkernel", "BKE_blender_version.h") @@ -136,24 +135,28 @@ if builder.find('cmake') != -1: blender_version = "%d.%d" % (blender_version // 100, blender_version % 100) blender_hash = parse_header_file(buildinfo_h, 'BUILD_HASH')[1:-1] blender_glibc = builder.split('_')[1] - - if builder.endswith('x86_64_cmake'): - chroot_name = 'buildbot_jessie_x86_64' - bits = 64 - blender_arch = 'x86_64' - elif builder.endswith('i686_cmake'): - chroot_name = 'buildbot_jessie_i686' - bits = 32 - blender_arch = 'i686' + command_prefix = [] + bits = 64 + blender_arch = 'x86_64' + + if blender_glibc == 'glibc224': + if builder.endswith('x86_64_cmake'): + chroot_name = 'buildbot_stretch_x86_64' + elif builder.endswith('i686_cmake'): + chroot_name = 'buildbot_stretch_i686' + bits = 32 + blender_arch = 'i686' + command_prefix = ['schroot', '-c', chroot_name, '--'] + elif blender_glibc == 'glibc217': + command_prefix = ['scl', 'enable', 'devtoolset-6', '--'] # Strip all unused symbols from the binaries print("Stripping binaries...") - chroot_prefix = ['schroot', '-c', chroot_name, '--'] - subprocess.call(chroot_prefix + ['strip', '--strip-all', blender, blenderplayer]) + subprocess.call(command_prefix + ['strip', '--strip-all', blender]) print("Stripping python...") py_target = os.path.join(install_dir, blender_version) - subprocess.call(chroot_prefix + ['find', py_target, '-iname', '*.so', '-exec', 'strip', '-s', '{}', ';']) + subprocess.call(command_prefix + ['find', py_target, '-iname', '*.so', '-exec', 'strip', '-s', '{}', ';']) # Copy all specific files which are too specific to be copied by # the CMake rules themselves |