Buildbot: Remove linux scons buildbot related things

It is now totally covered by cmake slave.

8 files changed, 65 insertions, 820 deletions

diff --git a/build_files/buildbot/config/user-config-cuda-glibc211-i686.py b/build_files/buildbot/config/user-config-cuda-glibc211-i686.py
deleted file mode 100644
index 580e67ee7e3..00000000000
--- a/build_files/buildbot/config/user-config-cuda-glibc211-i686.py
+++ /dev/null
@@ -1,6 +0,0 @@
-BF_BUILDDIR = '../blender-build/linux-glibc211-i686'
-BF_INSTALLDIR = '../blender-install/linux-glibc211-i686'
-BF_NUMJOBS = 1
-
-#BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30', 'sm_35', 'sm_50', 'sm_52']
-BF_CYCLES_CUDA_BINARIES_ARCH = []
diff --git a/build_files/buildbot/config/user-config-cuda-glibc211-x86_64.py b/build_files/buildbot/config/user-config-cuda-glibc211-x86_64.py
deleted file mode 100644
index 29b1b9f1ad7..00000000000
--- a/build_files/buildbot/config/user-config-cuda-glibc211-x86_64.py
+++ /dev/null
@@ -1,5 +0,0 @@
-BF_BUILDDIR = '../blender-build/linux-glibc211-x86_64'
-BF_INSTALLDIR = '../blender-install/linux-glibc211-x86_64'
-BF_NUMJOBS = 1
-
-BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30', 'sm_35', 'sm_50', 'sm_52']
diff --git a/build_files/buildbot/config/user-config-glibc211-i686.py b/build_files/buildbot/config/user-config-glibc211-i686.py
deleted file mode 100644
index 29928506f71..00000000000
--- a/build_files/buildbot/config/user-config-glibc211-i686.py
+++ /dev/null
@@ -1,194 +0,0 @@
-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.5'
-BF_PYTHON_ABI_FLAGS = 'm'
-BF_PYTHON = '/opt/lib/python-3.5'
-WITH_BF_PYTHON_INSTALL_NUMPY = True
-WITH_BF_PYTHON_INSTALL_REQUESTS = True
-
-WITH_BF_STATICPYTHON = True
-
-# OpenCollada configuration
-WITH_BF_COLLADA = True
-WITH_BF_STATICOPENCOLLADA=True
-BF_OPENCOLLADA = '/opt/lib/opencollada'
-BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}/include'
-BF_OPENCOLLADA_LIB_STATIC = '${BF_OPENCOLLADA}/lib/libOpenCOLLADAStreamWriter.a ' + \
-    '${BF_OPENCOLLADA}/lib/libOpenCOLLADASaxFrameworkLoader.a ' + \
-    '${BF_OPENCOLLADA}/lib/libOpenCOLLADAFramework.a ' + \
-    '${BF_OPENCOLLADA}/lib/libOpenCOLLADABaseUtils.a ' + \
-    '${BF_OPENCOLLADA}/lib/libGeneratedSaxParser.a '  + \
-    '${BF_OPENCOLLADA}/lib/libMathMLSolver.a ' + \
-    '${BF_OPENCOLLADA}/lib/libbuffer.a ${BF_OPENCOLLADA}/lib/libftoa.a ' + \
-    '/usr/lib/libxml2.a /usr/lib/libexpat.a /usr/lib/libpcre.a'
-BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib /home/sources/staticlibs/lib64'
-BF_PCRE_LIB = ''
-BF_EXPAT_LIB = ''
-
-# FFMPEG configuration
-WITH_BF_FFMPEG = True
-WITH_BF_STATICFFMPEG = True
-
-BF_FFMPEG = '/opt/lib/ffmpeg'
-BF_FFMPEG_LIBPATH = '${BF_FFMPEG}/lib'
-BF_FFMPEG_LIB_STATIC = '${BF_FFMPEG_LIBPATH}/libavformat.a ${BF_FFMPEG_LIBPATH}/libavdevice.a ' + \
-    '${BF_FFMPEG_LIBPATH}/libavfilter.a ${BF_FFMPEG_LIBPATH}/libavcodec.a ${BF_FFMPEG_LIBPATH}/libavutil.a ' + \
-    '${BF_FFMPEG_LIBPATH}/libswscale.a ${BF_FFMPEG_LIBPATH}/libswresample.a ' + \
-    '/usr/lib/libxvidcore.a /usr/lib/libx264.a /usr/lib/libmp3lame.a /usr/lib/libvpx.a /usr/lib/libvorbis.a ' + \
-    '/usr/lib/libogg.a /usr/lib/libvorbisenc.a /usr/lib/libtheora.a /usr/lib/libschroedinger-1.0.a ' + \
-    '/usr/lib/liborc-0.4.a'
-
-# Don't depend on system's libstdc++
-WITH_BF_STATICCXX = True
-BF_CXX_LIB_STATIC = '/usr/lib/gcc/i486-linux-gnu/4.7.1/libstdc++.a'
-
-WITH_BF_OPENAL = True
-WITH_BF_STATICOPENAL = True
-BF_OPENAL = '/opt/lib/openal'
-BF_OPENAL_LIB_STATIC = '/opt/lib/openal/lib/libopenal.a /opt/lib/openal/lib/libcommon.a'
-
-WITH_BF_GETTEXT_STATIC = True
-
-WITH_BF_FREETYPE_STATIC = False
-
-WITH_BF_OPENEXR = True
-BF_OPENEXR = '/opt/lib/openexr'
-BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR ${BF_OPENEXR}/include'
-WITH_BF_STATICOPENEXR = True
-
-WITH_BF_TIFF = True
-WITH_BF_STATICTIFF = True
-BF_TIFF_LIB_STATIC = '${BF_TIFF}/lib/libtiff.a'
-
-WITH_BF_JPEG = True
-WITH_BF_STATICJPEG = True
-BF_JPEG_LIB_STATIC= '${BF_JPEG}/lib/libjpeg.a'
-
-WITH_BF_PNG = True
-WITH_BF_STATICPNG = True
-BF_PNG_LIB_STATIC = '${BF_PNG}/lib/libpng.a'
-
-WITH_BF_STATICLIBSAMPLERATE = True
-
-WITH_BF_ZLIB = True
-WITH_BF_STATICZLIB = True
-BF_ZLIB_LIB_STATIC = '${BF_ZLIB}/lib/libz.a'
-
-WITH_BF_SDL = True
-WITH_BF_SDL_DYNLOAD = True
-
-WITH_BF_OGG = True
-
-WITH_BF_OPENMP = True
-WITH_BF_STATICOPENMP = True
-BF_OPENMP_LIB_STATIC = '/usr/lib/gcc/i486-linux-gnu/4.7/libgomp.a'
-
-WITH_BF_GAMEENGINE = True
-WITH_BF_BULLET = True
-
-# Blender player (would be enabled in it's own config)
-WITH_BF_PLAYER = False
-
-# Use jemalloc memory manager
-WITH_BF_JEMALLOC = True
-WITH_BF_STATICJEMALLOC = True
-BF_JEMALLOC = '/opt/lib/jemalloc'
-BF_JEMALLOC_LIBPATH = '${BF_JEMALLOC}/lib'
-
-# Use 3d mouse library
-WITH_BF_3DMOUSE = True
-WITH_BF_STATIC3DMOUSE = True
-BF_3DMOUSE = '/opt/lib/libspnav'
-BF_3DMOUSE_LIBPATH = '${BF_3DMOUSE}/lib'
-
-# FFT
-WITH_BF_FFTW3 = True
-WITH_BF_STATICFFTW3 = True
-
-# JACK
-WITH_BF_JACK = True
-WITH_BF_JACK_DYNLOAD = True
-
-# SndFile
-WITH_BF_SNDFILE = True
-WITH_BF_STATICSNDFILE = True
-BF_SNDFILE = '/usr'
-BF_SNDFILE_INC = '${BF_SNDFILE}/include/sndfile'
-BF_SNDFILE_LIB = 'sndfile'
-BF_SNDFILE_LIBPATH = '${BF_SNDFILE}/lib'
-BF_SNDFILE_LIB_STATIC = '${BF_SNDFILE}/lib/libsndfile.a ${BF_OGG}/lib/libvorbis.a ${BF_OGG}/lib/libFLAC.a ${BF_OGG}/lib/libvorbisenc.a ${BF_OGG}/lib/libogg.a'
-
-# Cycles
-WITH_BF_CYCLES = True
-WITH_BF_CYCLES_CUDA_BINARIES = False
-
-WITH_BF_OIIO = True
-WITH_BF_STATICOIIO = True
-BF_OIIO = '/opt/lib/oiio'
-BF_OIIO_INC = '${BF_OIIO}/include'
-BF_OIIO_LIB_STATIC = '${BF_OIIO_LIBPATH}/libOpenImageIO.a ${BF_OPENEXR}/lib/libIlmImf.a ${BF_JPEG}/lib/libjpeg.a'
-BF_OIIO_LIBPATH = '${BF_OIIO}/lib'
-
-BF_IS_NEW_OSL = False
-WITH_BF_CYCLES_OSL = True
-WITH_BF_STATICOSL = BF_IS_NEW_OSL
-BF_OSL = '/opt/lib/osl'
-BF_OSL_INC = '${BF_OSL}/include'
-# note oslexec would passed via program linkflags, which is needed to
-# make llvm happy with osl_allocate_closure_component
-BF_OSL_LIB = 'oslcomp oslexec oslquery'
-BF_OSL_LIB_STATIC = '${BF_OSL}/lib/liboslcomp.a ${BF_OSL}/lib/liboslexec.a ${BF_OSL}/lib/liboslquery.a'
-BF_OSL_LIBPATH = '${BF_OSL}/lib'
-BF_OSL_COMPILER = '${BF_OSL}/bin/oslc'
-
-WITH_BF_LLVM = True
-WITH_BF_STATICLLVM = False
-BF_LLVM = '/opt/lib/llvm-3.4.2'
-BF_LLVM_LIB = 'LLVMBitReader LLVMJIT LLVMipo LLVMVectorize LLVMBitWriter LLVMX86CodeGen LLVMX86Desc LLVMObject LLVMX86Info LLVMX86AsmPrinter ' + \
-    'LLVMX86Utils LLVMSelectionDAG LLVMCodeGen LLVMScalarOpts LLVMInstCombine LLVMTransformUtils LLVMipa LLVMAnalysis LLVMExecutionEngine ' + \
-    'LLVMTarget LLVMMC LLVMCore LLVMSupport'
-BF_LLVM_LIBPATH = '${BF_LLVM}/lib'
-
-# Color management
-WITH_BF_OCIO = True
-WITH_BF_STATICOCIO = True
-BF_OCIO = '/opt/lib/ocio'
-BF_OCIO_INC = '${BF_OCIO}/include'
-BF_OCIO_LIB_STATIC = '${BF_OCIO_LIBPATH}/libOpenColorIO.a ${BF_OCIO_LIBPATH}/libtinyxml.a ${BF_OCIO_LIBPATH}/libyaml-cpp.a'
-BF_OCIO_LIBPATH = '${BF_OCIO}/lib'
-
-WITH_BF_BOOST = True
-WITH_BF_STATICBOOST = True
-BF_BOOST = '/opt/lib/boost'
-BF_BOOST_INC = '${BF_BOOST}/include'
-BF_BOOST_LIB_STATIC = '${BF_BOOST_LIBPATH}/libboost_filesystem.a ${BF_BOOST_LIBPATH}/libboost_date_time.a ' + \
-    '${BF_BOOST_LIBPATH}/libboost_regex.a ${BF_BOOST_LIBPATH}/libboost_locale.a ${BF_BOOST_LIBPATH}/libboost_system.a \
-    ${BF_BOOST_LIBPATH}/libboost_thread.a'
-if BF_IS_NEW_OSL:
-    BF_BOOST_LIB_STATIC += ' ${BF_BOOST_LIBPATH}/libboost_wave.a'
-BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
-
-# Ocean Simulation
-WITH_BF_OCEANSIM = True
-
-# OpenSubdiv
-WITH_BF_OPENSUBDIV = True
-WITH_BF_STATICOPENSUBDIV = True
-BF_OPENSUBDIV = '/opt/lib/opensubdiv'
-BF_OPENSUBDIV_INC = '${BF_OPENSUBDIV}/include'
-BF_OPENSUBDIV_LIB = 'osdCPU osdGPU'
-BF_OPENSUBDIV_LIBPATH = '${BF_OPENSUBDIV}/lib'
-BF_OPENSUBDIV_LIB_STATIC = '${BF_OPENSUBDIV}/lib/libosdCPU.a ${BF_OPENSUBDIV}/lib/libosdGPU.a'
-
-# Compilation and optimization
-BF_DEBUG = False
-REL_CCFLAGS = ['-DNDEBUG', '-O2', '-msse', '-msse2']  # C & C++
-PLATFORM_LINKFLAGS = ['-lrt']
-if BF_IS_NEW_OSL:
-    BF_PROGRAM_LINKFLAGS = ['-Wl,--version-script=source/creator/blender.map']
-else:
-  BF_PROGRAM_LINKFLAGS = ['-Wl,--whole-archive', '-loslexec', '-Wl,--no-whole-archive', '-Wl,--version-script=source/creator/blender.map']
diff --git a/build_files/buildbot/config/user-config-glibc211-x86_64.py b/build_files/buildbot/config/user-config-glibc211-x86_64.py
deleted file mode 100644
index f55b8e2845f..00000000000
--- a/build_files/buildbot/config/user-config-glibc211-x86_64.py
+++ /dev/null
@@ -1,194 +0,0 @@
-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.5'
-BF_PYTHON_ABI_FLAGS = 'm'
-BF_PYTHON = '/opt/lib/python-3.5'
-WITH_BF_PYTHON_INSTALL_NUMPY = True
-WITH_BF_PYTHON_INSTALL_REQUESTS = True
-
-WITH_BF_STATICPYTHON = True
-
-# OpenCollada configuration
-WITH_BF_COLLADA = True
-WITH_BF_STATICOPENCOLLADA=True
-BF_OPENCOLLADA = '/opt/lib/opencollada'
-BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}/include'
-BF_OPENCOLLADA_LIB_STATIC = '${BF_OPENCOLLADA}/lib/libOpenCOLLADAStreamWriter.a ' + \
-    '${BF_OPENCOLLADA}/lib/libOpenCOLLADASaxFrameworkLoader.a ' + \
-    '${BF_OPENCOLLADA}/lib/libOpenCOLLADAFramework.a ' + \
-    '${BF_OPENCOLLADA}/lib/libOpenCOLLADABaseUtils.a ' + \
-    '${BF_OPENCOLLADA}/lib/libGeneratedSaxParser.a '  + \
-    '${BF_OPENCOLLADA}/lib/libMathMLSolver.a ' + \
-    '${BF_OPENCOLLADA}/lib/libbuffer.a ${BF_OPENCOLLADA}/lib/libftoa.a ' + \
-    '/usr/lib/libxml2.a /usr/lib/libexpat.a /usr/lib/libpcre.a'
-BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib /home/sources/staticlibs/lib64'
-BF_PCRE_LIB = ''
-BF_EXPAT_LIB = ''
-
-# FFMPEG configuration
-WITH_BF_FFMPEG = True
-WITH_BF_STATICFFMPEG = True
-
-BF_FFMPEG = '/opt/lib/ffmpeg'
-BF_FFMPEG_LIBPATH = '${BF_FFMPEG}/lib'
-BF_FFMPEG_LIB_STATIC = '${BF_FFMPEG_LIBPATH}/libavformat.a ${BF_FFMPEG_LIBPATH}/libavdevice.a ' + \
-    '${BF_FFMPEG_LIBPATH}/libavfilter.a ${BF_FFMPEG_LIBPATH}/libavcodec.a ${BF_FFMPEG_LIBPATH}/libavutil.a ' + \
-    '${BF_FFMPEG_LIBPATH}/libswscale.a ${BF_FFMPEG_LIBPATH}/libswresample.a ' + \
-    '/usr/lib/libxvidcore.a /usr/lib/libx264.a /usr/lib/libmp3lame.a /usr/lib/libvpx.a /usr/lib/libvorbis.a ' + \
-    '/usr/lib/libogg.a /usr/lib/libvorbisenc.a /usr/lib/libtheora.a /usr/lib/libschroedinger-1.0.a ' + \
-    '/usr/lib/liborc-0.4.a'
-
-# Don't depend on system's libstdc++
-WITH_BF_STATICCXX = True
-BF_CXX_LIB_STATIC = '/usr/lib/gcc/x86_64-linux-gnu/4.7.1/libstdc++.a'
-
-WITH_BF_OPENAL = True
-WITH_BF_STATICOPENAL = True
-BF_OPENAL = '/opt/lib/openal'
-BF_OPENAL_LIB_STATIC = '/opt/lib/openal/lib/libopenal.a /opt/lib/openal/lib/libcommon.a'
-
-WITH_BF_GETTEXT_STATIC = True
-
-WITH_BF_FREETYPE_STATIC = False
-
-WITH_BF_OPENEXR = True
-BF_OPENEXR = '/opt/lib/openexr'
-BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR ${BF_OPENEXR}/include'
-WITH_BF_STATICOPENEXR = True
-
-WITH_BF_TIFF = True
-WITH_BF_STATICTIFF = True
-BF_TIFF_LIB_STATIC = '${BF_TIFF}/lib/libtiff.a'
-
-WITH_BF_JPEG = True
-WITH_BF_STATICJPEG = True
-BF_JPEG_LIB_STATIC= '${BF_JPEG}/lib/libjpeg.a'
-
-WITH_BF_PNG = True
-WITH_BF_STATICPNG = True
-BF_PNG_LIB_STATIC = '${BF_PNG}/lib/libpng.a'
-
-WITH_BF_STATICLIBSAMPLERATE = True
-
-WITH_BF_ZLIB = True
-WITH_BF_STATICZLIB = True
-BF_ZLIB_LIB_STATIC = '${BF_ZLIB}/lib/libz.a'
-
-WITH_BF_SDL = True
-WITH_BF_SDL_DYNLOAD = True
-
-WITH_BF_OGG = True
-
-WITH_BF_OPENMP = True
-WITH_BF_STATICOPENMP = True
-BF_OPENMP_LIB_STATIC = '/usr/lib/gcc/x86_64-linux-gnu/4.7/libgomp.a'
-
-WITH_BF_GAMEENGINE = True
-WITH_BF_BULLET = True
-
-# Blender player (would be enabled in it's own config)
-WITH_BF_PLAYER = False
-
-# Use jemalloc memory manager
-WITH_BF_JEMALLOC = True
-WITH_BF_STATICJEMALLOC = True
-BF_JEMALLOC = '/opt/lib/jemalloc'
-BF_JEMALLOC_LIBPATH = '${BF_JEMALLOC}/lib'
-
-# Use 3d mouse library
-WITH_BF_3DMOUSE = True
-WITH_BF_STATIC3DMOUSE = True
-BF_3DMOUSE = '/opt/lib/libspnav'
-BF_3DMOUSE_LIBPATH = '${BF_3DMOUSE}/lib'
-
-# FFT
-WITH_BF_FFTW3 = True
-WITH_BF_STATICFFTW3 = True
-
-# JACK
-WITH_BF_JACK = True
-WITH_BF_JACK_DYNLOAD = True
-
-# SndFile
-WITH_BF_SNDFILE = True
-WITH_BF_STATICSNDFILE = True
-BF_SNDFILE = '/usr'
-BF_SNDFILE_INC = '${BF_SNDFILE}/include/sndfile'
-BF_SNDFILE_LIB = 'sndfile'
-BF_SNDFILE_LIBPATH = '${BF_SNDFILE}/lib'
-BF_SNDFILE_LIB_STATIC = '${BF_SNDFILE}/lib/libsndfile.a ${BF_OGG}/lib/libvorbis.a ${BF_OGG}/lib/libFLAC.a ${BF_OGG}/lib/libvorbisenc.a ${BF_OGG}/lib/libogg.a'
-
-# Cycles
-WITH_BF_CYCLES = True
-WITH_BF_CYCLES_CUDA_BINARIES = False
-
-WITH_BF_OIIO = True
-WITH_BF_STATICOIIO = True
-BF_OIIO = '/opt/lib/oiio'
-BF_OIIO_INC = '${BF_OIIO}/include'
-BF_OIIO_LIB_STATIC = '${BF_OIIO_LIBPATH}/libOpenImageIO.a ${BF_OPENEXR}/lib/libIlmImf.a ${BF_JPEG}/lib/libjpeg.a'
-BF_OIIO_LIBPATH = '${BF_OIIO}/lib'
-
-BF_IS_NEW_OSL = False
-WITH_BF_CYCLES_OSL = True
-WITH_BF_STATICOSL = BF_IS_NEW_OSL
-BF_OSL = '/opt/lib/osl'
-BF_OSL_INC = '${BF_OSL}/include'
-# note oslexec would passed via program linkflags, which is needed to
-# make llvm happy with osl_allocate_closure_component
-BF_OSL_LIB = 'oslcomp oslexec oslquery'
-BF_OSL_LIB_STATIC = '${BF_OSL}/lib/liboslcomp.a ${BF_OSL}/lib/liboslexec.a ${BF_OSL}/lib/liboslquery.a'
-BF_OSL_LIBPATH = '${BF_OSL}/lib'
-BF_OSL_COMPILER = '${BF_OSL}/bin/oslc'
-
-WITH_BF_LLVM = True
-WITH_BF_STATICLLVM = False
-BF_LLVM = '/opt/lib/llvm-3.4.2'
-BF_LLVM_LIB = 'LLVMBitReader LLVMJIT LLVMipo LLVMVectorize LLVMBitWriter LLVMX86CodeGen LLVMX86Desc LLVMObject LLVMX86Info LLVMX86AsmPrinter ' + \
-    'LLVMX86Utils LLVMSelectionDAG LLVMCodeGen LLVMScalarOpts LLVMInstCombine LLVMTransformUtils LLVMipa LLVMAnalysis LLVMExecutionEngine ' + \
-    'LLVMTarget LLVMMC LLVMCore LLVMSupport'
-BF_LLVM_LIBPATH = '${BF_LLVM}/lib'
-
-# Color management
-WITH_BF_OCIO = True
-WITH_BF_STATICOCIO = True
-BF_OCIO = '/opt/lib/ocio'
-BF_OCIO_INC = '${BF_OCIO}/include'
-BF_OCIO_LIB_STATIC = '${BF_OCIO_LIBPATH}/libOpenColorIO.a ${BF_OCIO_LIBPATH}/libtinyxml.a ${BF_OCIO_LIBPATH}/libyaml-cpp.a'
-BF_OCIO_LIBPATH = '${BF_OCIO}/lib'
-
-WITH_BF_BOOST = True
-WITH_BF_STATICBOOST = True
-BF_BOOST = '/opt/lib/boost'
-BF_BOOST_INC = '${BF_BOOST}/include'
-BF_BOOST_LIB_STATIC = '${BF_BOOST_LIBPATH}/libboost_filesystem.a ${BF_BOOST_LIBPATH}/libboost_date_time.a ' + \
-    '${BF_BOOST_LIBPATH}/libboost_regex.a ${BF_BOOST_LIBPATH}/libboost_locale.a ${BF_BOOST_LIBPATH}/libboost_system.a \
-    ${BF_BOOST_LIBPATH}/libboost_thread.a'
-if BF_IS_NEW_OSL:
-    BF_BOOST_LIB_STATIC += ' ${BF_BOOST_LIBPATH}/libboost_wave.a'
-BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
-
-# Ocean Simulation
-WITH_BF_OCEANSIM = True
-
-# OpenSubdiv
-WITH_BF_OPENSUBDIV = True
-WITH_BF_STATICOPENSUBDIV = True
-BF_OPENSUBDIV = '/opt/lib/opensubdiv'
-BF_OPENSUBDIV_INC = '${BF_OPENSUBDIV}/include'
-BF_OPENSUBDIV_LIB = 'osdCPU osdGPU'
-BF_OPENSUBDIV_LIBPATH = '${BF_OPENSUBDIV}/lib'
-BF_OPENSUBDIV_LIB_STATIC = '${BF_OPENSUBDIV}/lib/libosdCPU.a ${BF_OPENSUBDIV}/lib/libosdGPU.a'
-
-# Compilation and optimization
-BF_DEBUG = False
-REL_CCFLAGS = ['-DNDEBUG', '-O2', '-msse', '-msse2']  # C & C++
-PLATFORM_LINKFLAGS = ['-lrt']
-if BF_IS_NEW_OSL:
-    BF_PROGRAM_LINKFLAGS = ['-Wl,--version-script=source/creator/blender.map']
-else:
-    BF_PROGRAM_LINKFLAGS = ['-Wl,--whole-archive', '-loslexec', '-Wl,--no-whole-archive', '-Wl,--version-script=source/creator/blender.map']
diff --git a/build_files/buildbot/config/user-config-player-glibc211-i686.py b/build_files/buildbot/config/user-config-player-glibc211-i686.py
deleted file mode 100644
index 47898002ae6..00000000000
--- a/build_files/buildbot/config/user-config-player-glibc211-i686.py
+++ /dev/null
@@ -1,126 +0,0 @@
-BF_BUILDDIR = '../blender-build/linux-glibc211-i686'
-BF_INSTALLDIR = '../blender-install/linux-glibc211-i686'
-BF_NUMJOBS = 4
-
-# Python configuration
-BF_PYTHON_VERSION = '3.5'
-BF_PYTHON_ABI_FLAGS = 'm'
-BF_PYTHON = '/opt/lib/python-3.5'
-WITH_BF_PYTHON_INSTALL_NUMPY = True
-WITH_BF_PYTHON_INSTALL_REQUESTS = True
-
-WITH_BF_STATICPYTHON = True
-
-# OpenCollada configuration
-WITH_BF_COLLADA = False
-
-# FFMPEG configuration
-WITH_BF_FFMPEG = True
-WITH_BF_STATICFFMPEG = True
-
-BF_FFMPEG = '/opt/lib/ffmpeg'
-BF_FFMPEG_LIBPATH = '${BF_FFMPEG}/lib'
-BF_FFMPEG_LIB_STATIC = '${BF_FFMPEG_LIBPATH}/libavformat.a ${BF_FFMPEG_LIBPATH}/libavdevice.a ' + \
-    '${BF_FFMPEG_LIBPATH}/libavfilter.a ${BF_FFMPEG_LIBPATH}/libavcodec.a ${BF_FFMPEG_LIBPATH}/libavutil.a ' + \
-    '${BF_FFMPEG_LIBPATH}/libswscale.a ${BF_FFMPEG_LIBPATH}/libswresample.a ' + \
-    '/usr/lib/libxvidcore.a /usr/lib/libx264.a /usr/lib/libmp3lame.a /usr/lib/libvpx.a /usr/lib/libvorbis.a ' + \
-    '/usr/lib/libogg.a /usr/lib/libvorbisenc.a /usr/lib/libtheora.a /usr/lib/libschroedinger-1.0.a ' + \
-    '/usr/lib/liborc-0.4.a'
-
-# Don't depend on system's libstdc++
-WITH_BF_STATICCXX = True
-BF_CXX_LIB_STATIC = '/usr/lib/gcc/i486-linux-gnu/4.7.1/libstdc++.a'
-
-WITH_BF_OPENAL = True
-WITH_BF_STATICOPENAL = True
-BF_OPENAL = '/opt/lib/openal'
-BF_OPENAL_LIB_STATIC = '/opt/lib/openal/lib/libopenal.a /opt/lib/openal/lib/libcommon.a'
-
-WITH_BF_GETTEXT_STATIC = True
-
-WITH_BF_FREETYPE_STATIC = False
-
-WITH_BF_OPENEXR = True
-BF_OPENEXR = '/opt/lib/openexr'
-BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR ${BF_OPENEXR}/include'
-WITH_BF_STATICOPENEXR = True
-
-WITH_BF_TIFF = True
-WITH_BF_STATICTIFF = True
-BF_TIFF_LIB_STATIC = '${BF_TIFF}/lib/libtiff.a'
-
-WITH_BF_JPEG = True
-WITH_BF_STATICJPEG = True
-BF_JPEG_LIB_STATIC= '${BF_JPEG}/lib/libjpeg.a'
-
-WITH_BF_STATICLIBSAMPLERATE = True
-
-WITH_BF_PNG = True
-WITH_BF_STATICPNG = True
-BF_PNG_LIB_STATIC = '${BF_PNG}/lib/libpng.a'
-
-WITH_BF_ZLIB = True
-WITH_BF_STATICZLIB = True
-BF_ZLIB_LIB_STATIC = '${BF_ZLIB}/lib/libz.a'
-
-WITH_BF_SDL = True
-WITH_BF_SDL_DYNLOAD = True
-
-WITH_BF_OGG = False
-
-WITH_BF_OPENMP = True
-WITH_BF_STATICOPENMP = True
-BF_OPENMP_LIB_STATIC = '/usr/lib/gcc/i486-linux-gnu/4.7/libgomp.a'
-
-WITH_BF_GAMEENGINE = True
-WITH_BF_BULLET = True
-
-# Do not build blender when building blenderplayer
-WITH_BF_NOBLENDER = True
-WITH_BF_PLAYER = True
-
-# Use jemalloc memory manager
-WITH_BF_JEMALLOC = True
-WITH_BF_STATICJEMALLOC = True
-BF_JEMALLOC = '/opt/lib/jemalloc'
-BF_JEMALLOC_LIBPATH = '${BF_JEMALLOC}/lib'
-
-# Use 3d mouse library
-WITH_BF_3DMOUSE = True
-WITH_BF_STATIC3DMOUSE = True
-BF_3DMOUSE = '/opt/lib/libspnav'
-BF_3DMOUSE_LIBPATH = '${BF_3DMOUSE}/lib'
-
-# Color management
-WITH_BF_OCIO = True
-WITH_BF_STATICOCIO = True
-BF_OCIO = '/opt/lib/ocio'
-BF_OCIO_INC = '${BF_OCIO}/include'
-BF_OCIO_LIB_STATIC = '${BF_OCIO_LIBPATH}/libOpenColorIO.a ${BF_OCIO_LIBPATH}/libtinyxml.a ${BF_OCIO_LIBPATH}/libyaml-cpp.a'
-BF_OCIO_LIBPATH = '${BF_OCIO}/lib'
-
-WITH_BF_BOOST = True
-WITH_BF_STATICBOOST = True
-BF_BOOST = '/opt/lib/boost'
-BF_BOOST_INC = '${BF_BOOST}/include'
-BF_BOOST_LIB_STATIC = '${BF_BOOST_LIBPATH}/libboost_filesystem.a ${BF_BOOST_LIBPATH}/libboost_date_time.a ' + \
-    '${BF_BOOST_LIBPATH}/libboost_regex.a ${BF_BOOST_LIBPATH}/libboost_locale.a ${BF_BOOST_LIBPATH}/libboost_system.a \
-    ${BF_BOOST_LIBPATH}/libboost_thread.a'
-BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
-
-# JACK
-WITH_BF_JACK = True
-WITH_BF_JACK_DYNLOAD = True
-
-# Motion Tracking
-WITH_BF_LIBMV = False
-
-# Ocean Simulation
-WITH_BF_FFTW3 = True
-WITH_BF_STATICFFTW3 = True
-WITH_BF_OCEANSIM = True
-
-# Compilation and optimization
-BF_DEBUG = False
-REL_CCFLAGS = ['-DNDEBUG', '-O2', '-msse', '-msse2']  # C & C++
-PLATFORM_LINKFLAGS = ['-lrt']
diff --git a/build_files/buildbot/config/user-config-player-glibc211-x86_64.py b/build_files/buildbot/config/user-config-player-glibc211-x86_64.py
deleted file mode 100644
index 42068834879..00000000000
--- a/build_files/buildbot/config/user-config-player-glibc211-x86_64.py
+++ /dev/null
@@ -1,126 +0,0 @@
-BF_BUILDDIR = '../blender-build/linux-glibc211-x86_64'
-BF_INSTALLDIR = '../blender-install/linux-glibc211-x86_64'
-BF_NUMJOBS = 4
-
-# Python configuration
-BF_PYTHON_VERSION = '3.5'
-BF_PYTHON_ABI_FLAGS = 'm'
-BF_PYTHON = '/opt/lib/python-3.5'
-WITH_BF_PYTHON_INSTALL_NUMPY = True
-WITH_BF_PYTHON_INSTALL_REQUESTS = True
-
-WITH_BF_STATICPYTHON = True
-
-# OpenCollada configuration
-WITH_BF_COLLADA = False
-
-# FFMPEG configuration
-WITH_BF_FFMPEG = True
-WITH_BF_STATICFFMPEG = True
-
-BF_FFMPEG = '/opt/lib/ffmpeg'
-BF_FFMPEG_LIBPATH = '${BF_FFMPEG}/lib'
-BF_FFMPEG_LIB_STATIC = '${BF_FFMPEG_LIBPATH}/libavformat.a ${BF_FFMPEG_LIBPATH}/libavdevice.a ' + \
-    '${BF_FFMPEG_LIBPATH}/libavfilter.a ${BF_FFMPEG_LIBPATH}/libavcodec.a ${BF_FFMPEG_LIBPATH}/libavutil.a ' + \
-    '${BF_FFMPEG_LIBPATH}/libswscale.a ${BF_FFMPEG_LIBPATH}/libswresample.a ' + \
-    '/usr/lib/libxvidcore.a /usr/lib/libx264.a /usr/lib/libmp3lame.a /usr/lib/libvpx.a /usr/lib/libvorbis.a ' + \
-    '/usr/lib/libogg.a /usr/lib/libvorbisenc.a /usr/lib/libtheora.a /usr/lib/libschroedinger-1.0.a ' + \
-    '/usr/lib/liborc-0.4.a'
-
-# Don't depend on system's libstdc++
-WITH_BF_STATICCXX = True
-BF_CXX_LIB_STATIC = '/usr/lib/gcc/x86_64-linux-gnu/4.7.1/libstdc++.a'
-
-WITH_BF_OPENAL = True
-WITH_BF_STATICOPENAL = True
-BF_OPENAL = '/opt/lib/openal'
-BF_OPENAL_LIB_STATIC = '/opt/lib/openal/lib/libopenal.a /opt/lib/openal/lib/libcommon.a'
-
-WITH_BF_GETTEXT_STATIC = True
-
-WITH_BF_FREETYPE_STATIC = False
-
-WITH_BF_OPENEXR = True
-BF_OPENEXR = '/opt/lib/openexr'
-BF_OPENEXR_INC = '${BF_OPENEXR}/include/OpenEXR ${BF_OPENEXR}/include'
-WITH_BF_STATICOPENEXR = True
-
-WITH_BF_TIFF = True
-WITH_BF_STATICTIFF = True
-BF_TIFF_LIB_STATIC = '${BF_TIFF}/lib/libtiff.a'
-
-WITH_BF_JPEG = True
-WITH_BF_STATICJPEG = True
-BF_JPEG_LIB_STATIC= '${BF_JPEG}/lib/libjpeg.a'
-
-WITH_BF_STATICLIBSAMPLERATE = True
-
-WITH_BF_PNG = True
-WITH_BF_STATICPNG = True
-BF_PNG_LIB_STATIC = '${BF_PNG}/lib/libpng.a'
-
-WITH_BF_ZLIB = True
-WITH_BF_STATICZLIB = True
-BF_ZLIB_LIB_STATIC = '${BF_ZLIB}/lib/libz.a'
-
-WITH_BF_SDL = True
-WITH_BF_SDL_DYNLOAD = True
-
-WITH_BF_OGG = False
-
-WITH_BF_OPENMP = True
-WITH_BF_STATICOPENMP = True
-BF_OPENMP_LIB_STATIC = '/usr/lib/gcc/x86_64-linux-gnu/4.7/libgomp.a'
-
-WITH_BF_GAMEENGINE = True
-WITH_BF_BULLET = True
-
-# Do not build blender when building blenderplayer
-WITH_BF_NOBLENDER = True
-WITH_BF_PLAYER = True
-
-# Use jemalloc memory manager
-WITH_BF_JEMALLOC = True
-WITH_BF_STATICJEMALLOC = True
-BF_JEMALLOC = '/opt/lib/jemalloc'
-BF_JEMALLOC_LIBPATH = '${BF_JEMALLOC}/lib'
-
-# Use 3d mouse library
-WITH_BF_3DMOUSE = True
-WITH_BF_STATIC3DMOUSE = True
-BF_3DMOUSE = '/opt/lib/libspnav'
-BF_3DMOUSE_LIBPATH = '${BF_3DMOUSE}/lib'
-
-# Color management
-WITH_BF_OCIO = True
-WITH_BF_STATICOCIO = True
-BF_OCIO = '/opt/lib/ocio'
-BF_OCIO_INC = '${BF_OCIO}/include'
-BF_OCIO_LIB_STATIC = '${BF_OCIO_LIBPATH}/libOpenColorIO.a ${BF_OCIO_LIBPATH}/libtinyxml.a ${BF_OCIO_LIBPATH}/libyaml-cpp.a'
-BF_OCIO_LIBPATH = '${BF_OCIO}/lib'
-
-WITH_BF_BOOST = True
-WITH_BF_STATICBOOST = True
-BF_BOOST = '/opt/lib/boost'
-BF_BOOST_INC = '${BF_BOOST}/include'
-BF_BOOST_LIB_STATIC = '${BF_BOOST_LIBPATH}/libboost_filesystem.a ${BF_BOOST_LIBPATH}/libboost_date_time.a ' + \
-    '${BF_BOOST_LIBPATH}/libboost_regex.a ${BF_BOOST_LIBPATH}/libboost_locale.a ${BF_BOOST_LIBPATH}/libboost_system.a \
-    ${BF_BOOST_LIBPATH}/libboost_thread.a'
-BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
-
-# JACK
-WITH_BF_JACK = True
-WITH_BF_JACK_DYNLOAD = True
-
-# Motion Tracking
-WITH_BF_LIBMV = False
-
-# Ocean Simulation
-WITH_BF_FFTW3 = True
-WITH_BF_STATICFFTW3 = True
-WITH_BF_OCEANSIM = True
-
-# Compilation and optimization
-BF_DEBUG = False
-REL_CCFLAGS = ['-DNDEBUG', '-O2', '-msse', '-msse2']  # C & C++
-PLATFORM_LINKFLAGS = ['-lrt']
diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py
index 8365ccb4d93..ab58af577a9 100644
--- a/build_files/buildbot/slave_compile.py
+++ b/build_files/buildbot/slave_compile.py
@@ -150,8 +150,6 @@ if 'cmake' in builder:
             sys.exit(retcode)
 else:
     python_bin = 'python'
