[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35900] branches/particles-2010: svn merge -r35783:35899 https://svn.blender.org/svnroot/bf-blender/trunk/ blender
Lukas Toenne
lukas.toenne at googlemail.com
Wed Mar 30 15:43:32 CEST 2011
Revision: 35900
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35900
Author: lukastoenne
Date: 2011-03-30 13:43:32 +0000 (Wed, 30 Mar 2011)
Log Message:
-----------
svn merge -r35783:35899 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35783
Modified Paths:
--------------
branches/particles-2010/CMakeLists.txt
branches/particles-2010/SConstruct
branches/particles-2010/build_files/buildbot/master.cfg
branches/particles-2010/build_files/buildbot/master_unpack.py
branches/particles-2010/build_files/buildbot/slave_compile.py
branches/particles-2010/build_files/buildbot/slave_pack.py
branches/particles-2010/build_files/buildbot/slave_test.py
branches/particles-2010/build_files/cmake/cmake_qtcreator_project.py
branches/particles-2010/build_files/cmake/macros.cmake
branches/particles-2010/build_files/package_spec/build_archive.py
branches/particles-2010/build_files/scons/tools/Blender.py
branches/particles-2010/build_files/scons/tools/btools.py
branches/particles-2010/doc/python_api/examples/bpy.data.py
branches/particles-2010/doc/python_api/sphinx_doc_gen.py
branches/particles-2010/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp
branches/particles-2010/extern/bullet2/src/BulletDynamics/Vehicle/btRaycastVehicle.cpp
branches/particles-2010/intern/ghost/GHOST_C-api.h
branches/particles-2010/intern/ghost/GHOST_ISystem.h
branches/particles-2010/intern/ghost/intern/GHOST_C-api.cpp
branches/particles-2010/intern/ghost/intern/GHOST_System.cpp
branches/particles-2010/intern/ghost/intern/GHOST_System.h
branches/particles-2010/intern/itasc/Scene.cpp
branches/particles-2010/intern/mikktspace/mikktspace.c
branches/particles-2010/intern/opennl/CMakeLists.txt
branches/particles-2010/release/scripts/modules/addon_utils.py
branches/particles-2010/release/scripts/modules/animsys_refactor.py
branches/particles-2010/release/scripts/modules/bpy/utils.py
branches/particles-2010/release/scripts/modules/bpyml.py
branches/particles-2010/release/scripts/presets/interaction/blender.py
branches/particles-2010/release/scripts/presets/keyconfig/maya.py
branches/particles-2010/release/scripts/templates/background_job.py
branches/particles-2010/release/windows/installer/00.sconsblender.nsi
branches/particles-2010/source/blender/blenkernel/BKE_blender.h
branches/particles-2010/source/blender/blenkernel/BKE_curve.h
branches/particles-2010/source/blender/blenkernel/BKE_mesh.h
branches/particles-2010/source/blender/blenkernel/BKE_particle.h
branches/particles-2010/source/blender/blenkernel/BKE_screen.h
branches/particles-2010/source/blender/blenkernel/intern/CCGSubSurf.c
branches/particles-2010/source/blender/blenkernel/intern/DerivedMesh.c
branches/particles-2010/source/blender/blenkernel/intern/anim.c
branches/particles-2010/source/blender/blenkernel/intern/anim_sys.c
branches/particles-2010/source/blender/blenkernel/intern/armature.c
branches/particles-2010/source/blender/blenkernel/intern/brush.c
branches/particles-2010/source/blender/blenkernel/intern/bvhutils.c
branches/particles-2010/source/blender/blenkernel/intern/cdderivedmesh.c
branches/particles-2010/source/blender/blenkernel/intern/colortools.c
branches/particles-2010/source/blender/blenkernel/intern/constraint.c
branches/particles-2010/source/blender/blenkernel/intern/curve.c
branches/particles-2010/source/blender/blenkernel/intern/displist.c
branches/particles-2010/source/blender/blenkernel/intern/effect.c
branches/particles-2010/source/blender/blenkernel/intern/exotic.c
branches/particles-2010/source/blender/blenkernel/intern/fcurve.c
branches/particles-2010/source/blender/blenkernel/intern/font.c
branches/particles-2010/source/blender/blenkernel/intern/image_gen.c
branches/particles-2010/source/blender/blenkernel/intern/ipo.c
branches/particles-2010/source/blender/blenkernel/intern/key.c
branches/particles-2010/source/blender/blenkernel/intern/lattice.c
branches/particles-2010/source/blender/blenkernel/intern/material.c
branches/particles-2010/source/blender/blenkernel/intern/mball.c
branches/particles-2010/source/blender/blenkernel/intern/mesh.c
branches/particles-2010/source/blender/blenkernel/intern/nla.c
branches/particles-2010/source/blender/blenkernel/intern/object.c
branches/particles-2010/source/blender/blenkernel/intern/particle.c
branches/particles-2010/source/blender/blenkernel/intern/particle_system.c
branches/particles-2010/source/blender/blenkernel/intern/screen.c
branches/particles-2010/source/blender/blenkernel/intern/subsurf_ccg.c
branches/particles-2010/source/blender/blenkernel/intern/texture.c
branches/particles-2010/source/blender/blenkernel/intern/unit.c
branches/particles-2010/source/blender/blenlib/BLI_editVert.h
branches/particles-2010/source/blender/blenlib/BLI_math_rotation.h
branches/particles-2010/source/blender/blenlib/BLI_utildefines.h
branches/particles-2010/source/blender/blenlib/BLI_winstuff.h
branches/particles-2010/source/blender/blenlib/intern/math_base_inline.c
branches/particles-2010/source/blender/blenlib/intern/math_color.c
branches/particles-2010/source/blender/blenlib/intern/math_geom.c
branches/particles-2010/source/blender/blenlib/intern/math_matrix.c
branches/particles-2010/source/blender/blenlib/intern/math_rotation.c
branches/particles-2010/source/blender/blenlib/intern/math_vector.c
branches/particles-2010/source/blender/blenlib/intern/math_vector_inline.c
branches/particles-2010/source/blender/blenlib/intern/path_util.c
branches/particles-2010/source/blender/blenlib/intern/uvproject.c
branches/particles-2010/source/blender/blenlib/intern/winstuff.c
branches/particles-2010/source/blender/blenloader/intern/readfile.c
branches/particles-2010/source/blender/collada/CMakeLists.txt
branches/particles-2010/source/blender/collada/DocumentImporter.cpp
branches/particles-2010/source/blender/collada/DocumentImporter.h
branches/particles-2010/source/blender/collada/ExtraHandler.cpp
branches/particles-2010/source/blender/collada/ExtraTags.cpp
branches/particles-2010/source/blender/collada/ExtraTags.h
branches/particles-2010/source/blender/collada/LightExporter.cpp
branches/particles-2010/source/blender/collada/LightExporter.h
branches/particles-2010/source/blender/collada/SConscript
branches/particles-2010/source/blender/editors/animation/anim_channels_edit.c
branches/particles-2010/source/blender/editors/animation/anim_draw.c
branches/particles-2010/source/blender/editors/animation/fmodifier_ui.c
branches/particles-2010/source/blender/editors/animation/keyframes_draw.c
branches/particles-2010/source/blender/editors/animation/keyframes_edit.c
branches/particles-2010/source/blender/editors/animation/keyframing.c
branches/particles-2010/source/blender/editors/armature/editarmature.c
branches/particles-2010/source/blender/editors/armature/meshlaplacian.c
branches/particles-2010/source/blender/editors/armature/poselib.c
branches/particles-2010/source/blender/editors/curve/curve_ops.c
branches/particles-2010/source/blender/editors/curve/editcurve.c
branches/particles-2010/source/blender/editors/curve/editfont.c
branches/particles-2010/source/blender/editors/gpencil/drawgpencil.c
branches/particles-2010/source/blender/editors/include/ED_sequencer.h
branches/particles-2010/source/blender/editors/interface/interface.c
branches/particles-2010/source/blender/editors/interface/interface_draw.c
branches/particles-2010/source/blender/editors/interface/interface_handlers.c
branches/particles-2010/source/blender/editors/interface/interface_panel.c
branches/particles-2010/source/blender/editors/interface/interface_regions.c
branches/particles-2010/source/blender/editors/interface/interface_style.c
branches/particles-2010/source/blender/editors/interface/interface_templates.c
branches/particles-2010/source/blender/editors/interface/interface_widgets.c
branches/particles-2010/source/blender/editors/interface/resources.c
branches/particles-2010/source/blender/editors/interface/view2d.c
branches/particles-2010/source/blender/editors/interface/view2d_ops.c
branches/particles-2010/source/blender/editors/mesh/editface.c
branches/particles-2010/source/blender/editors/mesh/editmesh.c
branches/particles-2010/source/blender/editors/mesh/editmesh_add.c
branches/particles-2010/source/blender/editors/mesh/editmesh_lib.c
branches/particles-2010/source/blender/editors/mesh/editmesh_mods.c
branches/particles-2010/source/blender/editors/mesh/editmesh_tools.c
branches/particles-2010/source/blender/editors/metaball/mball_edit.c
branches/particles-2010/source/blender/editors/object/object_edit.c
branches/particles-2010/source/blender/editors/object/object_modifier.c
branches/particles-2010/source/blender/editors/object/object_transform.c
branches/particles-2010/source/blender/editors/object/object_vgroup.c
branches/particles-2010/source/blender/editors/physics/particle_edit.c
branches/particles-2010/source/blender/editors/render/render_internal.c
branches/particles-2010/source/blender/editors/screen/area.c
branches/particles-2010/source/blender/editors/screen/glutil.c
branches/particles-2010/source/blender/editors/screen/screen_edit.c
branches/particles-2010/source/blender/editors/screen/screen_ops.c
branches/particles-2010/source/blender/editors/sculpt_paint/paint_image.c
branches/particles-2010/source/blender/editors/sculpt_paint/paint_ops.c
branches/particles-2010/source/blender/editors/sculpt_paint/paint_stroke.c
branches/particles-2010/source/blender/editors/sculpt_paint/paint_utils.c
branches/particles-2010/source/blender/editors/sculpt_paint/paint_vertex.c
branches/particles-2010/source/blender/editors/sculpt_paint/sculpt.c
branches/particles-2010/source/blender/editors/space_console/space_console.c
branches/particles-2010/source/blender/editors/space_file/file_draw.c
branches/particles-2010/source/blender/editors/space_file/filesel.c
branches/particles-2010/source/blender/editors/space_graph/graph_buttons.c
branches/particles-2010/source/blender/editors/space_graph/graph_edit.c
branches/particles-2010/source/blender/editors/space_image/image_draw.c
branches/particles-2010/source/blender/editors/space_image/image_ops.c
branches/particles-2010/source/blender/editors/space_image/space_image.c
branches/particles-2010/source/blender/editors/space_info/info_ops.c
branches/particles-2010/source/blender/editors/space_info/space_info.c
branches/particles-2010/source/blender/editors/space_nla/nla_draw.c
branches/particles-2010/source/blender/editors/space_node/node_edit.c
branches/particles-2010/source/blender/editors/space_sequencer/sequencer_draw.c
branches/particles-2010/source/blender/editors/space_sequencer/sequencer_edit.c
branches/particles-2010/source/blender/editors/space_sequencer/sequencer_scopes.c
branches/particles-2010/source/blender/editors/space_text/space_text.c
branches/particles-2010/source/blender/editors/space_text/text_draw.c
branches/particles-2010/source/blender/editors/space_time/space_time.c
branches/particles-2010/source/blender/editors/space_view3d/drawarmature.c
branches/particles-2010/source/blender/editors/space_view3d/drawobject.c
branches/particles-2010/source/blender/editors/space_view3d/space_view3d.c
branches/particles-2010/source/blender/editors/space_view3d/view3d_buttons.c
branches/particles-2010/source/blender/editors/space_view3d/view3d_draw.c
branches/particles-2010/source/blender/editors/space_view3d/view3d_edit.c
branches/particles-2010/source/blender/editors/space_view3d/view3d_fly.c
branches/particles-2010/source/blender/editors/space_view3d/view3d_select.c
branches/particles-2010/source/blender/editors/space_view3d/view3d_snap.c
branches/particles-2010/source/blender/editors/space_view3d/view3d_view.c
branches/particles-2010/source/blender/editors/transform/transform.c
branches/particles-2010/source/blender/editors/transform/transform_constraints.c
branches/particles-2010/source/blender/editors/transform/transform_conversions.c
branches/particles-2010/source/blender/editors/transform/transform_input.c
branches/particles-2010/source/blender/editors/transform/transform_manipulator.c
branches/particles-2010/source/blender/editors/transform/transform_ops.c
branches/particles-2010/source/blender/editors/transform/transform_snap.c
branches/particles-2010/source/blender/editors/util/ed_util.c
branches/particles-2010/source/blender/editors/util/numinput.c
branches/particles-2010/source/blender/editors/uvedit/uvedit_draw.c
branches/particles-2010/source/blender/editors/uvedit/uvedit_ops.c
branches/particles-2010/source/blender/editors/uvedit/uvedit_parametrizer.c
branches/particles-2010/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/particles-2010/source/blender/ikplugin/intern/itasc_plugin.cpp
branches/particles-2010/source/blender/imbuf/intern/divers.c
branches/particles-2010/source/blender/imbuf/intern/imageprocess.c
branches/particles-2010/source/blender/imbuf/intern/rectop.c
branches/particles-2010/source/blender/imbuf/intern/scaling.c
branches/particles-2010/source/blender/imbuf/intern/tiff.c
branches/particles-2010/source/blender/makesdna/DNA_scene_types.h
branches/particles-2010/source/blender/makesrna/RNA_access.h
branches/particles-2010/source/blender/makesrna/SConscript
branches/particles-2010/source/blender/makesrna/intern/CMakeLists.txt
branches/particles-2010/source/blender/makesrna/intern/SConscript
branches/particles-2010/source/blender/makesrna/intern/rna_access.c
branches/particles-2010/source/blender/makesrna/intern/rna_key.c
branches/particles-2010/source/blender/makesrna/intern/rna_lamp.c
branches/particles-2010/source/blender/makesrna/intern/rna_nla.c
branches/particles-2010/source/blender/makesrna/intern/rna_particle.c
branches/particles-2010/source/blender/makesrna/intern/rna_rna.c
branches/particles-2010/source/blender/makesrna/intern/rna_scene_api.c
branches/particles-2010/source/blender/makesrna/intern/rna_screen.c
branches/particles-2010/source/blender/makesrna/intern/rna_ui_api.c
branches/particles-2010/source/blender/makesrna/intern/rna_userdef.c
branches/particles-2010/source/blender/makesrna/intern/rna_wm.c
branches/particles-2010/source/blender/makesrna/intern/rna_wm_api.c
branches/particles-2010/source/blender/modifiers/intern/MOD_build.c
branches/particles-2010/source/blender/modifiers/intern/MOD_cast.c
branches/particles-2010/source/blender/modifiers/intern/MOD_edgesplit.c
branches/particles-2010/source/blender/modifiers/intern/MOD_hook.c
branches/particles-2010/source/blender/modifiers/intern/MOD_meshdeform.c
branches/particles-2010/source/blender/modifiers/intern/MOD_particleinstance.c
branches/particles-2010/source/blender/modifiers/intern/MOD_particlesystem.c
branches/particles-2010/source/blender/modifiers/intern/MOD_screw.c
branches/particles-2010/source/blender/modifiers/intern/MOD_simpledeform.c
branches/particles-2010/source/blender/modifiers/intern/MOD_smooth.c
branches/particles-2010/source/blender/modifiers/intern/MOD_uvproject.c
branches/particles-2010/source/blender/modifiers/intern/MOD_wave.c
branches/particles-2010/source/blender/nodes/intern/SHD_nodes/SHD_hueSatVal.c
branches/particles-2010/source/blender/nodes/intern/SHD_nodes/SHD_invert.c
branches/particles-2010/source/blender/nodes/intern/TEX_nodes/TEX_checker.c
branches/particles-2010/source/blender/nodes/intern/TEX_nodes/TEX_hueSatVal.c
branches/particles-2010/source/blender/nodes/intern/TEX_nodes/TEX_math.c
branches/particles-2010/source/blender/nodes/intern/TEX_nodes/TEX_output.c
branches/particles-2010/source/blender/nodes/intern/TEX_nodes/TEX_rotate.c
branches/particles-2010/source/blender/python/generic/bpy_internal_import.c
branches/particles-2010/source/blender/python/generic/bpy_internal_import.h
branches/particles-2010/source/blender/python/generic/mathutils.c
branches/particles-2010/source/blender/python/generic/mathutils_Matrix.c
branches/particles-2010/source/blender/python/generic/mathutils_Quaternion.c
branches/particles-2010/source/blender/python/generic/mathutils_Vector.c
branches/particles-2010/source/blender/python/generic/mathutils_geometry.c
branches/particles-2010/source/blender/python/intern/bpy_interface.c
branches/particles-2010/source/blender/python/intern/bpy_rna.c
branches/particles-2010/source/blender/render/extern/include/RE_pipeline.h
branches/particles-2010/source/blender/render/intern/include/render_types.h
branches/particles-2010/source/blender/render/intern/source/convertblender.c
branches/particles-2010/source/blender/render/intern/source/envmap.c
branches/particles-2010/source/blender/render/intern/source/imagetexture.c
branches/particles-2010/source/blender/render/intern/source/pipeline.c
branches/particles-2010/source/blender/windowmanager/intern/wm_event_system.c
branches/particles-2010/source/blender/windowmanager/intern/wm_init_exit.c
branches/particles-2010/source/blender/windowmanager/intern/wm_operators.c
branches/particles-2010/source/blender/windowmanager/intern/wm_subwindow.c
branches/particles-2010/source/blender/windowmanager/intern/wm_window.c
branches/particles-2010/source/blender/windowmanager/wm_event_types.h
branches/particles-2010/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/particles-2010/source/creator/CMakeLists.txt
branches/particles-2010/source/creator/creator.c
branches/particles-2010/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
branches/particles-2010/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/particles-2010/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp
branches/particles-2010/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/particles-2010/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
branches/particles-2010/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
branches/particles-2010/source/icons/SConscript
branches/particles-2010/source/icons/winblender.rc
branches/particles-2010/source/tests/CMakeLists.txt
branches/particles-2010/source/tests/pep8.py
Added Paths:
-----------
branches/particles-2010/release/scripts/presets/interaction/maya.py
branches/particles-2010/release/scripts/templates/operator_modal_timer.py
branches/particles-2010/source/icons/blender.exe.manifest
Removed Paths:
-------------
branches/particles-2010/source/icons/linuxcrossblender.rcscons
branches/particles-2010/source/icons/winblender.rcscons
Property Changed:
----------------
branches/particles-2010/
Property changes on: branches/particles-2010
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:33741-35783
+ /trunk/blender:33741-35899
Modified: branches/particles-2010/CMakeLists.txt
===================================================================
--- branches/particles-2010/CMakeLists.txt 2011-03-30 13:35:54 UTC (rev 35899)
+++ branches/particles-2010/CMakeLists.txt 2011-03-30 13:43:32 UTC (rev 35900)
@@ -1058,12 +1058,14 @@
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ERROR_IMPLICIT_FUNCTION_DECLARATION -Werror=implicit-function-declaration)
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ERROR_RETURN_TYPE -Werror=return-type)
# system headers sometimes do this, disable for now, was: -Werror=strict-prototypes
- ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ERROR_STRICT_PROTOTYPES -Wstrict-prototypes)
+ ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_STRICT_PROTOTYPES -Wstrict-prototypes)
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_NO_CHAR_SUBSCRIPTS -Wno-char-subscripts)
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_NO_UNKNOWN_PRAGMAS -Wno-unknown-pragmas)
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_POINTER_ARITH -Wpointer-arith)
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_UNUSED_PARAMETER -Wunused-parameter)
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_WRITE_STRINGS -Wwrite-strings)
+ ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_DOUBLE_PROMOTION -Wdouble-promotion -Wno-error=double-promotion)
+ ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_NO_ERROR_UNUSED_BUT_SET_VARIABLE -Wno-error=unused-but-set-variable)
ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_ALL -Wall)
ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_INVALID_OFFSETOF -Wno-invalid-offsetof)
Modified: branches/particles-2010/SConstruct
===================================================================
--- branches/particles-2010/SConstruct 2011-03-30 13:35:54 UTC (rev 35899)
+++ branches/particles-2010/SConstruct 2011-03-30 13:43:32 UTC (rev 35900)
@@ -153,13 +153,11 @@
if cxx:
env['CXX'] = cxx
-if env['CC'] in ['cl', 'cl.exe'] and sys.platform=='win32':
- if bitness == 64:
- platform = 'win64-vc'
- else:
- platform = 'win32-vc'
-elif env['CC'] in ['gcc'] and sys.platform=='win32':
- platform = 'win32-mingw'
+if sys.platform=='win32':
+ if env['CC'] in ['cl', 'cl.exe']:
+ platform = 'win64-vc' if bitness == 64 else 'win32-vc'
+ elif env['CC'] in ['gcc']:
+ platform = 'win32-mingw'
env.SConscriptChdir(0)
@@ -197,6 +195,10 @@
opts = btools.read_opts(env, optfiles, B.arguments)
opts.Update(env)
+if sys.platform=='win32':
+ if bitness==64:
+ env.Append(CFLAGS=['-DWIN64']) # -DWIN32 needed too, as it's used all over to target Windows generally
+
if not env['BF_FANCY']:
B.bc.disable()
@@ -641,6 +643,16 @@
'${BF_FFMPEG_LIBPATH}/avdevice-52.dll',
'${BF_FFMPEG_LIBPATH}/avutil-50.dll',
'${BF_FFMPEG_LIBPATH}/swscale-0.dll']
+
+ # Since the thumb handler is loaded by Explorer, architecture is
+ # strict: the x86 build fails on x64 Windows. We need to ship
+ # both builds in x86 packages.
+ if bitness == 32:
+ dllsources.append('${LCGDIR}/thumbhandler/lib/BlendThumb.dll')
+ dllsources.append('${LCGDIR}/thumbhandler/lib/BlendThumb64.dll')
+
+ dllsources.append('#source/icons/blender.exe.manifest')
+
windlls = env.Install(dir=env['BF_INSTALLDIR'], source = dllsources)
allinstall += windlls
Modified: branches/particles-2010/build_files/buildbot/master.cfg
===================================================================
--- branches/particles-2010/build_files/buildbot/master.cfg 2011-03-30 13:35:54 UTC (rev 35899)
+++ branches/particles-2010/build_files/buildbot/master.cfg 2011-03-30 13:43:32 UTC (rev 35900)
@@ -1,6 +1,8 @@
# -*- python -*-
# ex: set syntax=python:
+# <pep8 compliant>
+
# Dictionary that the buildmaster pays attention to.
c = BuildmasterConfig = {}
@@ -36,12 +38,12 @@
# only take place on one slave.
from buildbot.process.factory import BuildFactory
-from buildbot.steps.source import SVN
+from buildbot.steps.source import SVN
from buildbot.steps.shell import ShellCommand
from buildbot.steps.shell import Compile
from buildbot.steps.shell import Test
from buildbot.steps.transfer import FileUpload
-from buildbot.steps.transfer import FileDownload
+# from buildbot.steps.transfer import FileDownload
from buildbot.steps.master import MasterShellCommand
from buildbot.config import BuilderConfig
@@ -50,6 +52,7 @@
c['builders'] = []
buildernames = []
+
def add_builder(c, name, libdir, factory):
slavenames = []
@@ -64,15 +67,18 @@
# common steps
+
def svn_step():
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=""):
filename = 'buildbot_upload_' + id + '.zip'
compile_script = '../blender/build_files/buildbot/slave_compile.py'
test_script = '../blender/build_files/buildbot/slave_test.py'
@@ -88,9 +94,9 @@
f.addStep(Test(command=['python', test_script, id]))
f.addStep(ShellCommand(name='package', command=['python', pack_script, id], description='packaging', descriptionDone='packaged'))
if 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=100 * 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=100 * 1024 * 1024, workdir='install'))
f.addStep(MasterShellCommand(name='unpack', command=['python', unpack_script, filename], description='unpacking', descriptionDone='unpacked'))
return f
@@ -107,7 +113,7 @@
#
# Decide how to react to incoming changes.
-from buildbot.scheduler import Scheduler
+# from buildbot.scheduler import Scheduler
from buildbot.schedulers import timed
c['schedulers'] = []
@@ -132,18 +138,18 @@
c['status'] = []
from buildbot.status import html
-from buildbot.status.web import auth, authz
+from buildbot.status.web import authz
-authz_cfg=authz.Authz(
+authz_cfg = authz.Authz(
# change any of these to True to enable; see the manual for more
# options
- gracefulShutdown = False,
- forceBuild = True, # use this to test your slave once it is set up
- forceAllBuilds = False,
- pingBuilder = False,
- stopBuild = False,
- stopAllBuilds = False,
- cancelPendingBuild = False,
+ gracefulShutdown=False,
+ forceBuild=True, # use this to test your slave once it is set up
+ forceAllBuilds=False,
+ pingBuilder=False,
+ stopBuild=False,
+ stopAllBuilds=False,
+ cancelPendingBuild=False,
)
c['status'].append(html.WebStatus(http_port=8010, authz=authz_cfg))
@@ -168,4 +174,3 @@
# installations.
c['db_url'] = "sqlite:///state.sqlite"
-
Modified: branches/particles-2010/build_files/buildbot/master_unpack.py
===================================================================
--- branches/particles-2010/build_files/buildbot/master_unpack.py 2011-03-30 13:35:54 UTC (rev 35899)
+++ branches/particles-2010/build_files/buildbot/master_unpack.py 2011-03-30 13:43:32 UTC (rev 35900)
@@ -19,6 +19,8 @@
# Runs on Buildbot master, to unpack incoming unload.zip into latest
# builds directory and remove older builds.
+# <pep8 compliant>
+
import os
import shutil
import sys
Modified: branches/particles-2010/build_files/buildbot/slave_compile.py
===================================================================
--- branches/particles-2010/build_files/buildbot/slave_compile.py 2011-03-30 13:35:54 UTC (rev 35899)
+++ branches/particles-2010/build_files/buildbot/slave_compile.py 2011-03-30 13:43:32 UTC (rev 35900)
@@ -16,6 +16,8 @@
#
# ##### END GPL LICENSE BLOCK #####
+# <pep8 compliant>
+
import os
import subprocess
import sys
@@ -56,4 +58,3 @@
retcode = subprocess.call(['python', 'scons/scons.py'] + scons_options)
sys.exit(retcode)
-
Modified: branches/particles-2010/build_files/buildbot/slave_pack.py
===================================================================
--- branches/particles-2010/build_files/buildbot/slave_pack.py 2011-03-30 13:35:54 UTC (rev 35899)
+++ branches/particles-2010/build_files/buildbot/slave_pack.py 2011-03-30 13:43:32 UTC (rev 35900)
@@ -16,6 +16,8 @@
#
# ##### END GPL LICENSE BLOCK #####
+# <pep8 compliant>
+
# Runs on buildbot slave, creating a release package using the build
# system and zipping it into buildbot_upload.zip. This is then uploaded
# to the master in the next buildbot step.
@@ -83,4 +85,3 @@
except Exception, ex:
sys.stderr.write('Create buildbot_upload.zip failed' + str(ex) + '\n')
sys.exit(1)
-
Modified: branches/particles-2010/build_files/buildbot/slave_test.py
===================================================================
--- branches/particles-2010/build_files/buildbot/slave_test.py 2011-03-30 13:35:54 UTC (rev 35899)
+++ branches/particles-2010/build_files/buildbot/slave_test.py 2011-03-30 13:43:32 UTC (rev 35900)
@@ -16,7 +16,8 @@
#
# ##### END GPL LICENSE BLOCK #####
-import os
+# <pep8 compliant>
+
import subprocess
import sys
@@ -37,4 +38,3 @@
else:
# scons
pass
-
Modified: branches/particles-2010/build_files/cmake/cmake_qtcreator_project.py
===================================================================
--- branches/particles-2010/build_files/cmake/cmake_qtcreator_project.py 2011-03-30 13:35:54 UTC (rev 35899)
+++ branches/particles-2010/build_files/cmake/cmake_qtcreator_project.py 2011-03-30 13:43:32 UTC (rev 35900)
@@ -126,7 +126,6 @@
defines = []
import os
- import sys
create_eclipse_project(CMAKE_DIR)
Modified: branches/particles-2010/build_files/cmake/macros.cmake
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list