Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2015-12-03 13:19:02 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2015-12-03 13:19:02 +0300
commit2880480693ed44c95acdc421770fe2c85fbdbdba (patch)
treecb20638a32b43e6f90f6096492434f8c86b6f978 /build_files
parent95e2ee6f501eb9a0454057413046995e4a9d06e1 (diff)
Buildbot: Switch Linux builders to the cmake ones
There'll still need to be some tweaks to be done, but it's required first step.
Diffstat (limited to 'build_files')
-rw-r--r--build_files/buildbot/master.cfg6
1 files changed, 4 insertions, 2 deletions
diff --git a/build_files/buildbot/master.cfg b/build_files/buildbot/master.cfg
index 02927f7fa4c..b506f12b21b 100644
--- a/build_files/buildbot/master.cfg
+++ b/build_files/buildbot/master.cfg
@@ -298,8 +298,10 @@ def generic_builder(id, libdir='', branch='', rsync=False):
add_builder(c, 'mac_x86_64_10_6_scons', 'darwin-9.x.universal', generic_builder, hour=5)
add_builder(c, 'mac_i386_10_6_scons', 'darwin-9.x.universal', generic_builder, hour=11)
-add_builder(c, 'linux_glibc211_i386_scons', '', generic_builder, hour=1)
-add_builder(c, 'linux_glibc211_x86_64_scons', '', generic_builder, hour=2)
+#add_builder(c, 'linux_glibc211_i386_scons', '', generic_builder, hour=1)
+#add_builder(c, 'linux_glibc211_x86_64_scons', '', generic_builder, hour=2)
+add_builder(c, 'linux_glibc211_i386_cmake', '', generic_builder, hour=1)
+add_builder(c, 'linux_glibc211_x86_64_cmake', '', generic_builder, hour=2)
#add_builder(c, 'win32_scons_vc2013', 'windows_vc12', generic_builder, hour=1)
#add_builder(c, 'win64_scons_vc2013', 'win64_vc12', generic_builder, hour=2)
add_builder(c, 'win32_cmake_vc2013', 'windows_vc12', generic_builder, hour=3)