-    if builder.find('linux') != -1:
-        python_bin = '/opt/lib/python-2.7/bin/python2.7'
 
     # scons
     os.chdir(blender_dir)
@@ -171,108 +169,46 @@ else:
     buildbot_dir = os.path.dirname(os.path.realpath(__file__))
     config_dir = os.path.join(buildbot_dir, 'config')
 
-    if builder.find('linux') != -1:
-        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-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-glibc211-i686.py']
-            chroot_name = 'buildbot_squeeze_i686'
-
-            # use 64bit cuda toolkit, so there'll be no memory limit issues
-            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
-
-        common_options = ['BF_INSTALLDIR=' + install_dir] + scons_options
-
-        for config in configs:
-            config_fpath = os.path.join(config_dir, config)
-
-            scons_options = []
-
-            if config.find('player') != -1:
-                scons_options.append('BF_BUILDDIR=%s_player' % (build_dir))
-            elif config.find('cuda') != -1:
-                scons_options.append('BF_BUILDDIR=%s_cuda' % (build_dir))
-            else:
-                scons_options.append('BF_BUILDDIR=%s' % (build_dir))
-
-            scons_options += common_options
-
-            if config.find('player') != -1:
-                scons_options.append('blenderplayer')
-                cur_scons_cmd = prog_scons_cmd
-            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
+    if builder.find('win') != -1:
+        bitness = '32'
+
+        if builder.find('win64') != -1:
+            bitness = '64'
+
+        scons_options.append('BF_INSTALLDIR=' + install_dir)
+        scons_options.append('BF_BUILDDIR=' + build_dir)
+        scons_options.append('BF_BITNESS=' + bitness)
+        scons_options.append('WITH_BF_CYCLES_CUDA_BINARIES=True')
+        scons_options.append('BF_CYCLES_CUDA_NVCC=nvcc.exe')
+        if builder.find('mingw') != -1:
+            scons_options.append('BF_TOOLSET=mingw')
+        if builder.endswith('vc2013'):
+            scons_options.append('MSVS_VERSION=12.0')
+            scons_options.append('MSVC_VERSION=12.0')
+            scons_options.append('WITH_BF_CYCLES_CUDA_BINARIES=1')
+            scons_options.append('BF_CYCLES_CUDA_NVCC=nvcc.exe')
+        scons_options.append('BF_NUMJOBS=1')
 
