From a4ba448529924a69d2ef01d36c67e8cec7978f7f Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Wed, 9 Jan 2013 13:46:59 +0000 Subject: Remove glibc27 from buildbot scripts --- .../buildbot/config/user-config-glibc27-i686.py | 149 --------------------- .../buildbot/config/user-config-glibc27-x86_64.py | 149 --------------------- .../config/user-config-player-glibc27-i686.py | 114 ---------------- .../config/user-config-player-glibc27-x86_64.py | 114 ---------------- build_files/buildbot/master.cfg | 4 +- build_files/buildbot/slave_compile.py | 6 - build_files/buildbot/slave_pack.py | 6 - 7 files changed, 2 insertions(+), 540 deletions(-) delete mode 100644 build_files/buildbot/config/user-config-glibc27-i686.py delete mode 100644 build_files/buildbot/config/user-config-glibc27-x86_64.py delete mode 100644 build_files/buildbot/config/user-config-player-glibc27-i686.py delete mode 100644 build_files/buildbot/config/user-config-player-glibc27-x86_64.py (limited to 'build_files') diff --git a/build_files/buildbot/config/user-config-glibc27-i686.py b/build_files/buildbot/config/user-config-glibc27-i686.py deleted file mode 100644 index 46f3ccb3df7..00000000000 --- a/build_files/buildbot/config/user-config-glibc27-i686.py +++ /dev/null @@ -1,149 +0,0 @@ -BF_BUILDDIR = '../blender-build/linux-glibc27-i686' -BF_INSTALLDIR = '../blender-install/linux-glibc27-i686' -BF_NUMJOBS = 2 - -# Python configuration -BF_PYTHON_VERSION = '3.3' -BF_PYTHON_ABI_FLAGS = 'm' -BF_PYTHON = '/opt/python3' - -WITH_BF_STATICPYTHON = True - -# OpenCollada configuration -WITH_BF_COLLADA = True -BF_OPENCOLLADA = '/opt/opencollada' -BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}/include' -BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver buffer ftoa libxml2-static libexpat-static libpcre-static' -BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib /home/sources/staticlibs/lib32' -BF_PCRE_LIB = '' -BF_EXPAT_LIB = '' - -# FFMPEG configuration -WITH_BF_FFMPEG = True -WITH_BF_STATICFFMPEG = True - -BF_FFMPEG = '/home/sources/staticlibs/ffmpeg' -BF_FFMPEG_LIBPATH = '${BF_FFMPEG}/lib32' -BF_FFMPEG_LIB_STATIC = '${BF_FFMPEG_LIBPATH}/libavformat.a ${BF_FFMPEG_LIBPATH}/libswscale.a ' + \ - '${BF_FFMPEG_LIBPATH}/libavcodec.a ${BF_FFMPEG_LIBPATH}/libavdevice.a ${BF_FFMPEG_LIBPATH}/libavutil.a ' + \ - '${BF_FFMPEG_LIBPATH}/libxvidcore.a ${BF_FFMPEG_LIBPATH}/libx264.a ${BF_FFMPEG_LIBPATH}/libmp3lame.a ' + \ - '${BF_FFMPEG_LIBPATH}/libvpx.a ${BF_FFMPEG_LIBPATH}/libvorbis.a ${BF_FFMPEG_LIBPATH}/libogg.a ' + \ - '${BF_FFMPEG_LIBPATH}/libvorbisenc.a ${BF_FFMPEG_LIBPATH}/libtheora.a ' + \ - '${BF_FFMPEG_LIBPATH}/libschroedinger-1.0.a ${BF_FFMPEG_LIBPATH}/liborc-0.4.a ${BF_FFMPEG_LIBPATH}/libdirac_encoder.a ' + \ - '${BF_FFMPEG_LIBPATH}/libfaad.a' - -# Don't depend on system's libstdc++ -WITH_BF_STATICCXX = True -BF_CXX_LIB_STATIC = '/usr/lib/gcc/i486-linux-gnu/4.3.4/libstdc++.a' - -WITH_BF_OPENAL = True -WITH_BF_STATICOPENAL = True -BF_OPENAL_LIB_STATIC = '/opt/openal/lib/libopenal.a' - -WITH_BF_GETTEXT_STATIC = True -BF_FREETYPE_LIB_STATIC = True - -WITH_BF_OPENEXR = True -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 -BF_JPEG_LIB = 'libjpeg' -BF_JPEG_LIBPATH = '/home/sources/staticlibs/lib32' - -WITH_BF_PNG = True -BF_PNG_LIB = 'libpng' -BF_PNG_LIBPATH = '/home/sources/staticlibs/lib32' - -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_OGG = True - -WITH_BF_OPENMP = True - -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 = '/home/sources/staticlibs/jemalloc' -BF_JEMALLOC_LIBPATH = '${BF_JEMALLOC}/lib32' - -# Use 3d mouse library -WITH_BF_3DMOUSE = True -WITH_BF_STATIC3DMOUSE = True -BF_3DMOUSE = '/home/sources/staticlibs/spnav' -BF_3DMOUSE_LIBPATH = '${BF_3DMOUSE}/lib32' - -# FFT -WITH_BF_FFTW3 = True -WITH_BF_STATICFFTW3 = True - -# JACK -WITH_BF_JACK = False - -# 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_OIIO = True -WITH_BF_STATICOIIO = True -BF_OIIO = '/opt/oiio' -BF_OIIO_INC = '${BF_OIIO}/include' -BF_OIIO_LIB_STATIC = '${BF_OIIO_LIBPATH}/libOpenImageIO.a ${BF_OPENEXR}/lib/libIlmImf.a' -BF_OIIO_LIBPATH = '${BF_OIIO}/lib' - -WITH_BF_CYCLES_OSL = True -WITH_BF_STATICOSL = False -BF_OSL = '/opt/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_LIBPATH = '${BF_OSL}/lib' -BF_OSL_COMPILER = '${BF_OSL}/bin/oslc' - -WITH_BF_LLVM = True -WITH_BF_STATICLLVM = False -BF_LLVM = '/opt/llvm-3.1' -BF_LLVM_LIB = 'LLVMBitReader LLVMJIT LLVMipo LLVMVectorize LLVMBitWriter LLVMX86CodeGen LLVMX86Desc 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/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/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' - -# Ocean Simulation -WITH_BF_OCEANSIM = True - -# Compilation and optimization -BF_DEBUG = False -REL_CCFLAGS = ['-DNDEBUG', '-DNDEBUG', '-O2'] # C & C++ -PLATFORM_LINKFLAGS = ['-L/home/sources/staticlibs/lib32'] -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-glibc27-x86_64.py b/build_files/buildbot/config/user-config-glibc27-x86_64.py deleted file mode 100644 index 23ddcf7a5b9..00000000000 --- a/build_files/buildbot/config/user-config-glibc27-x86_64.py +++ /dev/null @@ -1,149 +0,0 @@ -BF_BUILDDIR = '../blender-build/linux-glibc27-x86_64' -BF_INSTALLDIR = '../blender-install/linux-glibc27-x86_64' -BF_NUMJOBS = 2 - -# Python configuration -BF_PYTHON_VERSION = '3.3' -BF_PYTHON_ABI_FLAGS = 'm' -BF_PYTHON = '/opt/python3' - -WITH_BF_STATICPYTHON = True - -# OpenCollada configuration -WITH_BF_COLLADA = True -BF_OPENCOLLADA = '/opt/opencollada' -BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}/include' -BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver buffer ftoa libxml2-static libexpat-static libpcre-static' -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 = '/home/sources/staticlibs/ffmpeg' -BF_FFMPEG_LIBPATH = '${BF_FFMPEG}/lib64' -BF_FFMPEG_LIB_STATIC = '${BF_FFMPEG_LIBPATH}/libavformat.a ${BF_FFMPEG_LIBPATH}/libswscale.a ' + \ - '${BF_FFMPEG_LIBPATH}/libavcodec.a ${BF_FFMPEG_LIBPATH}/libavdevice.a ${BF_FFMPEG_LIBPATH}/libavutil.a ' + \ - '${BF_FFMPEG_LIBPATH}/libxvidcore.a ${BF_FFMPEG_LIBPATH}/libx264.a ${BF_FFMPEG_LIBPATH}/libmp3lame.a ' + \ - '${BF_FFMPEG_LIBPATH}/libvpx.a ${BF_FFMPEG_LIBPATH}/libvorbis.a ${BF_FFMPEG_LIBPATH}/libogg.a ' + \ - '${BF_FFMPEG_LIBPATH}/libvorbisenc.a ${BF_FFMPEG_LIBPATH}/libtheora.a ' + \ - '${BF_FFMPEG_LIBPATH}/libschroedinger-1.0.a ${BF_FFMPEG_LIBPATH}/liborc-0.4.a ${BF_FFMPEG_LIBPATH}/libdirac_encoder.a ' + \ - '${BF_FFMPEG_LIBPATH}/libfaad.a' - -# Don't depend on system's libstdc++ -WITH_BF_STATICCXX = True -BF_CXX_LIB_STATIC = '/usr/lib/gcc/x86_64-linux-gnu/4.3.4/libstdc++.a' - -WITH_BF_OPENAL = True -WITH_BF_STATICOPENAL = True -BF_OPENAL_LIB_STATIC = '/opt/openal/lib/libopenal.a' - -WITH_BF_GETTEXT_STATIC = True -BF_FREETYPE_LIB_STATIC = True - -WITH_BF_OPENEXR = True -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 -BF_JPEG_LIB = 'libjpeg' -BF_JPEG_LIBPATH = '/home/sources/staticlibs/lib64' - -WITH_BF_PNG = True -BF_PNG_LIB = 'libpng' -BF_PNG_LIBPATH = '/home/sources/staticlibs/lib64' - -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_OGG = True - -WITH_BF_OPENMP = True - -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 = '/home/sources/staticlibs/jemalloc' -BF_JEMALLOC_LIBPATH = '${BF_JEMALLOC}/lib64' - -# Use 3d mouse library -WITH_BF_3DMOUSE = True -WITH_BF_STATIC3DMOUSE = True -BF_3DMOUSE = '/home/sources/staticlibs/spnav' -BF_3DMOUSE_LIBPATH = '${BF_3DMOUSE}/lib64' - -# FFT -WITH_BF_FFTW3 = True -WITH_BF_STATICFFTW3 = True - -# JACK -WITH_BF_JACK = False - -# 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_OIIO = True -WITH_BF_STATICOIIO = True -BF_OIIO = '/opt/oiio' -BF_OIIO_INC = '${BF_OIIO}/include' -BF_OIIO_LIB_STATIC = '${BF_OIIO_LIBPATH}/libOpenImageIO.a ${BF_OPENEXR}/lib/libIlmImf.a' -BF_OIIO_LIBPATH = '${BF_OIIO}/lib' - -WITH_BF_CYCLES_OSL = True -WITH_BF_STATICOSL = False -BF_OSL = '/opt/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_LIBPATH = '${BF_OSL}/lib' -BF_OSL_COMPILER = '${BF_OSL}/bin/oslc' - -WITH_BF_LLVM = True -WITH_BF_STATICLLVM = False -BF_LLVM = '/opt/llvm-3.1' -BF_LLVM_LIB = 'LLVMBitReader LLVMJIT LLVMipo LLVMVectorize LLVMBitWriter LLVMX86CodeGen LLVMX86Desc 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/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/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' - -# Ocean Simulation -WITH_BF_OCEANSIM = True - -# Compilation and optimization -BF_DEBUG = False -REL_CCFLAGS = ['-DNDEBUG', '-O2', '-msse', '-msse2'] # C & C++ -PLATFORM_LINKFLAGS = ['-L/home/sources/staticlibs/lib64'] -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-glibc27-i686.py b/build_files/buildbot/config/user-config-player-glibc27-i686.py deleted file mode 100644 index 300af2295f0..00000000000 --- a/build_files/buildbot/config/user-config-player-glibc27-i686.py +++ /dev/null @@ -1,114 +0,0 @@ -BF_BUILDDIR = '../blender-build/linux-glibc27-i686' -BF_INSTALLDIR = '../blender-install/linux-glibc27-i686' -BF_NUMJOBS = 2 - -# Python configuration -BF_PYTHON_VERSION = '3.3' -BF_PYTHON_ABI_FLAGS = 'm' -BF_PYTHON = '/opt/python3' - -WITH_BF_STATICPYTHON = True - -# OpenCollada configuration -WITH_BF_COLLADA = False - -# FFMPEG configuration -WITH_BF_FFMPEG = True -WITH_BF_STATICFFMPEG = True - -BF_FFMPEG = '/home/sources/staticlibs/ffmpeg' -BF_FFMPEG_LIBPATH = '${BF_FFMPEG}/lib32' -BF_FFMPEG_LIB_STATIC = '${BF_FFMPEG_LIBPATH}/libavformat.a ${BF_FFMPEG_LIBPATH}/libswscale.a ' + \ - '${BF_FFMPEG_LIBPATH}/libavcodec.a ${BF_FFMPEG_LIBPATH}/libavdevice.a ${BF_FFMPEG_LIBPATH}/libavutil.a ' + \ - '${BF_FFMPEG_LIBPATH}/libxvidcore.a ${BF_FFMPEG_LIBPATH}/libx264.a ${BF_FFMPEG_LIBPATH}/libmp3lame.a ' + \ - '${BF_FFMPEG_LIBPATH}/libvpx.a ${BF_FFMPEG_LIBPATH}/libvorbis.a ${BF_FFMPEG_LIBPATH}/libogg.a ' + \ - '${BF_FFMPEG_LIBPATH}/libvorbisenc.a ${BF_FFMPEG_LIBPATH}/libtheora.a ' + \ - '${BF_FFMPEG_LIBPATH}/libschroedinger-1.0.a ${BF_FFMPEG_LIBPATH}/liborc-0.4.a ${BF_FFMPEG_LIBPATH}/libdirac_encoder.a ' + \ - '${BF_FFMPEG_LIBPATH}/libfaad.a' - -# Don't depend on system's libstdc++ -WITH_BF_STATICCXX = True -BF_CXX_LIB_STATIC = '/usr/lib/gcc/i486-linux-gnu/4.3.4/libstdc++.a' - -WITH_BF_OPENAL = True -WITH_BF_STATICOPENAL = True -BF_OPENAL_LIB_STATIC = '/opt/openal/lib/libopenal.a' - -WITH_BF_GETTEXT_STATIC = True -BF_FREETYPE_LIB_STATIC = True - -WITH_BF_OPENEXR = False -WITH_BF_STATICOPENEXR = True - -WITH_BF_TIFF = False -WITH_BF_STATICTIFF = True -BF_TIFF_LIB_STATIC = '${BF_TIFF}/lib/libtiff.a' - -WITH_BF_JPEG = True -BF_JPEG_LIB = 'libjpeg' -BF_JPEG_LIBPATH = '/home/sources/staticlibs/lib32' - -WITH_BF_PNG = True -BF_PNG_LIB = 'libpng' -BF_PNG_LIBPATH = '/home/sources/staticlibs/lib32' - -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_OGG = False - -WITH_BF_OPENMP = True - -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 = '/home/sources/staticlibs/jemalloc' -BF_JEMALLOC_LIBPATH = '${BF_JEMALLOC}/lib32' - -# Use 3d mouse library -WITH_BF_3DMOUSE = True -WITH_BF_STATIC3DMOUSE = True -BF_3DMOUSE = '/home/sources/staticlibs/spnav' -BF_3DMOUSE_LIBPATH = '${BF_3DMOUSE}/lib32' - -# Color management -WITH_BF_OCIO = True -WITH_BF_STATICOCIO = True -BF_OCIO = '/opt/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/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 = False - -# 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'] # C & C++ -PLATFORM_LINKFLAGS = ['-L/home/sources/staticlibs/lib32'] diff --git a/build_files/buildbot/config/user-config-player-glibc27-x86_64.py b/build_files/buildbot/config/user-config-player-glibc27-x86_64.py deleted file mode 100644 index 722c3a00a66..00000000000 --- a/build_files/buildbot/config/user-config-player-glibc27-x86_64.py +++ /dev/null @@ -1,114 +0,0 @@ -BF_BUILDDIR = '../blender-build/linux-glibc27-x86_64' -BF_INSTALLDIR = '../blender-install/linux-glibc27-x86_64' -BF_NUMJOBS = 2 - -# Python configuration -BF_PYTHON_VERSION = '3.3' -BF_PYTHON_ABI_FLAGS = 'm' -BF_PYTHON = '/opt/python3' - -WITH_BF_STATICPYTHON = True - -# OpenCollada configuration -WITH_BF_COLLADA = False - -# FFMPEG configuration -WITH_BF_FFMPEG = True -WITH_BF_STATICFFMPEG = True - -BF_FFMPEG = '/home/sources/staticlibs/ffmpeg' -BF_FFMPEG_LIBPATH = '${BF_FFMPEG}/lib64' -BF_FFMPEG_LIB_STATIC = '${BF_FFMPEG_LIBPATH}/libavformat.a ${BF_FFMPEG_LIBPATH}/libswscale.a ' + \ - '${BF_FFMPEG_LIBPATH}/libavcodec.a ${BF_FFMPEG_LIBPATH}/libavdevice.a ${BF_FFMPEG_LIBPATH}/libavutil.a ' + \ - '${BF_FFMPEG_LIBPATH}/libxvidcore.a ${BF_FFMPEG_LIBPATH}/libx264.a ${BF_FFMPEG_LIBPATH}/libmp3lame.a ' + \ - '${BF_FFMPEG_LIBPATH}/libvpx.a ${BF_FFMPEG_LIBPATH}/libvorbis.a ${BF_FFMPEG_LIBPATH}/libogg.a ' + \ - '${BF_FFMPEG_LIBPATH}/libvorbisenc.a ${BF_FFMPEG_LIBPATH}/libtheora.a ' + \ - '${BF_FFMPEG_LIBPATH}/libschroedinger-1.0.a ${BF_FFMPEG_LIBPATH}/liborc-0.4.a ${BF_FFMPEG_LIBPATH}/libdirac_encoder.a ' + \ - '${BF_FFMPEG_LIBPATH}/libfaad.a' - -# Don't depend on system's libstdc++ -WITH_BF_STATICCXX = True -BF_CXX_LIB_STATIC = '/usr/lib/gcc/x86_64-linux-gnu/4.3.4/libstdc++.a' - -WITH_BF_OPENAL = True -WITH_BF_STATICOPENAL = True -BF_OPENAL_LIB_STATIC = '/opt/openal/lib/libopenal.a' - -WITH_BF_GETTEXT_STATIC = True -BF_FREETYPE_LIB_STATIC = True - -WITH_BF_OPENEXR = False -WITH_BF_STATICOPENEXR = True - -WITH_BF_TIFF = False -WITH_BF_STATICTIFF = True -BF_TIFF_LIB_STATIC = '${BF_TIFF}/lib/libtiff.a' - -WITH_BF_JPEG = True -BF_JPEG_LIB = 'libjpeg' -BF_JPEG_LIBPATH = '/home/sources/staticlibs/lib64' - -WITH_BF_STATICLIBSAMPLERATE = True - -WITH_BF_PNG = True -BF_PNG_LIB = 'libpng' -BF_PNG_LIBPATH = '/home/sources/staticlibs/lib64' - -WITH_BF_ZLIB = True -WITH_BF_STATICZLIB = True -BF_ZLIB_LIB_STATIC = '${BF_ZLIB}/lib/libz.a' - -WITH_BF_SDL = True -WITH_BF_OGG = False - -WITH_BF_OPENMP = True - -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 = '/home/sources/staticlibs/jemalloc' -BF_JEMALLOC_LIBPATH = '${BF_JEMALLOC}/lib64' - -# Use 3d mouse library -WITH_BF_3DMOUSE = True -WITH_BF_STATIC3DMOUSE = True -BF_3DMOUSE = '/home/sources/staticlibs/spnav' -BF_3DMOUSE_LIBPATH = '${BF_3DMOUSE}/lib64' - -# Color management -WITH_BF_OCIO = True -WITH_BF_STATICOCIO = True -BF_OCIO = '/opt/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/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 = False - -# 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 = ['-L/home/sources/staticlibs/lib64'] diff --git a/build_files/buildbot/master.cfg b/build_files/buildbot/master.cfg index 90f0c805f58..9d0839bd0d7 100644 --- a/build_files/buildbot/master.cfg +++ b/build_files/buildbot/master.cfg @@ -116,10 +116,10 @@ add_builder(c, 'mac_x86_64_10_5_scons', '', generic_builder, '', True) add_builder(c, 'mac_i386_scons', 'darwin-9.x.universal', generic_builder) add_builder(c, 'mac_ppc_scons', 'darwin-9.x.universal', generic_builder) #add_builder(c, 'linux_x86_64_cmake', '', generic_builder) -add_builder(c, 'linux_glibc27_i386_scons', '', generic_builder) +#add_builder(c, 'linux_glibc27_i386_scons', '', generic_builder) add_builder(c, 'linux_glibc211_i386_scons', '', generic_builder) #add_builder(c, 'salad_linux_i386_scons', '', generic_builder, 'soc-2011-salad') -add_builder(c, 'linux_glibc27_x86_64_scons', '', generic_builder) +#add_builder(c, 'linux_glibc27_x86_64_scons', '', generic_builder) add_builder(c, 'linux_glibc211_x86_64_scons', '', generic_builder) #add_builder(c, 'salad_linux_x86_64_scons', '', generic_builder, 'soc-2011-salad') add_builder(c, 'win32_scons', 'windows', generic_builder) diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py index bedada93a5a..fa933a84841 100644 --- a/build_files/buildbot/slave_compile.py +++ b/build_files/buildbot/slave_compile.py @@ -75,12 +75,6 @@ else: config_dir = os.path.join(buildbot_dir, 'config') configs = [] - if builder.endswith('linux_glibc27_x86_64_scons'): - configs = ['user-config-player-glibc27-x86_64.py', - 'user-config-glibc27-x86_64.py'] - elif builder.endswith('linux_glibc27_i386_scons'): - configs = ['user-config-player-glibc27-i686.py', - 'user-config-glibc27-i686.py'] if builder.endswith('linux_glibc211_x86_64_scons'): configs = ['user-config-player-glibc211-x86_64.py', 'user-config-glibc211-x86_64.py'] diff --git a/build_files/buildbot/slave_pack.py b/build_files/buildbot/slave_pack.py index b7775ef872f..285307a7af9 100644 --- a/build_files/buildbot/slave_pack.py +++ b/build_files/buildbot/slave_pack.py @@ -57,12 +57,6 @@ if builder.find('scons') != -1: config = None bits = None - if builder.endswith('linux_glibc27_x86_64_scons'): - config = 'user-config-glibc27-x86_64.py' - bits = 64 - elif builder.endswith('linux_glibc27_i386_scons'): - config = 'user-config-glibc27-i686.py' - bits = 32 if builder.endswith('linux_glibc211_x86_64_scons'): config = 'user-config-glibc211-x86_64.py' bits = 64 -- cgit v1.2.3