[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54485] trunk/blender/build_files/buildbot : Buildbot: revert r54465 and r54466 -- issue was not caused by
Sergey Sharybin
sergey.vfx at gmail.com
Tue Feb 12 09:30:13 CET 2013
Revision: 54485
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54485
Author: nazgul
Date: 2013-02-12 08:30:12 +0000 (Tue, 12 Feb 2013)
Log Message:
-----------
Buildbot: revert r54465 and r54466 -- issue was not caused by
crosscompilation, but was caused by some bugs in toolkit itself.
Shall be all fine now (at least it is on my laptop now).
Let give it another try!
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54465
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54466
Modified Paths:
--------------
trunk/blender/build_files/buildbot/config/user-config-glibc211-i686.py
trunk/blender/build_files/buildbot/config/user-config-glibc211-x86_64.py
trunk/blender/build_files/buildbot/slave_compile.py
Modified: trunk/blender/build_files/buildbot/config/user-config-glibc211-i686.py
===================================================================
--- trunk/blender/build_files/buildbot/config/user-config-glibc211-i686.py 2013-02-12 07:32:17 UTC (rev 54484)
+++ trunk/blender/build_files/buildbot/config/user-config-glibc211-i686.py 2013-02-12 08:30:12 UTC (rev 54485)
@@ -1,6 +1,7 @@
BF_BUILDDIR = '../blender-build/linux-glibc211-i686'
BF_INSTALLDIR = '../blender-install/linux-glibc211-i686'
BF_NUMJOBS = 4
+WITHOUT_BF_OVERWRITE_INSTALL = True
# Python configuration
BF_PYTHON_VERSION = '3.3'
@@ -109,9 +110,7 @@
# Cycles
WITH_BF_CYCLES = True
-WITH_BF_CYCLES_CUDA_BINARIES = True
-#BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21', 'sm_30']
-BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30']
+WITH_BF_CYCLES_CUDA_BINARIES = False
WITH_BF_OIIO = True
WITH_BF_STATICOIIO = True
Modified: trunk/blender/build_files/buildbot/config/user-config-glibc211-x86_64.py
===================================================================
--- trunk/blender/build_files/buildbot/config/user-config-glibc211-x86_64.py 2013-02-12 07:32:17 UTC (rev 54484)
+++ trunk/blender/build_files/buildbot/config/user-config-glibc211-x86_64.py 2013-02-12 08:30:12 UTC (rev 54485)
@@ -1,6 +1,7 @@
BF_BUILDDIR = '../blender-build/linux-glibc211-x86_64'
BF_INSTALLDIR = '../blender-install/linux-glibc211-x86_64'
BF_NUMJOBS = 4
+WITHOUT_BF_OVERWRITE_INSTALL = True
# Python configuration
BF_PYTHON_VERSION = '3.3'
@@ -109,8 +110,7 @@
# Cycles
WITH_BF_CYCLES = True
-WITH_BF_CYCLES_CUDA_BINARIES = True
-BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21', 'sm_30']
+WITH_BF_CYCLES_CUDA_BINARIES = False
WITH_BF_OIIO = True
WITH_BF_STATICOIIO = True
Modified: trunk/blender/build_files/buildbot/slave_compile.py
===================================================================
--- trunk/blender/build_files/buildbot/slave_compile.py 2013-02-12 07:32:17 UTC (rev 54484)
+++ trunk/blender/build_files/buildbot/slave_compile.py 2013-02-12 08:30:12 UTC (rev 54485)
@@ -63,14 +63,14 @@
configs = []
if builder.endswith('linux_glibc211_x86_64_scons'):
configs = ['user-config-player-glibc211-x86_64.py',
- #'user-config-cuda-glibc211-x86_64.py',
+ 'user-config-cuda-glibc211-x86_64.py',
'user-config-glibc211-x86_64.py'
]
chroot_name = 'buildbot_squeeze_x86_64'
cuda_chroot = 'buildbot_squeeze_x86_64'
elif builder.endswith('linux_glibc211_i386_scons'):
configs = ['user-config-player-glibc211-i686.py',
- #'user-config-cuda-glibc211-i686.py',
+ 'user-config-cuda-glibc211-i686.py',
'user-config-glibc211-i686.py']
chroot_name = 'buildbot_squeeze_i686'
More information about the Bf-blender-cvs
mailing list