-            scons_options.append('BF_CONFIG=' + config_fpath)
+    elif builder.find('mac') != -1:
+        if builder.find('x86_64') != -1:
+            config = 'user-config-mac-x86_64.py'
+        else:
+            config = 'user-config-mac-i386.py'
 
-            retcode = subprocess.call(cur_scons_cmd + scons_options)
-            if retcode != 0:
-                print('Error building rules with config ' + config)
-                sys.exit(retcode)
+        scons_options.append('BF_CONFIG=' + os.path.join(config_dir, config))
 
-        sys.exit(0)
-    else:
-        if builder.find('win') != -1:
-            bitness = '32'
+    if builder.find('win') != -1:
+        if not os.path.exists(install_dir):
+            os.makedirs(install_dir)
+        if builder.endswith('vc2013'):
+            dlls = ('msvcp120.dll', 'msvcr120.dll', 'vcomp120.dll')
+        if builder.find('win64') == -1:
+            dlls_path = '..\\..\\..\\redist\\x86'
+        else:
+            dlls_path = '..\\..\\..\\redist\\amd64'
+        for dll in dlls:
+            shutil.copyfile(os.path.join(dlls_path, dll), os.path.join(install_dir, dll))
 
-            if builder.find('win64') != -1:
-                bitness = '64'
+    retcode = subprocess.call([python_bin, 'scons/scons.py'] + scons_options)
 
