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:
Diffstat (limited to 'build_files/buildbot/master.cfg')
-rw-r--r--build_files/buildbot/master.cfg16
1 files changed, 1 insertions, 15 deletions
diff --git a/build_files/buildbot/master.cfg b/build_files/buildbot/master.cfg
index 250f39e63ec..1f82f24a8e2 100644
--- a/build_files/buildbot/master.cfg
+++ b/build_files/buildbot/master.cfg
@@ -294,28 +294,14 @@ def generic_builder(id, libdir='', branch='', rsync=False):
descriptionDone='unpacked'))
return f
-# builders
+# Builders
-#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, 'mac_x86_64_10_6_cmake', 'darwin-9.x.universal', generic_builder, hour=5)
add_builder(c, 'mac_i386_10_6_cmake', '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_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)
add_builder(c, 'win64_cmake_vc2013', 'win64_vc12', generic_builder, hour=4)
-#add_builder(c, 'mingw_win32_scons', 'mingw32', generic_builder, hour=4)
-#add_builder(c, 'mingw_win64_scons', 'mingw64', generic_builder, hour=3)
-#add_builder(c, 'freebsd_i386_cmake', '', generic_builder, hour=1)
-#add_builder(c, 'freebsd_x86_64_cmake', '', generic_builder, hour=2)
-
-# Multiview branch
-add_builder(c, 'multiview_win64_scons', 'win64', generic_builder, 'multiview', hour=4)
-add_builder(c, 'multiview_win32_scons', 'windows', generic_builder, 'multiview', hour=5)
# STATUS TARGETS
#