[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35716] branches/particles-2010: svn merge -r35561:35715 https://svn.blender.org/svnroot/bf-blender/trunk/ blender
Lukas Toenne
lukas.toenne at googlemail.com
Wed Mar 23 09:01:55 CET 2011
Revision: 35716
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35716
Author: lukastoenne
Date: 2011-03-23 08:01:54 +0000 (Wed, 23 Mar 2011)
Log Message:
-----------
svn merge -r35561:35715 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35561
Modified Paths:
--------------
branches/particles-2010/CMakeLists.txt
branches/particles-2010/GNUmakefile
branches/particles-2010/SConstruct
branches/particles-2010/build_files/cmake/packaging.cmake
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.types.Menu.py
branches/particles-2010/doc/python_api/examples/bpy.types.Operator.2.py
branches/particles-2010/doc/python_api/sphinx_doc_gen.py
branches/particles-2010/extern/bullet2/src/BulletSoftBody/btSoftBody.h
branches/particles-2010/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/particles-2010/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/particles-2010/intern/ghost/intern/GHOST_WindowWin32.h
branches/particles-2010/intern/mikktspace/mikktspace.c
branches/particles-2010/release/release_todo.txt
branches/particles-2010/source/blender/blenkernel/BKE_DerivedMesh.h
branches/particles-2010/source/blender/blenkernel/BKE_blender.h
branches/particles-2010/source/blender/blenkernel/BKE_fcurve.h
branches/particles-2010/source/blender/blenkernel/BKE_object.h
branches/particles-2010/source/blender/blenkernel/BKE_particle.h
branches/particles-2010/source/blender/blenkernel/intern/action.c
branches/particles-2010/source/blender/blenkernel/intern/boids.c
branches/particles-2010/source/blender/blenkernel/intern/cdderivedmesh.c
branches/particles-2010/source/blender/blenkernel/intern/curve.c
branches/particles-2010/source/blender/blenkernel/intern/customdata.c
branches/particles-2010/source/blender/blenkernel/intern/depsgraph.c
branches/particles-2010/source/blender/blenkernel/intern/fcurve.c
branches/particles-2010/source/blender/blenkernel/intern/image.c
branches/particles-2010/source/blender/blenkernel/intern/mesh.c
branches/particles-2010/source/blender/blenkernel/intern/node.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/seqeffects.c
branches/particles-2010/source/blender/blenkernel/intern/text.c
branches/particles-2010/source/blender/blenkernel/intern/texture.c
branches/particles-2010/source/blender/blenlib/BLI_math_geom.h
branches/particles-2010/source/blender/blenlib/BLI_storage_types.h
branches/particles-2010/source/blender/blenlib/BLI_utildefines.h
branches/particles-2010/source/blender/blenlib/PIL_time.h
branches/particles-2010/source/blender/blenlib/intern/math_geom.c
branches/particles-2010/source/blender/blenloader/intern/readfile.c
branches/particles-2010/source/blender/collada/DocumentExporter.cpp
branches/particles-2010/source/blender/collada/DocumentImporter.cpp
branches/particles-2010/source/blender/collada/EffectExporter.cpp
branches/particles-2010/source/blender/collada/EffectExporter.h
branches/particles-2010/source/blender/collada/GeometryExporter.cpp
branches/particles-2010/source/blender/collada/ImageExporter.cpp
branches/particles-2010/source/blender/collada/ImageExporter.h
branches/particles-2010/source/blender/collada/InstanceWriter.cpp
branches/particles-2010/source/blender/collada/collada_internal.cpp
branches/particles-2010/source/blender/collada/collada_internal.h
branches/particles-2010/source/blender/editors/armature/armature_ops.c
branches/particles-2010/source/blender/editors/armature/poselib.c
branches/particles-2010/source/blender/editors/armature/poseobject.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/gpencil/gpencil_edit.c
branches/particles-2010/source/blender/editors/gpencil/gpencil_paint.c
branches/particles-2010/source/blender/editors/interface/interface.c
branches/particles-2010/source/blender/editors/interface/interface_icons.c
branches/particles-2010/source/blender/editors/interface/interface_layout.c
branches/particles-2010/source/blender/editors/interface/interface_regions.c
branches/particles-2010/source/blender/editors/interface/interface_templates.c
branches/particles-2010/source/blender/editors/mesh/editmesh_lib.c
branches/particles-2010/source/blender/editors/mesh/editmesh_tools.c
branches/particles-2010/source/blender/editors/mesh/mesh_ops.c
branches/particles-2010/source/blender/editors/metaball/mball_edit.c
branches/particles-2010/source/blender/editors/metaball/mball_ops.c
branches/particles-2010/source/blender/editors/object/object_add.c
branches/particles-2010/source/blender/editors/object/object_relations.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/physics/physics_fluid.c
branches/particles-2010/source/blender/editors/physics/physics_ops.c
branches/particles-2010/source/blender/editors/render/render_shading.c
branches/particles-2010/source/blender/editors/screen/area.c
branches/particles-2010/source/blender/editors/screen/screen_ops.c
branches/particles-2010/source/blender/editors/sculpt_paint/paint_vertex.c
branches/particles-2010/source/blender/editors/space_action/action_edit.c
branches/particles-2010/source/blender/editors/space_action/action_intern.h
branches/particles-2010/source/blender/editors/space_action/action_ops.c
branches/particles-2010/source/blender/editors/space_buttons/buttons_context.c
branches/particles-2010/source/blender/editors/space_buttons/space_buttons.c
branches/particles-2010/source/blender/editors/space_file/file_draw.c
branches/particles-2010/source/blender/editors/space_file/file_ops.c
branches/particles-2010/source/blender/editors/space_file/filelist.c
branches/particles-2010/source/blender/editors/space_file/filelist.h
branches/particles-2010/source/blender/editors/space_file/filesel.c
branches/particles-2010/source/blender/editors/space_file/space_file.c
branches/particles-2010/source/blender/editors/space_graph/graph_edit.c
branches/particles-2010/source/blender/editors/space_graph/graph_intern.h
branches/particles-2010/source/blender/editors/space_graph/graph_ops.c
branches/particles-2010/source/blender/editors/space_graph/space_graph.c
branches/particles-2010/source/blender/editors/space_image/image_ops.c
branches/particles-2010/source/blender/editors/space_nla/nla_edit.c
branches/particles-2010/source/blender/editors/space_node/node_buttons.c
branches/particles-2010/source/blender/editors/space_sequencer/sequencer_edit.c
branches/particles-2010/source/blender/editors/space_sequencer/sequencer_ops.c
branches/particles-2010/source/blender/editors/space_text/text_ops.c
branches/particles-2010/source/blender/editors/space_view3d/drawobject.c
branches/particles-2010/source/blender/editors/space_view3d/view3d_header.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_generics.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/util/undo.c
branches/particles-2010/source/blender/editors/uvedit/uvedit_ops.c
branches/particles-2010/source/blender/imbuf/intern/cineon/cineonlib.c
branches/particles-2010/source/blender/imbuf/intern/rotate.c
branches/particles-2010/source/blender/imbuf/intern/scaling.c
branches/particles-2010/source/blender/makesdna/DNA_modifier_types.h
branches/particles-2010/source/blender/makesdna/DNA_node_types.h
branches/particles-2010/source/blender/makesdna/DNA_space_types.h
branches/particles-2010/source/blender/makesdna/DNA_windowmanager_types.h
branches/particles-2010/source/blender/makesrna/RNA_enum_types.h
branches/particles-2010/source/blender/makesrna/intern/rna_access.c
branches/particles-2010/source/blender/makesrna/intern/rna_actuator.c
branches/particles-2010/source/blender/makesrna/intern/rna_fcurve.c
branches/particles-2010/source/blender/makesrna/intern/rna_lamp.c
branches/particles-2010/source/blender/makesrna/intern/rna_material.c
branches/particles-2010/source/blender/makesrna/intern/rna_nodetree.c
branches/particles-2010/source/blender/makesrna/intern/rna_object_api.c
branches/particles-2010/source/blender/makesrna/intern/rna_particle.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_collision.c
branches/particles-2010/source/blender/modifiers/intern/MOD_explode.c
branches/particles-2010/source/blender/nodes/intern/node_util.c
branches/particles-2010/source/blender/python/generic/IDProp.c
branches/particles-2010/source/blender/python/generic/bgl.c
branches/particles-2010/source/blender/python/generic/bpy_internal_import.c
branches/particles-2010/source/blender/python/generic/mathutils.c
branches/particles-2010/source/blender/python/generic/mathutils_Color.c
branches/particles-2010/source/blender/python/generic/mathutils_Euler.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/generic/noise_py_api.c
branches/particles-2010/source/blender/python/generic/py_capi_utils.c
branches/particles-2010/source/blender/python/intern/bpy.c
branches/particles-2010/source/blender/python/intern/bpy_app.c
branches/particles-2010/source/blender/python/intern/bpy_driver.c
branches/particles-2010/source/blender/python/intern/bpy_interface.c
branches/particles-2010/source/blender/python/intern/bpy_library.c
branches/particles-2010/source/blender/python/intern/bpy_operator.c
branches/particles-2010/source/blender/python/intern/bpy_operator_wrap.c
branches/particles-2010/source/blender/python/intern/bpy_props.c
branches/particles-2010/source/blender/python/intern/bpy_rna.c
branches/particles-2010/source/blender/python/intern/bpy_rna_anim.c
branches/particles-2010/source/blender/python/intern/bpy_rna_array.c
branches/particles-2010/source/blender/python/intern/bpy_rna_callback.c
branches/particles-2010/source/blender/python/intern/bpy_traceback.c
branches/particles-2010/source/blender/python/intern/bpy_util.c
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/pointdensity.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_window.c
branches/particles-2010/source/creator/CMakeLists.txt
branches/particles-2010/source/creator/creator.c
branches/particles-2010/source/darwin/blender.app/Contents/Info.plist
branches/particles-2010/source/darwin/blenderplayer.app/Contents/Info.plist
branches/particles-2010/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/particles-2010/source/gameengine/Converter/KX_BlenderSceneConverter.h
branches/particles-2010/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
branches/particles-2010/source/gameengine/Ketsji/KX_BulletPhysicsController.h
branches/particles-2010/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/particles-2010/source/gameengine/Ketsji/KX_PythonInit.h
branches/particles-2010/source/gameengine/Physics/Bullet/CcdPhysicsController.h
branches/particles-2010/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
branches/particles-2010/source/tests/CMakeLists.txt
branches/particles-2010/source/tests/batch_import.py
Added Paths:
-----------
branches/particles-2010/build_files/buildbot/
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/package_spec/build_archive.py
branches/particles-2010/source/tests/bl_load_addons.py
branches/particles-2010/source/tests/bl_load_py_modules.py
branches/particles-2010/source/tests/bl_run_operators.py
branches/particles-2010/source/tools/CTS/
branches/particles-2010/source/tools/CTS/FBlender.py
branches/particles-2010/source/tools/CTS/README.txt
branches/particles-2010/source/tools/CTS/empty.blend
Removed Paths:
-------------
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/source/darwin/blendercreator.app/
branches/particles-2010/source/darwin/blenderpublisher.app/
branches/particles-2010/source/tools/CTS/FBlender.py
branches/particles-2010/source/tools/CTS/README.txt
branches/particles-2010/source/tools/CTS/empty.blend
Property Changed:
----------------
branches/particles-2010/
branches/particles-2010/source/darwin/blender.app/Contents/Info.plist
branches/particles-2010/source/darwin/blenderplayer.app/Contents/Info.plist
Property changes on: branches/particles-2010
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:33741-35561
+ /trunk/blender:33741-35715
Modified: branches/particles-2010/CMakeLists.txt
===================================================================
--- branches/particles-2010/CMakeLists.txt 2011-03-23 01:50:14 UTC (rev 35715)
+++ branches/particles-2010/CMakeLists.txt 2011-03-23 08:01:54 UTC (rev 35716)
@@ -126,7 +126,6 @@
# Misc
option(WITH_RAYOPTIMIZATION "Enable use of SIMD (SSE) optimizations for the raytracer" ON)
-option(WITH_INSTALL "Install accompanying scripts and language files needed to run blender" ON)
if(UNIX AND NOT APPLE)
option(WITH_INSTALL_PORTABLE "Install redistributeable runtime, otherwise install into CMAKE_INSTALL_PREFIX" ON)
endif()
@@ -162,10 +161,6 @@
message(FATAL_ERROR "WITH_PLAYER requires WITH_GAMEENGINE")
endif()
-if(NOT WITH_INSTALL AND WITH_PYTHON_INSTALL)
- message("WARNING: WITH_PYTHON_INSTALL requires WITH_INSTALL")
-endif()
-
if(NOT WITH_SAMPLERATE AND (WITH_OPENAL OR WITH_SDL OR WITH_JACK))
message(FATAL_ERROR "WITH_OPENAL/WITH_SDL/WITH_JACK require WITH_SAMPLERATE")
endif()
@@ -183,6 +178,9 @@
message(FATAL_ERROR "WITH_PYTHON_MODULE requires WITH_PYTHON_INSTALL to be OFF")
endif()
+# remove old vars
+unset(WITH_INSTALL CACHE)
+
TEST_SSE_SUPPORT()
#-----------------------------------------------------------------------------
@@ -219,6 +217,11 @@
#Platform specifics
if(UNIX AND NOT APPLE)
+
+ # needed for ubuntu 11.04
+ if(EXISTS "/usr/lib/x86_64-linux-gnu")
+ set(CMAKE_LIBRARY_PATH "/usr/lib/x86_64-linux-gnu;${CMAKE_LIBRARY_PATH}")
+ endif()
if(WITH_OPENAL)
find_package(OpenAL)
@@ -1043,7 +1046,8 @@
ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ERROR_DECLARATION_AFTER_STATEMENT -Werror=declaration-after-statement)
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)
- ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ERROR_STRICT_PROTOTYPES -Werror=strict-prototypes)
+ # 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_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)
@@ -1066,6 +1070,13 @@
endif()
+if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+ if(WITH_IK_ITASC OR WITH_MOD_FLUID)
+ message(WARNING "Using Clang as CXX compiler: disabling WITH_IK_ITASC and WITH_MOD_FLUID, these features will be missing.")
+ set(WITH_IK_ITASC OFF)
+ set(WITH_MOD_FLUID OFF)
+ endif()
+endif()
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${PLATFORM_CFLAGS} ${C_WARNINGS}")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${PLATFORM_CFLAGS} ${CXX_WARNINGS}")
Modified: branches/particles-2010/GNUmakefile
===================================================================
--- branches/particles-2010/GNUmakefile 2011-03-23 01:50:14 UTC (rev 35715)
+++ branches/particles-2010/GNUmakefile 2011-03-23 08:01:54 UTC (rev 35716)
@@ -48,14 +48,11 @@
# Get the number of cores for threaded build
NPROCS:=1
-DEFAULT_TARGET=install
ifeq ($(OS), Linux)
NPROCS:=$(shell grep -c ^processor /proc/cpuinfo)
endif
ifeq ($(OS), Darwin)
NPROCS:=$(shell sysctl -a | grep "hw.ncpu " | cut -d" " -f3)
- # make install not support on mac yet
- DEFAULT_TARGET=
endif
ifeq ($(OS), FreeBSD)
NPROCS:=$(shell sysctl -a | grep "hw.ncpu " | cut -d" " -f3 )
@@ -78,7 +75,7 @@
@echo
@echo Building Blender ...
- cd $(BUILD_DIR) ; make -s -j $(NPROCS) ${DEFAULT_TARGET}
+ cd $(BUILD_DIR) ; make -s -j $(NPROCS) install
@echo
@echo run blender from "$(BUILD_DIR)/bin/blender"
@echo
@@ -93,6 +90,10 @@
package_pacman:
cd build_files/package_spec/pacman ; MAKEFLAGS="-j$(NPROCS)" makepkg --asroot
+package_archive:
+ cd $(BUILD_DIR) ; make -s package_archive
+ @echo archive in "$(BUILD_DIR)/release"
+
# forward build targets
test:
cd $(BUILD_DIR) ; ctest . --output-on-failure
Modified: branches/particles-2010/SConstruct
===================================================================
--- branches/particles-2010/SConstruct 2011-03-23 01:50:14 UTC (rev 35715)
+++ branches/particles-2010/SConstruct 2011-03-23 08:01:54 UTC (rev 35716)
@@ -669,7 +669,14 @@
Depends(nsiscmd, allinstall)
+buildslave_action = env.Action(btools.buildslave, btools.buildslave_print)
+buildslave_cmd = env.Command('buildslave_exec', None, buildslave_action)
+buildslave_alias = env.Alias('buildslave', buildslave_cmd)
+
+Depends(buildslave_cmd, allinstall)
+
Default(B.program_list)
if not env['WITHOUT_BF_INSTALL']:
Default(installtarget)
+
Deleted: branches/particles-2010/build_files/buildbot/master.cfg
===================================================================
--- trunk/blender/build_files/buildbot/master.cfg 2011-03-23 01:50:14 UTC (rev 35715)
+++ branches/particles-2010/build_files/buildbot/master.cfg 2011-03-23 08:01:54 UTC (rev 35716)
@@ -1,171 +0,0 @@
-# -*- python -*-
-# ex: set syntax=python:
-
-# Dictionary that the buildmaster pays attention to.
-c = BuildmasterConfig = {}
-
-# BUILD SLAVES
-#
-# We load the slaves and their passwords from a separator file, so we can have
-# this one in SVN.
-
-from buildbot.buildslave import BuildSlave
-import master_private
-
-c['slaves'] = []
-
-for slave in master_private.slaves:
- c['slaves'].append(BuildSlave(slave['name'], slave['password']))
-
-# TCP port through which slaves connect
-
-c['slavePortnum'] = 9989
-
-# CHANGE SOURCES
-
-from buildbot.changes.svnpoller import SVNPoller
-
-c['change_source'] = SVNPoller(
- 'https://svn.blender.org/svnroot/bf-blender/trunk/',
- pollinterval=1200)
-
-# BUILDERS
-#
-# The 'builders' list defines the Builders, which tell Buildbot how to perform a build:
-# what steps, and which slaves can execute them. Note that any particular build will
-# only take place on one slave.
-
-from buildbot.process.factory import BuildFactory
-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.master import MasterShellCommand
-from buildbot.config import BuilderConfig
-
-# add builder utility
-
-c['builders'] = []
-buildernames = []
-
-def add_builder(c, name, libdir, factory):
- slavenames = []
-
- for slave in master_private.slaves:
- if name in slave['builders']:
- slavenames.append(slave['name'])
-
- if len(slavenames) > 0:
- f = factory(name, libdir)
- 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 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=''):
- filename = 'buildbot_upload_' + id + '.zip'
- compile_script = '../blender/build_files/buildbot/slave_compile.py'
- test_script = '../blender/build_files/buildbot/slave_test.py'
- pack_script = '../blender/build_files/buildbot/slave_pack.py'
- unpack_script = 'master_unpack.py'
-
- f = BuildFactory()
- f.addStep(svn_step())
- 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'))
- if id.find('cmake') != -1:
- 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(MasterShellCommand(name='unpack', command=['python', unpack_script, filename], description='unpacking', descriptionDone='unpacked'))
- return f
-
-# 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, 'linux_x86_64_scons', '', generic_builder)
-add_builder(c, 'win32_scons', 'windows', generic_builder)
-
-# SCHEDULERS
-#
-# Decide how to react to incoming changes.
-
-from buildbot.scheduler import Scheduler
-from buildbot.schedulers import timed
-
-c['schedulers'] = []
-#c['schedulers'].append(Scheduler(name="all", branch=None,
-# treeStableTimer=None,
-# builderNames=[]))
-#c['schedulers'].append(timed.Periodic(name="nightly",
-# builderNames=buildernames,
-# periodicBuildTimer=24*60*60))
-
-c['schedulers'].append(timed.Nightly(name='nightly',
- builderNames=buildernames,
- hour=3,
- minute=0))
-
-# STATUS TARGETS
-#
-# 'status' is a list of Status Targets. The results of each build will be
-# pushed to these targets. buildbot/status/*.py has a variety to choose from,
-# including web pages, email senders, and IRC bots.
-
-c['status'] = []
-
-from buildbot.status import html
-from buildbot.status.web import auth, 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,
-)
-
-c['status'].append(html.WebStatus(http_port=8010, authz=authz_cfg))
-
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list