-            scons_options.append('BF_INSTALLDIR=' + install_dir)
-            scons_options.append('BF_BUILDDIR=' + build_dir)
-            scons_options.append('BF_BITNESS=' + bitness)
-            scons_options.append('WITH_BF_CYCLES_CUDA_BINARIES=True')
-            scons_options.append('BF_CYCLES_CUDA_NVCC=nvcc.exe')
-            if builder.find('mingw') != -1:
-                scons_options.append('BF_TOOLSET=mingw')
-            if builder.endswith('vc2013'):
-                scons_options.append('MSVS_VERSION=12.0')
-                scons_options.append('MSVC_VERSION=12.0')
-                scons_options.append('WITH_BF_CYCLES_CUDA_BINARIES=1')
-                scons_options.append('BF_CYCLES_CUDA_NVCC=nvcc.exe')
-            scons_options.append('BF_NUMJOBS=1')
-
-        elif builder.find('mac') != -1:
-            if builder.find('x86_64') != -1:
-                config = 'user-config-mac-x86_64.py'
-            else:
-                config = 'user-config-mac-i386.py'
-
-            scons_options.append('BF_CONFIG=' + os.path.join(config_dir, config))
-
-        if builder.find('win') != -1:
-            if not os.path.exists(install_dir):
-                os.makedirs(install_dir)
-            if builder.endswith('vc2013'):
-                dlls = ('msvcp120.dll', 'msvcr120.dll', 'vcomp120.dll')
-            if builder.find('win64') == -1:
-                dlls_path = '..\\..\\..\\redist\\x86'
-            else:
-                dlls_path = '..\\..\\..\\redist\\amd64'
-            for dll in dlls:
-                shutil.copyfile(os.path.join(dlls_path, dll), os.path.join(install_dir, dll))
-
-        retcode = subprocess.call([python_bin, 'scons/scons.py'] + scons_options)
-
-        sys.exit(retcode)
+    sys.exit(retcode)
diff --git a/build_files/buildbot/slave_pack.py b/build_files/buildbot/slave_pack.py
index 8adfe7ee681..8e7a0fb31d2 100644
--- a/build_files/buildbot/slave_pack.py
+++ b/build_files/buildbot/slave_pack.py
@@ -84,8 +84,6 @@ def create_tar_bz2(src, dest, package_name):
 # scons does own packaging
 if builder.find('scons') != -1:
     python_bin = 'python'
