[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37148] branches/soc-2011-salad: Merge with trunk revision 37147.
Joerg Mueller
nexyon at gmail.com
Sat Jun 4 01:12:32 CEST 2011
Revision: 37148
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37148
Author: nexyon
Date: 2011-06-03 23:12:31 +0000 (Fri, 03 Jun 2011)
Log Message:
-----------
Merge with trunk revision 37147.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37147
Modified Paths:
--------------
branches/soc-2011-salad/build_files/buildbot/master.cfg
branches/soc-2011-salad/build_files/buildbot/master_unpack.py
branches/soc-2011-salad/build_files/buildbot/slave_compile.py
branches/soc-2011-salad/build_files/buildbot/slave_pack.py
branches/soc-2011-salad/build_files/cmake/macros.cmake
branches/soc-2011-salad/build_files/scons/tools/btools.py
branches/soc-2011-salad/extern/binreloc/CMakeLists.txt
branches/soc-2011-salad/extern/bullet2/CMakeLists.txt
branches/soc-2011-salad/extern/eltopo/CMakeLists.txt
branches/soc-2011-salad/extern/glew/CMakeLists.txt
branches/soc-2011-salad/extern/glew/include/GL/glew.h
branches/soc-2011-salad/extern/glew/include/GL/glxew.h
branches/soc-2011-salad/extern/glew/include/GL/wglew.h
branches/soc-2011-salad/extern/glew/src/glew.c
branches/soc-2011-salad/extern/libopenjpeg/CMakeLists.txt
branches/soc-2011-salad/extern/libredcode/CMakeLists.txt
branches/soc-2011-salad/extern/lzma/CMakeLists.txt
branches/soc-2011-salad/extern/lzo/CMakeLists.txt
branches/soc-2011-salad/intern/audaspace/CMakeLists.txt
branches/soc-2011-salad/intern/boolop/CMakeLists.txt
branches/soc-2011-salad/intern/bsp/CMakeLists.txt
branches/soc-2011-salad/intern/container/CMakeLists.txt
branches/soc-2011-salad/intern/decimation/CMakeLists.txt
branches/soc-2011-salad/intern/elbeem/CMakeLists.txt
branches/soc-2011-salad/intern/ghost/CMakeLists.txt
branches/soc-2011-salad/intern/guardedalloc/CMakeLists.txt
branches/soc-2011-salad/intern/iksolver/CMakeLists.txt
branches/soc-2011-salad/intern/itasc/CMakeLists.txt
branches/soc-2011-salad/intern/memutil/CMakeLists.txt
branches/soc-2011-salad/intern/mikktspace/CMakeLists.txt
branches/soc-2011-salad/intern/moto/CMakeLists.txt
branches/soc-2011-salad/intern/opennl/CMakeLists.txt
branches/soc-2011-salad/intern/smoke/CMakeLists.txt
branches/soc-2011-salad/intern/string/CMakeLists.txt
branches/soc-2011-salad/release/scripts/modules/bpy_extras/image_utils.py
branches/soc-2011-salad/release/scripts/modules/bpy_extras/io_utils.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/space_userpref.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/space_userpref_keymap.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2011-salad/release/windows/installer/00.sconsblender.nsi
branches/soc-2011-salad/source/blender/avi/CMakeLists.txt
branches/soc-2011-salad/source/blender/blenfont/CMakeLists.txt
branches/soc-2011-salad/source/blender/blenkernel/BKE_global.h
branches/soc-2011-salad/source/blender/blenkernel/BKE_texture.h
branches/soc-2011-salad/source/blender/blenkernel/CMakeLists.txt
branches/soc-2011-salad/source/blender/blenkernel/intern/blender.c
branches/soc-2011-salad/source/blender/blenkernel/intern/multires.c
branches/soc-2011-salad/source/blender/blenkernel/intern/node.c
branches/soc-2011-salad/source/blender/blenkernel/intern/particle.c
branches/soc-2011-salad/source/blender/blenkernel/intern/scene.c
branches/soc-2011-salad/source/blender/blenkernel/intern/texture.c
branches/soc-2011-salad/source/blender/blenlib/CMakeLists.txt
branches/soc-2011-salad/source/blender/blenloader/CMakeLists.txt
branches/soc-2011-salad/source/blender/blenloader/intern/readfile.c
branches/soc-2011-salad/source/blender/blenloader/intern/writefile.c
branches/soc-2011-salad/source/blender/blenpluginapi/CMakeLists.txt
branches/soc-2011-salad/source/blender/collada/CMakeLists.txt
branches/soc-2011-salad/source/blender/editors/animation/CMakeLists.txt
branches/soc-2011-salad/source/blender/editors/armature/CMakeLists.txt
branches/soc-2011-salad/source/blender/editors/curve/CMakeLists.txt
branches/soc-2011-salad/source/blender/editors/datafiles/CMakeLists.txt
branches/soc-2011-salad/source/blender/editors/datafiles/startup.blend.c
branches/soc-2011-salad/source/blender/editors/gpencil/CMakeLists.txt
branches/soc-2011-salad/source/blender/editors/interface/CMakeLists.txt
branches/soc-2011-salad/source/blender/editors/interface/interface.c
branches/soc-2011-salad/source/blender/editors/interface/interface_handlers.c
branches/soc-2011-salad/source/blender/editors/interface/interface_intern.h
branches/soc-2011-salad/source/blender/editors/interface/interface_regions.c
branches/soc-2011-salad/source/blender/editors/interface/interface_templates.c
branches/soc-2011-salad/source/blender/editors/mesh/CMakeLists.txt
branches/soc-2011-salad/source/blender/editors/metaball/CMakeLists.txt
branches/soc-2011-salad/source/blender/editors/object/CMakeLists.txt
branches/soc-2011-salad/source/blender/editors/physics/CMakeLists.txt
branches/soc-2011-salad/source/blender/editors/render/CMakeLists.txt
branches/soc-2011-salad/source/blender/editors/screen/CMakeLists.txt
branches/soc-2011-salad/source/blender/editors/sculpt_paint/CMakeLists.txt
branches/soc-2011-salad/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2011-salad/source/blender/editors/sound/CMakeLists.txt
branches/soc-2011-salad/source/blender/editors/space_action/CMakeLists.txt
branches/soc-2011-salad/source/blender/editors/space_api/CMakeLists.txt
branches/soc-2011-salad/source/blender/editors/space_buttons/CMakeLists.txt
branches/soc-2011-salad/source/blender/editors/space_console/CMakeLists.txt
branches/soc-2011-salad/source/blender/editors/space_file/CMakeLists.txt
branches/soc-2011-salad/source/blender/editors/space_graph/CMakeLists.txt
branches/soc-2011-salad/source/blender/editors/space_image/CMakeLists.txt
branches/soc-2011-salad/source/blender/editors/space_info/CMakeLists.txt
branches/soc-2011-salad/source/blender/editors/space_logic/CMakeLists.txt
branches/soc-2011-salad/source/blender/editors/space_nla/CMakeLists.txt
branches/soc-2011-salad/source/blender/editors/space_node/CMakeLists.txt
branches/soc-2011-salad/source/blender/editors/space_node/space_node.c
branches/soc-2011-salad/source/blender/editors/space_outliner/CMakeLists.txt
branches/soc-2011-salad/source/blender/editors/space_script/CMakeLists.txt
branches/soc-2011-salad/source/blender/editors/space_sequencer/CMakeLists.txt
branches/soc-2011-salad/source/blender/editors/space_sound/CMakeLists.txt
branches/soc-2011-salad/source/blender/editors/space_text/CMakeLists.txt
branches/soc-2011-salad/source/blender/editors/space_time/CMakeLists.txt
branches/soc-2011-salad/source/blender/editors/space_userpref/CMakeLists.txt
branches/soc-2011-salad/source/blender/editors/space_view3d/CMakeLists.txt
branches/soc-2011-salad/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2011-salad/source/blender/editors/transform/CMakeLists.txt
branches/soc-2011-salad/source/blender/editors/util/CMakeLists.txt
branches/soc-2011-salad/source/blender/editors/uvedit/CMakeLists.txt
branches/soc-2011-salad/source/blender/editors/uvedit/uvedit_parametrizer.c
branches/soc-2011-salad/source/blender/gpu/CMakeLists.txt
branches/soc-2011-salad/source/blender/ikplugin/CMakeLists.txt
branches/soc-2011-salad/source/blender/imbuf/CMakeLists.txt
branches/soc-2011-salad/source/blender/imbuf/intern/cineon/CMakeLists.txt
branches/soc-2011-salad/source/blender/imbuf/intern/dds/CMakeLists.txt
branches/soc-2011-salad/source/blender/imbuf/intern/openexr/CMakeLists.txt
branches/soc-2011-salad/source/blender/makesdna/intern/CMakeLists.txt
branches/soc-2011-salad/source/blender/makesrna/intern/CMakeLists.txt
branches/soc-2011-salad/source/blender/makesrna/intern/rna_ID.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_access.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_actuator.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_armature.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_brush.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_cloth.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_color.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_constraint.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_curve.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_define.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_fcurve.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_image.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_internal.h
branches/soc-2011-salad/source/blender/makesrna/intern/rna_lamp.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_lattice.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_main.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_main_api.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_material.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_nla.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_object.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_object_force.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_particle.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_pose.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_render.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_scene.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_sculpt_paint.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_sequencer.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_smoke.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_space.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_ui.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_wm.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_world.c
branches/soc-2011-salad/source/blender/modifiers/CMakeLists.txt
branches/soc-2011-salad/source/blender/modifiers/intern/MOD_boolean.c
branches/soc-2011-salad/source/blender/nodes/CMakeLists.txt
branches/soc-2011-salad/source/blender/nodes/intern/CMP_nodes/CMP_colorMatte.c
branches/soc-2011-salad/source/blender/nodes/intern/SHD_nodes/SHD_material.c
branches/soc-2011-salad/source/blender/nodes/intern/SHD_util.h
branches/soc-2011-salad/source/blender/python/BPY_extern.h
branches/soc-2011-salad/source/blender/python/generic/CMakeLists.txt
branches/soc-2011-salad/source/blender/python/generic/bgl.c
branches/soc-2011-salad/source/blender/python/generic/bgl.h
branches/soc-2011-salad/source/blender/python/generic/bpy_internal_import.c
branches/soc-2011-salad/source/blender/python/generic/mathutils_Color.c
branches/soc-2011-salad/source/blender/python/generic/mathutils_Euler.c
branches/soc-2011-salad/source/blender/python/generic/mathutils_Matrix.c
branches/soc-2011-salad/source/blender/python/generic/mathutils_Vector.c
branches/soc-2011-salad/source/blender/python/generic/mathutils_geometry.c
branches/soc-2011-salad/source/blender/python/intern/CMakeLists.txt
branches/soc-2011-salad/source/blender/python/intern/bpy.c
branches/soc-2011-salad/source/blender/python/intern/bpy.h
branches/soc-2011-salad/source/blender/python/intern/bpy_app.h
branches/soc-2011-salad/source/blender/python/intern/bpy_driver.c
branches/soc-2011-salad/source/blender/python/intern/bpy_library.c
branches/soc-2011-salad/source/blender/python/intern/bpy_props.c
branches/soc-2011-salad/source/blender/python/intern/bpy_props.h
branches/soc-2011-salad/source/blender/python/intern/bpy_rna.c
branches/soc-2011-salad/source/blender/python/intern/bpy_rna.h
branches/soc-2011-salad/source/blender/quicktime/CMakeLists.txt
branches/soc-2011-salad/source/blender/render/CMakeLists.txt
branches/soc-2011-salad/source/blender/render/intern/source/pointdensity.c
branches/soc-2011-salad/source/blender/windowmanager/CMakeLists.txt
branches/soc-2011-salad/source/blender/windowmanager/SConscript
branches/soc-2011-salad/source/blender/windowmanager/intern/wm_apple.c
branches/soc-2011-salad/source/blender/windowmanager/intern/wm_files.c
branches/soc-2011-salad/source/blender/windowmanager/intern/wm_window.c
branches/soc-2011-salad/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
branches/soc-2011-salad/source/creator/CMakeLists.txt
branches/soc-2011-salad/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/soc-2011-salad/source/gameengine/BlenderRoutines/CMakeLists.txt
branches/soc-2011-salad/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2011-salad/source/gameengine/Converter/CMakeLists.txt
branches/soc-2011-salad/source/gameengine/Expressions/CMakeLists.txt
branches/soc-2011-salad/source/gameengine/Expressions/PyObjectPlus.cpp
branches/soc-2011-salad/source/gameengine/GameLogic/CMakeLists.txt
branches/soc-2011-salad/source/gameengine/GameLogic/SCA_PythonController.cpp
branches/soc-2011-salad/source/gameengine/GamePlayer/common/CMakeLists.txt
branches/soc-2011-salad/source/gameengine/GamePlayer/ghost/CMakeLists.txt
branches/soc-2011-salad/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/soc-2011-salad/source/gameengine/Ketsji/CMakeLists.txt
branches/soc-2011-salad/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt
branches/soc-2011-salad/source/gameengine/Network/CMakeLists.txt
branches/soc-2011-salad/source/gameengine/Network/LoopBackNetwork/CMakeLists.txt
branches/soc-2011-salad/source/gameengine/Physics/Bullet/CMakeLists.txt
branches/soc-2011-salad/source/gameengine/Physics/Dummy/CMakeLists.txt
branches/soc-2011-salad/source/gameengine/Physics/common/CMakeLists.txt
branches/soc-2011-salad/source/gameengine/Rasterizer/CMakeLists.txt
branches/soc-2011-salad/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
branches/soc-2011-salad/source/gameengine/SceneGraph/CMakeLists.txt
branches/soc-2011-salad/source/gameengine/VideoTexture/CMakeLists.txt
Property Changed:
----------------
branches/soc-2011-salad/
Property changes on: branches/soc-2011-salad
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-cucumber:36829-36994
/branches/soc-2011-pepper:36830-36989
/trunk/blender:36834-36994
+ /branches/soc-2011-cucumber:36829-36994
/branches/soc-2011-pepper:36830-36989
/trunk/blender:36834-37147
Modified: branches/soc-2011-salad/build_files/buildbot/master.cfg
===================================================================
--- branches/soc-2011-salad/build_files/buildbot/master.cfg 2011-06-03 21:36:39 UTC (rev 37147)
+++ branches/soc-2011-salad/build_files/buildbot/master.cfg 2011-06-03 23:12:31 UTC (rev 37148)
@@ -53,7 +53,7 @@
buildernames = []
-def add_builder(c, name, libdir, factory):
+def add_builder(c, name, libdir, factory, branch=''):
slavenames = []
for slave in master_private.slaves:
@@ -61,24 +61,26 @@
slavenames.append(slave['name'])
if len(slavenames) > 0:
- f = factory(name, libdir)
+ f = factory(name, libdir, branch)
c['builders'].append(BuilderConfig(name=name, slavenames=slavenames, factory=f, category='blender'))
buildernames.append(name)
# common steps
-def svn_step():
- return SVN(baseURL='https://svn.blender.org/svnroot/bf-blender/%%BRANCH%%/blender', mode='update', defaultBranch='trunk', workdir='blender')
+def svn_step(branch=''):
+ if branch:
+ return SVN(baseURL='https://svn.blender.org/svnroot/bf-blender/branches/%%BRANCH%%', mode='update', defaultBranch=branch, workdir='blender')
+ else:
+ return SVN(baseURL='https://svn.blender.org/svnroot/bf-blender/%%BRANCH%%/blender', mode='update', defaultBranch='trunk', workdir='blender')
-
def lib_svn_step(dir):
return SVN(name='lib svn', baseURL='https://svn.blender.org/svnroot/bf-blender/%%BRANCH%%/lib/' + dir, mode='update', defaultBranch='trunk', workdir='lib/' + dir)
# generic builder
-def generic_builder(id, libdir=""):
+def generic_builder(id, libdir='', branch=''):
filename = 'buildbot_upload_' + id + '.zip'
compile_script = '../blender/build_files/buildbot/slave_compile.py'
test_script = '../blender/build_files/buildbot/slave_test.py'
@@ -86,13 +88,13 @@
unpack_script = 'master_unpack.py'
f = BuildFactory()
- f.addStep(svn_step())
+ f.addStep(svn_step(branch))
if libdir != '':
f.addStep(lib_svn_step(libdir))
f.addStep(Compile(command=['python', compile_script, id]))
f.addStep(Test(command=['python', test_script, id]))
- f.addStep(ShellCommand(name='package', command=['python', pack_script, id], description='packaging', descriptionDone='packaged'))
+ f.addStep(ShellCommand(name='package', command=['python', pack_script, id, branch], description='packaging', descriptionDone='packaged'))
if id.find('cmake') != -1:
f.addStep(FileUpload(name='upload', slavesrc='buildbot_upload.zip', masterdest=filename, maxsize=100 * 1024 * 1024))
else:
@@ -102,12 +104,19 @@
# builders
-add_builder(c, 'mac_x86_64_cmake', 'darwin-9.x.universal', generic_builder)
-add_builder(c, 'mac_i386_cmake', 'darwin-9.x.universal', generic_builder)
-add_builder(c, 'mac_ppc_cmake', 'darwin-9.x.universal', generic_builder)
-add_builder(c, 'linux_x86_64_cmake', '', generic_builder)
+add_builder(c, 'mac_x86_64_scons', 'darwin-9.x.universal', generic_builder)
+add_builder(c, 'salad_mac_x86_64_scons', 'darwin-9.x.universal', generic_builder, 'soc-2011-salad')
+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_i386_scons', '', generic_builder)
+add_builder(c, 'salad_linux_i386_scons', '', generic_builder, 'soc-2011-salad')
add_builder(c, 'linux_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)
+add_builder(c, 'salad_win32_scons', 'windows', generic_builder, 'soc-2011-salad')
+#add_builder(c, 'freebsd_i386_cmake', '', generic_builder)
+#add_builder(c, 'freebsd_x86_64_cmake', '', generic_builder)
# SCHEDULERS
#
@@ -149,7 +158,7 @@
pingBuilder=False,
stopBuild=False,
stopAllBuilds=False,
- cancelPendingBuild=False,
+ cancelPendingBuild=True,
)
c['status'].append(html.WebStatus(http_port=8010, authz=authz_cfg))
Modified: branches/soc-2011-salad/build_files/buildbot/master_unpack.py
===================================================================
--- branches/soc-2011-salad/build_files/buildbot/master_unpack.py 2011-06-03 21:36:39 UTC (rev 37147)
+++ branches/soc-2011-salad/build_files/buildbot/master_unpack.py 2011-06-03 23:12:31 UTC (rev 37148)
@@ -43,6 +43,7 @@
# platform out, but there may be some variations, so we fiddle a
# bit to handle current and hopefully future names
filename = strip_extension(filename)
+ filename = strip_extension(filename)
tokens = filename.split("-")
platforms = ('osx', 'mac', 'bsd',
@@ -63,6 +64,21 @@
return '-'.join(platform_tokens)
+def get_branch(filename):
+ tokens = filename.split("-")
+ branch = ""
+
+ for token in tokens:
+ if branch == "":
+ branch = token
+ else:
+ branch = branch + "-" + token
+
+ if token == "blender":
+ return branch
+
+ return ""
+
# get filename
if len(sys.argv) < 2:
sys.stderr.write("Not enough arguments, expecting file to unpack\n")
@@ -88,8 +104,9 @@
package = z.namelist()[0]
packagename = os.path.basename(package)
-# detect platform
+# detect platform and branch
platform = get_platform(packagename)
+branch = get_branch(packagename)
if platform == '':
sys.stderr.write('Failed to detect platform ' +
@@ -113,10 +130,10 @@
sys.stderr.write('Failed to unzip package: %s\n' % str(ex))
sys.exit(1)
-# remove other files from the same platform
+# remove other files from the same platform and branch
try:
for f in os.listdir(directory):
- if platform.lower() in f.lower():
+ if get_platform(f) == platform and get_branch(f) == branch:
if f != packagename:
os.remove(os.path.join(directory, f))
except Exception, ex:
Modified: branches/soc-2011-salad/build_files/buildbot/slave_compile.py
===================================================================
--- branches/soc-2011-salad/build_files/buildbot/slave_compile.py 2011-06-03 21:36:39 UTC (rev 37147)
+++ branches/soc-2011-salad/build_files/buildbot/slave_compile.py 2011-06-03 23:12:31 UTC (rev 37148)
@@ -38,11 +38,11 @@
# set build options
cmake_options = ['-DCMAKE_BUILD_TYPE:STRING=Release']
- if builder == 'mac_x86_64_cmake':
+ if builder.endswith('mac_x86_64_cmake'):
cmake_options.append('-DCMAKE_OSX_ARCHITECTURES:STRING=x86_64')
- elif builder == 'mac_i386_cmake':
+ elif builder.endswith('mac_i386_cmake'):
cmake_options.append('-DCMAKE_OSX_ARCHITECTURES:STRING=i386')
- elif builder == 'mac_ppc_cmake':
+ elif builder.endswith('mac_ppc_cmake'):
cmake_options.append('-DCMAKE_OSX_ARCHITECTURES:STRING=ppc')
# configure and make
@@ -57,7 +57,7 @@
scons_cmd = ['python', 'scons/scons.py']
scons_options = []
- if builder.startswith('linux'):
+ if builder.find('linux') != -1:
import shutil
# We're using the same rules as release builder, so tweak
@@ -75,10 +75,10 @@
config_dir = os.path.join(buildbot_dir, 'config')
configs = []
- if builder == 'linux_x86_64_scons':
+ if builder.endswith('linux_x86_64_scons'):
configs = ['user-config-player-x86_64.py',
'user-config-x86_64.py']
- elif builder == 'linux_i386_scons':
+ elif builder.endswith('linux_i386_scons'):
configs = ['user-config-player-i686.py',
'user-config-i686.py']
Modified: branches/soc-2011-salad/build_files/buildbot/slave_pack.py
===================================================================
--- branches/soc-2011-salad/build_files/buildbot/slave_pack.py 2011-06-03 21:36:39 UTC (rev 37147)
+++ branches/soc-2011-salad/build_files/buildbot/slave_pack.py 2011-06-03 23:12:31 UTC (rev 37148)
@@ -33,13 +33,17 @@
sys.exit(1)
builder = sys.argv[1]
+branch = ''
+if len(sys.argv) >= 3:
+ branch = sys.argv[2]
+
# scons does own packaging
if builder.find('scons') != -1:
os.chdir('../blender')
- scons_options = ['BF_QUICK=slnt', 'buildslave']
+ scons_options = ['BF_QUICK=slnt', 'BUILDBOT_BRANCH=' + branch, 'buildslave']
- if builder.startswith('linux'):
+ if builder.find('linux') != -1:
buildbot_dir = os.path.dirname(os.path.realpath(__file__))
config_dir = os.path.join(buildbot_dir, 'config')
build_dir = os.path.join('..', 'build', builder)
@@ -52,9 +56,9 @@
config = None
- if builder == 'linux_x86_64_scons':
+ if builder.endswith('linux_x86_64_scons'):
config = 'user-config-x86_64.py'
- elif builder == 'linux_i386_scons':
+ elif builder.endswith('linux_i386_scons'):
config = 'user-config-x86_64.py'
if config is not None:
Modified: branches/soc-2011-salad/build_files/cmake/macros.cmake
===================================================================
--- branches/soc-2011-salad/build_files/cmake/macros.cmake 2011-06-03 21:36:39 UTC (rev 37147)
+++ branches/soc-2011-salad/build_files/cmake/macros.cmake 2011-06-03 23:12:31 UTC (rev 37148)
@@ -13,7 +13,16 @@
include_directories(${all_incs})
endmacro()
+macro(blender_include_dirs_sys
+ includes)
+ foreach(inc ${ARGV})
+ get_filename_component(abs_inc ${inc} ABSOLUTE)
+ list(APPEND all_incs ${abs_inc})
+ endforeach()
+ include_directories(SYSTEM ${all_incs})
+endmacro()
+
macro(blender_source_group
sources)
@@ -35,12 +44,15 @@
macro(blender_add_lib_nolist
name
sources
- includes)
+ includes
+ includes_sys)
# message(STATUS "Configuring library ${name}")
# include_directories(${includes})
+ # include_directories(SYSTEM ${includes_sys})
blender_include_dirs("${includes}")
+ blender_include_dirs_sys("${includes_sys}")
add_library(${name} ${sources})
@@ -54,9 +66,10 @@
macro(blender_add_lib
name
sources
- includes)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list