From 26b1216629c8a7f6201333514b8fdbf43e10b385 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Wed, 9 Oct 2019 13:07:40 +0200 Subject: CMake: Move software-gl to generic install procedure Removes custom logic from buildbot's packing step. This also removes icons/ folder, but CMake was already copying the icons to the root of the install folder. --- build_files/buildbot/slave_pack.py | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'build_files') diff --git a/build_files/buildbot/slave_pack.py b/build_files/buildbot/slave_pack.py index a7729843a0e..9e7a157eb99 100644 --- a/build_files/buildbot/slave_pack.py +++ b/build_files/buildbot/slave_pack.py @@ -147,20 +147,6 @@ def pack_linux(builder): py_target = os.path.join(builder.install_dir, info.version) buildbot_utils.call(builder.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 - print("Copying extra scripts and libs...") - - extra = '/' + os.path.join('home', 'sources', 'release-builder', 'extra') - mesalibs = os.path.join(extra, 'mesalibs' + str(builder.bits) + '.tar.bz2') - software_gl = os.path.join(builder.blender_dir, 'release', 'bin', 'blender-softwaregl') - icons = os.path.join(builder.blender_dir, 'release', 'freedesktop', 'icons') - - os.system('tar -xpf %s -C %s' % (mesalibs, builder.install_dir)) - os.system('cp %s %s' % (software_gl, builder.install_dir)) - os.system('cp -r %s %s' % (icons, builder.install_dir)) - os.system('chmod 755 %s' % (os.path.join(builder.install_dir, 'blender-softwaregl'))) - # Construct package name platform_name = 'linux-' + blender_glibc + '-' + blender_arch package_name = get_package_name(builder, platform_name) -- cgit v1.2.3