-    if builder.find('linux') != -1:
-        python_bin = '/opt/lib/python-2.7/bin/python2.7'
 
     os.chdir('../blender.git')
     scons_options = ['BF_QUICK=slnt', 'BUILDBOT_BRANCH=' + branch, 'buildslave', 'BF_FANCY=False']
@@ -93,71 +91,33 @@ if builder.find('scons') != -1:
     buildbot_dir = os.path.dirname(os.path.realpath(__file__))
     config_dir = os.path.join(buildbot_dir, 'config')
 
-    if builder.find('linux') != -1:
-        scons_options += ['WITH_BF_NOBLENDER=True', 'WITH_BF_PLAYER=False',
-                          'BF_BUILDDIR=' + build_dir,
-                          'BF_INSTALLDIR=' + install_dir,
-                          'WITHOUT_BF_INSTALL=True']
-
-        config = None
-        bits = None
-
-        if builder.endswith('linux_glibc211_x86_64_scons'):
-            config = 'user-config-glibc211-x86_64.py'
-            chroot_name = 'buildbot_squeeze_x86_64'
-            bits = 64
-        elif builder.endswith('linux_glibc211_i386_scons'):
-            config = 'user-config-glibc211-i686.py'
-            chroot_name = 'buildbot_squeeze_i686'
-            bits = 32
-
-        if config is not None:
-            config_fpath = os.path.join(config_dir, config)
-            scons_options.append('BF_CONFIG=' + config_fpath)
-
-        blender = os.path.join(install_dir, 'blender')
-        blenderplayer = os.path.join(install_dir, 'blenderplayer')
-        subprocess.call(['schroot', '-c', chroot_name, '--', 'strip', '--strip-all', blender, blenderplayer])
-
-        extra = "/home/sources/release-builder/extra/"
-        mesalibs = os.path.join(extra, 'mesalibs%d.tar.bz2' % bits)
-        software_gl = os.path.join(extra, 'blender-softwaregl')
-
-        os.system('tar -xpf %s -C %s' % (mesalibs, install_dir))
-        os.system('cp %s %s' % (software_gl, install_dir))
-        os.system('chmod 755 %s' % (os.path.join(install_dir, 'blender-softwaregl')))
-
-        retcode = subprocess.call(['schroot', '-c', chroot_name, '--', python_bin, 'scons/scons.py'] + scons_options)
-
-        sys.exit(retcode)
-    else:
-        if builder.find('win') != -1:
-            bitness = '32'
-
-            if builder.find('win64') != -1:
-                bitness = '64'
-
-            scons_options.append('BF_INSTALLDIR=' + install_dir)
-            scons_options.append('BF_BUILDDIR=' + build_dir)
-            scons_options.append('BF_BITNESS=' + bitness)
-            scons_options.append('WITH_BF_CYCLES_CUDA_BINARIES=True')
-            scons_options.append('BF_CYCLES_CUDA_NVCC=nvcc.exe')
-            if builder.find('mingw') != -1:
-                scons_options.append('BF_TOOLSET=mingw')
-            if builder.endswith('vc2013'):
-                scons_options.append('MSVS_VERSION=12.0')
-                scons_options.append('MSVC_VERSION=12.0')
-
-        elif builder.find('mac') != -1:
-            if builder.find('x86_64') != -1:
-                config = 'user-config-mac-x86_64.py'
-            else:
-                config = 'user-config-mac-i386.py'
-
-            scons_options.append('BF_CONFIG=' + os.path.join(config_dir, config))
-
-        retcode = subprocess.call([python_bin, 'scons/scons.py'] + scons_options)
-        sys.exit(retcode)
+    if builder.find('win') != -1:
+        bitness = '32'
+
+        if builder.find('win64') != -1:
+            bitness = '64'
+
+        scons_options.append('BF_INSTALLDIR=' + install_dir)
+        scons_options.append('BF_BUILDDIR=' + build_dir)
+        scons_options.append('BF_BITNESS=' + bitness)
+        scons_options.append('WITH_BF_CYCLES_CUDA_BINARIES=True')
+        scons_options.append('BF_CYCLES_CUDA_NVCC=nvcc.exe')
+        if builder.find('mingw') != -1:
+            scons_options.append('BF_TOOLSET=mingw')
+        if builder.endswith('vc2013'):
+            scons_options.append('MSVS_VERSION=12.0')
+            scons_options.append('MSVC_VERSION=12.0')
+
+    elif builder.find('mac') != -1:
+        if builder.find('x86_64') != -1:
+            config = 'user-config-mac-x86_64.py'
+        else:
+            config = 'user-config-mac-i386.py'
+
+        scons_options.append('BF_CONFIG=' + os.path.join(config_dir, config))
+
+    retcode = subprocess.call([python_bin, 'scons/scons.py'] + scons_options)
+    sys.exit(retcode)
 else:
     # CMake
     if 'win' in builder: