[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46006] trunk/blender/build_files/buildbot : Changes to get mingw buildslaves going.
Nathan Letwory
nathan at letworyinteractive.com
Fri Apr 27 15:18:56 CEST 2012
Revision: 46006
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46006
Author: jesterking
Date: 2012-04-27 13:18:55 +0000 (Fri, 27 Apr 2012)
Log Message:
-----------
Changes to get mingw buildslaves going.
Modified Paths:
--------------
trunk/blender/build_files/buildbot/master.cfg
trunk/blender/build_files/buildbot/slave_compile.py
Modified: trunk/blender/build_files/buildbot/master.cfg
===================================================================
--- trunk/blender/build_files/buildbot/master.cfg 2012-04-27 12:44:32 UTC (rev 46005)
+++ trunk/blender/build_files/buildbot/master.cfg 2012-04-27 13:18:55 UTC (rev 46006)
@@ -117,6 +117,8 @@
add_builder(c, 'win32_scons', 'windows', generic_builder)
add_builder(c, 'salad_win32_scons', 'windows', generic_builder, 'soc-2011-salad')
add_builder(c, 'win64_scons', 'win64', generic_builder)
+add_builder(c, 'mingw_win64_scons', 'mingw64', generic_builder)
+add_builder(c, 'mingw_win32_scons', 'mingw32', generic_builder)
#add_builder(c, 'freebsd_i386_cmake', '', generic_builder)
#add_builder(c, 'freebsd_x86_64_cmake', '', generic_builder)
Modified: trunk/blender/build_files/buildbot/slave_compile.py
===================================================================
--- trunk/blender/build_files/buildbot/slave_compile.py 2012-04-27 12:44:32 UTC (rev 46005)
+++ trunk/blender/build_files/buildbot/slave_compile.py 2012-04-27 13:18:55 UTC (rev 46006)
@@ -117,6 +117,8 @@
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')
retcode = subprocess.call(['python', 'scons/scons.py'] + scons_options)
sys.exit(retcode)
More information about the Bf-blender-cvs
mailing list