[Bf-blender-cvs] [9d0d2fb] master: Buildbot: Re-enable CUDA binaries for 64 bit linux slave

Sergey Sharybin noreply at git.blender.org
Thu Dec 3 18:25:10 CET 2015


Commit: 9d0d2fb209db2aca01335d26f9cf0643e8058b11
Author: Sergey Sharybin
Date:   Thu Dec 3 22:24:27 2015 +0500
Branches: master
https://developer.blender.org/rB9d0d2fb209db2aca01335d26f9cf0643e8058b11

Buildbot: Re-enable CUDA binaries for 64 bit linux slave

Also make it a bit more reasonable name for config files.

===================================================================

A	build_files/buildbot/config/blender_linux_player.cmake
D	build_files/buildbot/config/blender_player_linux.cmake
M	build_files/buildbot/slave_compile.py

===================================================================

diff --git a/build_files/buildbot/config/blender_player_linux.cmake b/build_files/buildbot/config/blender_linux_player.cmake
similarity index 100%
rename from build_files/buildbot/config/blender_player_linux.cmake
rename to build_files/buildbot/config/blender_linux_player.cmake
diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py
index e0802ca..8365ccb 100644
--- a/build_files/buildbot/slave_compile.py
+++ b/build_files/buildbot/slave_compile.py
@@ -76,11 +76,12 @@ if 'cmake' in builder:
         remove_cache = True
         remove_install_dir = True
         cmake_config_file = "build_files/buildbot/config/blender_linux.cmake"
-        cmake_player_config_file = "build_files/buildbot/config/blender_player_linux.cmake"
-        cmake_cuda_config_file = "build_files/buildbot/config/blender_cuda_linux.cmake"
+        cmake_player_config_file = "build_files/buildbot/config/blender_linux_player.cmake"
+        # Currently unused
+        # cmake_cuda_config_file = "build_files/buildbot/config/blender_linux_cuda.cmake"
         if builder.endswith('x86_64_cmake'):
             chroot_name = 'buildbot_squeeze_x86_64'
-            build_cubins = False
+            build_cubins = True
             targets = ['player', 'blender']
         elif builder.endswith('i386_cmake'):
             chroot_name = 'buildbot_squeeze_i686'




More information about the Bf-blender-cvs mailing list