Further tweaks to buildbot

- BF_BITNESS should be passed as a command line argument
- Made it so CUDA binaries and OSL compiled scripts would
  be installed regardless WITH_BF_PYTHON (which seems to
  be quite obvious)
- Disable overwrite install, so CUDA kernels installed by
  it's build target will be preserved when building blender
  itself.

SConstruct

@@ -746,6 +746,7 @@ if env['OURPLATFORM']!='darwin':
             source=['intern/cycles/doc/license/'+s for s in source]
             scriptinstall.append(env.Install(dir=dir,source=source))
 
+    if env['WITH_BF_CYCLES']:
         # cuda binaries
         if env['WITH_BF_CYCLES_CUDA_BINARIES']:
             dir=os.path.join(env['BF_INSTALLDIR'], VERSION, 'scripts', 'addons','cycles', 'lib')

build_files/buildbot/config/user-config-cuda-glibc211-i686.py

 BF_BUILDDIR = '../blender-build/linux-glibc211-i686'
 BF_INSTALLDIR = '../blender-install/linux-glibc211-i686'
 BF_NUMJOBS = 1
-BF_BITNESS = 32
 
 BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21', 'sm_30']

build_files/buildbot/config/user-config-cuda-glibc211-x86_64.py

 BF_BUILDDIR = '../blender-build/linux-glibc211-x86_64'
 BF_INSTALLDIR = '../blender-install/linux-glibc211-x86_64'
 BF_NUMJOBS = 1
-BF_BITNESS = 64
 
 BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21', 'sm_30']

build_files/buildbot/config/user-config-glibc211-i686.py

 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'

build_files/buildbot/config/user-config-glibc211-x86_64.py

 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'

build_files/buildbot/slave_compile.py

@@ -64,7 +64,8 @@ else:
         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-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'):
@@ -77,8 +78,8 @@ else:
             cuda_chroot = 'buildbot_squeeze_x86_64'
 
         # Compilation will happen inside of chroot environment
-        prog_scons_cmd = ['schroot', '-c', chroot_name] + scons_cmd
-        cuda_scons_cmd = ['schroot', '-c', cuda_chroot] + scons_cmd
+        prog_scons_cmd = ['schroot', '-c', chroot_name, '--'] + scons_cmd
+        cuda_scons_cmd = ['schroot', '-c', cuda_chroot, '--'] + scons_cmd
 
         # We're using the same rules as release builder, so tweak
         # build and install dirs
@@ -112,6 +113,11 @@ else:
             elif config.find('cuda') != -1:
                 scons_options.append('cudakernels')
                 cur_scons_cmd = cuda_scons_cmd
+
+                if config.find('i686') != -1:
+                    scons_options.append('BF_BITNESS=32')
+                elif config.find('x86_64') != -1:
+                    scons_options.append('BF_BITNESS=64')
             else:
                 scons_options.append('blender')
                 cur_scons_cmd = prog_scons_cmd