Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2019-10-09 14:07:40 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2019-10-09 14:07:40 +0300
commit26b1216629c8a7f6201333514b8fdbf43e10b385 (patch)
tree147e0fbd1c811a97c151f078b221e7e223dcf19f /build_files
parente0231b14d5a25277acb0fa9e23fa8d58fbd9fc05 (diff)
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.
Diffstat (limited to 'build_files')
-rw-r--r--build_files/buildbot/slave_pack.py14
1 files changed, 0 insertions, 14 deletions
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)