[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37208] branches/soc-2011-onion: Merged with trunk: 37055-37206
Jason Wilkins
Jason.A.Wilkins at gmail.com
Sun Jun 5 15:44:55 CEST 2011
Revision: 37208
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37208
Author: jwilkins
Date: 2011-06-05 13:44:55 +0000 (Sun, 05 Jun 2011)
Log Message:
-----------
Merged with trunk: 37055-37206
Modified Paths:
--------------
branches/soc-2011-onion/CMakeLists.txt
branches/soc-2011-onion/build_files/buildbot/master.cfg
branches/soc-2011-onion/build_files/buildbot/master_unpack.py
branches/soc-2011-onion/build_files/buildbot/slave_compile.py
branches/soc-2011-onion/build_files/buildbot/slave_pack.py
branches/soc-2011-onion/build_files/scons/tools/btools.py
branches/soc-2011-onion/doc/manpage/blender.1
branches/soc-2011-onion/extern/glew/include/GL/glew.h
branches/soc-2011-onion/extern/glew/include/GL/glxew.h
branches/soc-2011-onion/extern/glew/include/GL/wglew.h
branches/soc-2011-onion/extern/glew/src/glew.c
branches/soc-2011-onion/intern/ghost/CMakeLists.txt
branches/soc-2011-onion/intern/ghost/intern/GHOST_ISystem.cpp
branches/soc-2011-onion/intern/ghost/intern/GHOST_NDOFManager.cpp
branches/soc-2011-onion/release/scripts/modules/bpy_extras/io_utils.py
branches/soc-2011-onion/release/scripts/startup/bl_ui/properties_data_curve.py
branches/soc-2011-onion/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/soc-2011-onion/release/scripts/startup/bl_ui/properties_data_metaball.py
branches/soc-2011-onion/release/scripts/startup/bl_ui/space_userpref.py
branches/soc-2011-onion/release/scripts/startup/bl_ui/space_userpref_keymap.py
branches/soc-2011-onion/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2011-onion/release/windows/installer/00.sconsblender.nsi
branches/soc-2011-onion/source/blender/blenkernel/BKE_blender.h
branches/soc-2011-onion/source/blender/blenkernel/BKE_global.h
branches/soc-2011-onion/source/blender/blenkernel/BKE_texture.h
branches/soc-2011-onion/source/blender/blenkernel/intern/blender.c
branches/soc-2011-onion/source/blender/blenkernel/intern/multires.c
branches/soc-2011-onion/source/blender/blenkernel/intern/node.c
branches/soc-2011-onion/source/blender/blenkernel/intern/particle.c
branches/soc-2011-onion/source/blender/blenkernel/intern/seqeffects.c
branches/soc-2011-onion/source/blender/blenkernel/intern/sequencer.c
branches/soc-2011-onion/source/blender/blenkernel/intern/texture.c
branches/soc-2011-onion/source/blender/blenlib/intern/path_util.c
branches/soc-2011-onion/source/blender/blenloader/intern/readfile.c
branches/soc-2011-onion/source/blender/blenloader/intern/writefile.c
branches/soc-2011-onion/source/blender/editors/datafiles/CMakeLists.txt
branches/soc-2011-onion/source/blender/editors/include/ED_particle.h
branches/soc-2011-onion/source/blender/editors/include/ED_screen.h
branches/soc-2011-onion/source/blender/editors/include/ED_types.h
branches/soc-2011-onion/source/blender/editors/include/ED_util.h
branches/soc-2011-onion/source/blender/editors/include/UI_interface.h
branches/soc-2011-onion/source/blender/editors/interface/CMakeLists.txt
branches/soc-2011-onion/source/blender/editors/interface/interface.c
branches/soc-2011-onion/source/blender/editors/interface/interface_draw.c
branches/soc-2011-onion/source/blender/editors/interface/interface_handlers.c
branches/soc-2011-onion/source/blender/editors/interface/interface_icons.c
branches/soc-2011-onion/source/blender/editors/interface/interface_intern.h
branches/soc-2011-onion/source/blender/editors/interface/interface_panel.c
branches/soc-2011-onion/source/blender/editors/interface/interface_regions.c
branches/soc-2011-onion/source/blender/editors/interface/interface_templates.c
branches/soc-2011-onion/source/blender/editors/interface/interface_widgets.c
branches/soc-2011-onion/source/blender/editors/interface/resources.c
branches/soc-2011-onion/source/blender/editors/object/object_add.c
branches/soc-2011-onion/source/blender/editors/physics/particle_edit.c
branches/soc-2011-onion/source/blender/editors/screen/area.c
branches/soc-2011-onion/source/blender/editors/screen/screen_edit.c
branches/soc-2011-onion/source/blender/editors/screen/screen_ops.c
branches/soc-2011-onion/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2011-onion/source/blender/editors/space_action/space_action.c
branches/soc-2011-onion/source/blender/editors/space_api/spacetypes.c
branches/soc-2011-onion/source/blender/editors/space_buttons/buttons_header.c
branches/soc-2011-onion/source/blender/editors/space_file/CMakeLists.txt
branches/soc-2011-onion/source/blender/editors/space_file/file_draw.c
branches/soc-2011-onion/source/blender/editors/space_file/file_intern.h
branches/soc-2011-onion/source/blender/editors/space_file/filelist.c
branches/soc-2011-onion/source/blender/editors/space_node/space_node.c
branches/soc-2011-onion/source/blender/editors/space_script/script_header.c
branches/soc-2011-onion/source/blender/editors/space_sound/sound_header.c
branches/soc-2011-onion/source/blender/editors/space_view3d/view3d_header.c
branches/soc-2011-onion/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2011-onion/source/blender/editors/util/editmode_undo.c
branches/soc-2011-onion/source/blender/editors/util/undo.c
branches/soc-2011-onion/source/blender/editors/util/util_intern.h
branches/soc-2011-onion/source/blender/editors/uvedit/uvedit_parametrizer.c
branches/soc-2011-onion/source/blender/imbuf/intern/targa.c
branches/soc-2011-onion/source/blender/makesdna/DNA_screen_types.h
branches/soc-2011-onion/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2011-onion/source/blender/makesrna/intern/rna_actuator.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_internal.h
branches/soc-2011-onion/source/blender/makesrna/intern/rna_lamp.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_material.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_object.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_particle.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_sequencer.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_world.c
branches/soc-2011-onion/source/blender/modifiers/CMakeLists.txt
branches/soc-2011-onion/source/blender/modifiers/intern/MOD_none.c
branches/soc-2011-onion/source/blender/python/BPY_extern.h
branches/soc-2011-onion/source/blender/python/generic/bgl.c
branches/soc-2011-onion/source/blender/python/generic/bgl.h
branches/soc-2011-onion/source/blender/python/generic/bpy_internal_import.c
branches/soc-2011-onion/source/blender/python/generic/mathutils_Color.c
branches/soc-2011-onion/source/blender/python/generic/mathutils_Euler.c
branches/soc-2011-onion/source/blender/python/generic/mathutils_Matrix.c
branches/soc-2011-onion/source/blender/python/generic/mathutils_Vector.c
branches/soc-2011-onion/source/blender/python/generic/mathutils_geometry.c
branches/soc-2011-onion/source/blender/python/intern/bpy.c
branches/soc-2011-onion/source/blender/python/intern/bpy.h
branches/soc-2011-onion/source/blender/python/intern/bpy_app.h
branches/soc-2011-onion/source/blender/python/intern/bpy_driver.c
branches/soc-2011-onion/source/blender/python/intern/bpy_library.c
branches/soc-2011-onion/source/blender/python/intern/bpy_props.c
branches/soc-2011-onion/source/blender/python/intern/bpy_props.h
branches/soc-2011-onion/source/blender/python/intern/bpy_rna.c
branches/soc-2011-onion/source/blender/python/intern/bpy_rna.h
branches/soc-2011-onion/source/blender/render/intern/source/pointdensity.c
branches/soc-2011-onion/source/blender/windowmanager/CMakeLists.txt
branches/soc-2011-onion/source/blender/windowmanager/intern/wm_files.c
branches/soc-2011-onion/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2011-onion/source/blender/windowmanager/intern/wm_window.c
branches/soc-2011-onion/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
branches/soc-2011-onion/source/creator/CMakeLists.txt
branches/soc-2011-onion/source/creator/creator.c
branches/soc-2011-onion/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
Added Paths:
-----------
branches/soc-2011-onion/intern/ghost/intern/GHOST_DisplayManagerNULL.h
branches/soc-2011-onion/intern/ghost/intern/GHOST_SystemNULL.h
branches/soc-2011-onion/intern/ghost/intern/GHOST_WindowNULL.h
Property Changed:
----------------
branches/soc-2011-onion/
Property changes on: branches/soc-2011-onion
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-29913
/trunk/blender:36833-37054
+ /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-29913
/trunk/blender:36833-37206
Modified: branches/soc-2011-onion/CMakeLists.txt
===================================================================
--- branches/soc-2011-onion/CMakeLists.txt 2011-06-05 13:20:30 UTC (rev 37207)
+++ branches/soc-2011-onion/CMakeLists.txt 2011-06-05 13:44:55 UTC (rev 37208)
@@ -98,6 +98,10 @@
option(WITH_BULLET "Enable Bullet (Physics Engine)" ON)
option(WITH_GAMEENGINE "Enable Game Engine" ON)
option(WITH_PLAYER "Build Player" OFF)
+
+option(WITH_HEADLESS "Build without graphical support (renderfarm, server mode only)" OFF)
+mark_as_advanced(WITH_HEADLESS)
+
# (unix defaults to OpenMP On)
if(UNIX AND NOT APPLE)
option(WITH_OPENMP "Enable OpenMP (has to be supported by the compiler)" ON)
@@ -206,6 +210,11 @@
message(FATAL_ERROR "WITH_PYTHON_MODULE requires WITH_PYTHON_INSTALL to be OFF")
endif()
+# may as well build python module without a UI
+if(WITH_PYTHON_MODULE)
+ set(WITH_HEADLESS ON)
+endif()
+
# remove old vars
unset(WITH_INSTALL CACHE)
@@ -410,15 +419,19 @@
unset(JEMALLOC)
endif()
- find_package(X11 REQUIRED)
- find_path(X11_XF86keysym_INCLUDE_PATH X11/XF86keysym.h ${X11_INC_SEARCH_PATH})
- mark_as_advanced(X11_XF86keysym_INCLUDE_PATH)
-
# OpenSuse needs lutil, ArchLinux not, for now keep, can avoid by using --as-needed
- set(LLIBS "-lutil -lc -lm -lpthread -lstdc++ ${X11_X11_LIB}")
+ set(LLIBS "-lutil -lc -lm -lpthread -lstdc++")
- if(WITH_X11_XINPUT)
- list(APPEND LLIBS ${X11_Xinput_LIB})
+ if(NOT WITH_HEADLESS)
+ find_package(X11 REQUIRED)
+ find_path(X11_XF86keysym_INCLUDE_PATH X11/XF86keysym.h ${X11_INC_SEARCH_PATH})
+ mark_as_advanced(X11_XF86keysym_INCLUDE_PATH)
+
+ list(APPEND LLIBS ${X11_X11_LIB})
+
+ if(WITH_X11_XINPUT)
+ list(APPEND LLIBS ${X11_Xinput_LIB})
+ endif()
endif()
if(CMAKE_SYSTEM_NAME MATCHES "Linux")
Modified: branches/soc-2011-onion/build_files/buildbot/master.cfg
===================================================================
--- branches/soc-2011-onion/build_files/buildbot/master.cfg 2011-06-05 13:20:30 UTC (rev 37207)
+++ branches/soc-2011-onion/build_files/buildbot/master.cfg 2011-06-05 13:44:55 UTC (rev 37208)
@@ -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-onion/build_files/buildbot/master_unpack.py
===================================================================
--- branches/soc-2011-onion/build_files/buildbot/master_unpack.py 2011-06-05 13:20:30 UTC (rev 37207)
+++ branches/soc-2011-onion/build_files/buildbot/master_unpack.py 2011-06-05 13:44:55 UTC (rev 37208)
@@ -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-onion/build_files/buildbot/slave_compile.py
===================================================================
--- branches/soc-2011-onion/build_files/buildbot/slave_compile.py 2011-06-05 13:20:30 UTC (rev 37207)
+++ branches/soc-2011-onion/build_files/buildbot/slave_compile.py 2011-06-05 13:44:55 UTC (rev 37208)
@@ -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-onion/build_files/buildbot/slave_pack.py
===================================================================
--- branches/soc-2011-onion/build_files/buildbot/slave_pack.py 2011-06-05 13:20:30 UTC (rev 37207)
+++ branches/soc-2011-onion/build_files/buildbot/slave_pack.py 2011-06-05 13:44:55 UTC (rev 37208)
@@ -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')
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list