diff options
-rw-r--r-- | build_files/buildbot/slave_pack.py | 14 | ||||
-rw-r--r-- | source/creator/CMakeLists.txt | 10 |
2 files changed, 10 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) diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 52d930143da..4da1d61a4f1 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -513,6 +513,16 @@ if(UNIX AND NOT APPLE) DESTINATION "." ) + if(EXISTS ${LIBDIR}/mesa) + install(DIRECTORY ${LIBDIR}/mesa/lib DESTINATION ".") + + install( + PROGRAMS + ${CMAKE_SOURCE_DIR}/release/bin/blender-softwaregl + DESTINATION "." + ) + endif() + set(BLENDER_TEXT_FILES_DESTINATION ".") else() # main blender binary |