[Bf-blender-cvs] [682b949] master: Sync changes with buildbot server

[Sergey Sharybin]

Commit: 682b949d0fb0bc4f1bc70a400702893481a79537
Author: Sergey Sharybin
Date:   Sun Jun 1 18:31:25 2014 +0600
https://developer.blender.org/rB682b949d0fb0bc4f1bc70a400702893481a79537

Sync changes with buildbot server

===================================================================

M	build_files/buildbot/master.cfg

===================================================================

diff --git a/build_files/buildbot/master.cfg b/build_files/buildbot/master.cfg
index 08c96f6..6b3efb4 100644
--- a/build_files/buildbot/master.cfg
+++ b/build_files/buildbot/master.cfg
@@ -147,9 +147,9 @@ def generic_builder(id, libdir='', branch='', rsync=False):
     if rsync:
         f.addStep(rsync_step(id, branch, rsync_script))
     elif id.find('cmake') != -1:
-        f.addStep(FileUpload(name='upload', slavesrc='buildbot_upload.zip', masterdest=filename, maxsize=100 * 1024 * 1024))
+        f.addStep(FileUpload(name='upload', slavesrc='buildbot_upload.zip', masterdest=filename, maxsize=150 * 1024 * 1024))
     else:
-        f.addStep(FileUpload(name='upload', slavesrc='buildbot_upload.zip', masterdest=filename, maxsize=100 * 1024 * 1024, workdir='install'))
+        f.addStep(FileUpload(name='upload', slavesrc='buildbot_upload.zip', masterdest=filename, maxsize=150 * 1024 * 1024, workdir='install'))
     f.addStep(MasterShellCommand(name='unpack', command=['python', unpack_script, filename], description='unpacking', descriptionDone='unpacked'))
     return f
 
@@ -161,6 +161,10 @@ 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, 'win32_scons', 'windows', generic_builder, hour=1)
 add_builder(c, 'win64_scons', 'win64', generic_builder, hour=2)
+#add_builder(c, 'win32_scons_vc2012', 'windows_vc11', generic_builder, hour=1)
+#add_builder(c, 'win64_scons_vc2012', 'win64_vc11', 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, '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)