[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40312] branches/soc-2011-radish: svn merge -r40197:40311 ^/trunk/blender
Campbell Barton
ideasman42 at gmail.com
Sun Sep 18 04:35:31 CEST 2011
Revision: 40312
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40312
Author: campbellbarton
Date: 2011-09-18 02:35:26 +0000 (Sun, 18 Sep 2011)
Log Message:
-----------
svn merge -r40197:40311 ^/trunk/blender
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40197
Modified Paths:
--------------
branches/soc-2011-radish/CMakeLists.txt
branches/soc-2011-radish/GNUmakefile
branches/soc-2011-radish/SConstruct
branches/soc-2011-radish/build_files/scons/config/win64-vc-config.py
branches/soc-2011-radish/doc/python_api/examples/bpy.types.ID.user_clear.1.py
branches/soc-2011-radish/doc/python_api/rst/info_tips_and_tricks.rst
branches/soc-2011-radish/doc/python_api/sphinx_doc_gen.py
branches/soc-2011-radish/doc/python_api/sphinx_doc_gen.sh
branches/soc-2011-radish/extern/recastnavigation/Recast/Source/RecastMeshDetail.cpp
branches/soc-2011-radish/release/scripts/modules/rna_info.py
branches/soc-2011-radish/source/blender/blenfont/intern/blf.c
branches/soc-2011-radish/source/blender/blenfont/intern/blf_font.c
branches/soc-2011-radish/source/blender/blenfont/intern/blf_glyph.c
branches/soc-2011-radish/source/blender/blenfont/intern/blf_internal_types.h
branches/soc-2011-radish/source/blender/blenkernel/intern/action.c
branches/soc-2011-radish/source/blender/blenkernel/intern/anim.c
branches/soc-2011-radish/source/blender/blenkernel/intern/armature.c
branches/soc-2011-radish/source/blender/blenkernel/intern/collision.c
branches/soc-2011-radish/source/blender/blenkernel/intern/constraint.c
branches/soc-2011-radish/source/blender/blenkernel/intern/curve.c
branches/soc-2011-radish/source/blender/blenkernel/intern/effect.c
branches/soc-2011-radish/source/blender/blenkernel/intern/image.c
branches/soc-2011-radish/source/blender/blenkernel/intern/ipo.c
branches/soc-2011-radish/source/blender/blenkernel/intern/navmesh_conversion.cpp
branches/soc-2011-radish/source/blender/blenkernel/intern/node.c
branches/soc-2011-radish/source/blender/blenkernel/intern/object.c
branches/soc-2011-radish/source/blender/blenkernel/intern/particle.c
branches/soc-2011-radish/source/blender/blenkernel/intern/screen.c
branches/soc-2011-radish/source/blender/blenkernel/intern/seqeffects.c
branches/soc-2011-radish/source/blender/blenkernel/intern/unit.c
branches/soc-2011-radish/source/blender/blenlib/BLI_string.h
branches/soc-2011-radish/source/blender/blenlib/BLI_voxel.h
branches/soc-2011-radish/source/blender/blenlib/CMakeLists.txt
branches/soc-2011-radish/source/blender/blenlib/intern/string.c
branches/soc-2011-radish/source/blender/blenlib/intern/voxel.c
branches/soc-2011-radish/source/blender/blenloader/intern/readfile.c
branches/soc-2011-radish/source/blender/collada/AnimationExporter.cpp
branches/soc-2011-radish/source/blender/collada/AnimationImporter.cpp
branches/soc-2011-radish/source/blender/collada/CameraExporter.cpp
branches/soc-2011-radish/source/blender/collada/DocumentImporter.cpp
branches/soc-2011-radish/source/blender/collada/TransformReader.cpp
branches/soc-2011-radish/source/blender/collada/TransformWriter.cpp
branches/soc-2011-radish/source/blender/editors/animation/anim_draw.c
branches/soc-2011-radish/source/blender/editors/animation/anim_filter.c
branches/soc-2011-radish/source/blender/editors/animation/keyframes_edit.c
branches/soc-2011-radish/source/blender/editors/armature/editarmature.c
branches/soc-2011-radish/source/blender/editors/armature/poselib.c
branches/soc-2011-radish/source/blender/editors/curve/curve_ops.c
branches/soc-2011-radish/source/blender/editors/gpencil/gpencil_paint.c
branches/soc-2011-radish/source/blender/editors/interface/interface.c
branches/soc-2011-radish/source/blender/editors/interface/interface_draw.c
branches/soc-2011-radish/source/blender/editors/interface/interface_regions.c
branches/soc-2011-radish/source/blender/editors/object/object_modifier.c
branches/soc-2011-radish/source/blender/editors/object/object_navmesh.cpp
branches/soc-2011-radish/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2011-radish/source/blender/editors/sculpt_paint/paint_stroke.c
branches/soc-2011-radish/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2011-radish/source/blender/editors/sound/sound_intern.h
branches/soc-2011-radish/source/blender/editors/sound/sound_ops.c
branches/soc-2011-radish/source/blender/editors/space_action/action_edit.c
branches/soc-2011-radish/source/blender/editors/space_action/action_select.c
branches/soc-2011-radish/source/blender/editors/space_console/console_ops.c
branches/soc-2011-radish/source/blender/editors/space_console/space_console.c
branches/soc-2011-radish/source/blender/editors/space_file/file_ops.c
branches/soc-2011-radish/source/blender/editors/space_graph/graph_edit.c
branches/soc-2011-radish/source/blender/editors/space_graph/graph_select.c
branches/soc-2011-radish/source/blender/editors/space_node/drawnode.c
branches/soc-2011-radish/source/blender/editors/space_outliner/outliner_draw.c
branches/soc-2011-radish/source/blender/editors/space_outliner/outliner_edit.c
branches/soc-2011-radish/source/blender/editors/space_outliner/outliner_tools.c
branches/soc-2011-radish/source/blender/editors/space_outliner/outliner_tree.c
branches/soc-2011-radish/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2011-radish/source/blender/editors/space_view3d/drawobject.c
branches/soc-2011-radish/source/blender/editors/space_view3d/view3d_buttons.c
branches/soc-2011-radish/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2011-radish/source/blender/editors/transform/transform.c
branches/soc-2011-radish/source/blender/editors/transform/transform_generics.c
branches/soc-2011-radish/source/blender/editors/uvedit/uvedit_draw.c
branches/soc-2011-radish/source/blender/gpu/intern/gpu_buffers.c
branches/soc-2011-radish/source/blender/gpu/intern/gpu_extensions.c
branches/soc-2011-radish/source/blender/imbuf/intern/filter.c
branches/soc-2011-radish/source/blender/imbuf/intern/indexer.c
branches/soc-2011-radish/source/blender/imbuf/intern/iris.c
branches/soc-2011-radish/source/blender/imbuf/intern/jp2.c
branches/soc-2011-radish/source/blender/makesdna/DNA_action_types.h
branches/soc-2011-radish/source/blender/makesdna/DNA_node_types.h
branches/soc-2011-radish/source/blender/makesrna/intern/makesrna.c
branches/soc-2011-radish/source/blender/makesrna/intern/rna_ID.c
branches/soc-2011-radish/source/blender/makesrna/intern/rna_action.c
branches/soc-2011-radish/source/blender/makesrna/intern/rna_actuator.c
branches/soc-2011-radish/source/blender/makesrna/intern/rna_animation.c
branches/soc-2011-radish/source/blender/makesrna/intern/rna_armature.c
branches/soc-2011-radish/source/blender/makesrna/intern/rna_constraint.c
branches/soc-2011-radish/source/blender/makesrna/intern/rna_fcurve.c
branches/soc-2011-radish/source/blender/makesrna/intern/rna_key.c
branches/soc-2011-radish/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2011-radish/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2011-radish/source/blender/makesrna/intern/rna_nla.c
branches/soc-2011-radish/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2011-radish/source/blender/makesrna/intern/rna_object.c
branches/soc-2011-radish/source/blender/makesrna/intern/rna_pose.c
branches/soc-2011-radish/source/blender/makesrna/intern/rna_property.c
branches/soc-2011-radish/source/blender/makesrna/intern/rna_scene.c
branches/soc-2011-radish/source/blender/makesrna/intern/rna_sequencer.c
branches/soc-2011-radish/source/blender/makesrna/intern/rna_text.c
branches/soc-2011-radish/source/blender/makesrna/intern/rna_texture.c
branches/soc-2011-radish/source/blender/makesrna/intern/rna_texture_api.c
branches/soc-2011-radish/source/blender/makesrna/intern/rna_wm.c
branches/soc-2011-radish/source/blender/modifiers/intern/MOD_warp.c
branches/soc-2011-radish/source/blender/modifiers/intern/MOD_weightvg_util.c
branches/soc-2011-radish/source/blender/modifiers/intern/MOD_weightvg_util.h
branches/soc-2011-radish/source/blender/modifiers/intern/MOD_weightvgedit.c
branches/soc-2011-radish/source/blender/modifiers/intern/MOD_weightvgmix.c
branches/soc-2011-radish/source/blender/modifiers/intern/MOD_weightvgproximity.c
branches/soc-2011-radish/source/blender/nodes/composite/node_composite_tree.c
branches/soc-2011-radish/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
branches/soc-2011-radish/source/blender/python/generic/py_capi_utils.c
branches/soc-2011-radish/source/blender/python/generic/py_capi_utils.h
branches/soc-2011-radish/source/blender/python/intern/bpy_app_handlers.c
branches/soc-2011-radish/source/blender/python/intern/bpy_rna.c
branches/soc-2011-radish/source/blender/python/intern/gpu.c
branches/soc-2011-radish/source/blender/render/intern/include/voxeldata.h
branches/soc-2011-radish/source/blender/render/intern/raytrace/rayobject_octree.cpp
branches/soc-2011-radish/source/blender/render/intern/source/convertblender.c
branches/soc-2011-radish/source/blender/render/intern/source/envmap.c
branches/soc-2011-radish/source/blender/render/intern/source/pipeline.c
branches/soc-2011-radish/source/blender/render/intern/source/rendercore.c
branches/soc-2011-radish/source/blender/render/intern/source/shadeinput.c
branches/soc-2011-radish/source/blender/render/intern/source/volumetric.c
branches/soc-2011-radish/source/blender/render/intern/source/voxeldata.c
branches/soc-2011-radish/source/blender/render/intern/source/zbuf.c
branches/soc-2011-radish/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2011-radish/source/creator/CMakeLists.txt
branches/soc-2011-radish/source/creator/creator.c
branches/soc-2011-radish/source/gameengine/Converter/BL_ArmatureObject.cpp
branches/soc-2011-radish/source/gameengine/Ketsji/KX_Dome.cpp
branches/soc-2011-radish/source/gameengine/Ketsji/KX_GameObject.cpp
branches/soc-2011-radish/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/soc-2011-radish/source/gameengine/Ketsji/KX_Scene.cpp
Added Paths:
-----------
branches/soc-2011-radish/build_files/cmake/cmake_static_check_cppcheck.py
branches/soc-2011-radish/build_files/cmake/cmake_static_check_sparse.py
branches/soc-2011-radish/build_files/cmake/cmake_static_check_splint.py
branches/soc-2011-radish/build_files/cmake/project_source_info.py
branches/soc-2011-radish/source/blender/blenlib/intern/string_utf8.c
Property Changed:
----------------
branches/soc-2011-radish/
branches/soc-2011-radish/intern/audaspace/OpenAL/
branches/soc-2011-radish/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-radish
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:40001-40197
+ /trunk/blender:40001-40311
Modified: branches/soc-2011-radish/CMakeLists.txt
===================================================================
--- branches/soc-2011-radish/CMakeLists.txt 2011-09-18 01:34:53 UTC (rev 40311)
+++ branches/soc-2011-radish/CMakeLists.txt 2011-09-18 02:35:26 UTC (rev 40312)
@@ -642,11 +642,7 @@
set(GETTEXT ${LIBDIR}/gettext)
set(GETTEXT_INC ${GETTEXT}/include)
set(GETTEXT_LIBPATH ${GETTEXT}/lib)
- if(CMAKE_CL_64)
- set(GETTEXT_LIB gettext)
- else()
- set(GETTEXT_LIB gnu_gettext)
- endif()
+ set(GETTEXT_LIB gnu_gettext)
endif()
if(CMAKE_CL_64)
Modified: branches/soc-2011-radish/GNUmakefile
===================================================================
--- branches/soc-2011-radish/GNUmakefile 2011-09-18 01:34:53 UTC (rev 40311)
+++ branches/soc-2011-radish/GNUmakefile 2011-09-18 02:35:26 UTC (rev 40312)
@@ -126,6 +126,11 @@
@echo " * test_pep8 - checks all python script are pep8 which are tagged to use the stricter formatting"
@echo " * test_deprecated - checks for deprecation tags in our code which may need to be removed"
@echo ""
+ @echo "Static Source Code Checking (not assosiated with building blender)"
+ @echo " * check_cppcheck - run blender source through cppcheck (C & C++)"
+ @echo " * check_splint - run blenders source through splint (C only)"
+ @echo " * check_sparse - run blenders source through sparse (C only)"
+ @echo ""
# -----------------------------------------------------------------------------
# Packages
@@ -176,6 +181,20 @@
cmake -G"Eclipse CDT4 - Unix Makefiles" -H$(BLENDER_DIR) -B$(BUILD_DIR)
+# -----------------------------------------------------------------------------
+# Static Checking
+#
+
+check_cppcheck:
+ cd $(BUILD_DIR) ; python3 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_cppcheck.py
+
+check_splint:
+ cd $(BUILD_DIR) ; python3 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_splint.py
+
+check_sparse:
+ cd $(BUILD_DIR) ; python3 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_sparse.py
+
+
clean:
$(MAKE) -C $(BUILD_DIR) clean
Modified: branches/soc-2011-radish/SConstruct
===================================================================
--- branches/soc-2011-radish/SConstruct 2011-09-18 01:34:53 UTC (rev 40311)
+++ branches/soc-2011-radish/SConstruct 2011-09-18 02:35:26 UTC (rev 40312)
@@ -645,7 +645,7 @@
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-vc', 'linuxcross'):
dllsources = []
- if not env['OURPLATFORM'] in ('win32-mingw', 'win64-vc', 'linuxcross'):
+ if not env['OURPLATFORM'] in ('win32-mingw', 'linuxcross'):
# For MinGW and linuxcross static linking will be used
dllsources += ['${LCGDIR}/gettext/lib/gnu_gettext.dll']
Copied: branches/soc-2011-radish/build_files/cmake/cmake_static_check_cppcheck.py (from rev 40311, trunk/blender/build_files/cmake/cmake_static_check_cppcheck.py)
===================================================================
--- branches/soc-2011-radish/build_files/cmake/cmake_static_check_cppcheck.py (rev 0)
+++ branches/soc-2011-radish/build_files/cmake/cmake_static_check_cppcheck.py 2011-09-18 02:35:26 UTC (rev 40312)
@@ -0,0 +1,76 @@
+#!/usr/bin/env python
+
+# $Id$
+# ***** BEGIN GPL LICENSE BLOCK *****
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# Contributor(s): Campbell Barton
+#
+# ***** END GPL LICENSE BLOCK *****
+
+# <pep8 compliant>
+
+import project_source_info
+import subprocess
+import sys
+import os
+
+CHECKER_IGNORE_PREFIX = [
+ "extern",
+ "intern/moto",
+ ]
+
+CHECKER_BIN = "cppcheck"
+
+CHECKER_ARGS = [
+ # not sure why this is needed, but it is.
+ "-I" + os.path.join(project_source_info.SOURCE_DIR, "extern/glew/include"),
+
+ # "--check-config", # when includes are missing
+ # "--enable=all", # if you want sixty hundred pedantic suggestions
+ ]
+
+def main():
+ source_info = project_source_info.build_info(ignore_prefix_list=CHECKER_IGNORE_PREFIX)
+
+ check_commands = []
+ for c, inc_dirs, defs in source_info:
+ cmd = ([CHECKER_BIN] +
+ CHECKER_ARGS +
+ [c] +
+ [("-I%s" % i) for i in inc_dirs] +
+ [("-D%s" % d) for d in defs]
+ )
+
+ check_commands.append((c, cmd))
+
+ for i, (c, cmd) in enumerate(check_commands):
+ percent = 100.0 * (i / (len(check_commands)-1))
+ percent_str = "[" + ("%.2f]" % percent).rjust(7) + " %:"
+
+ # if percent < 27.9:
+ # continue
+
+ # let cppcheck finish the line off...
+ sys.stdout.write("%s " % percent_str)
+
+ sys.stdout.flush()
+ process = subprocess.Popen(cmd)
+ process.wait()
+
+
+if __name__ == "__main__":
+ main()
Copied: branches/soc-2011-radish/build_files/cmake/cmake_static_check_sparse.py (from rev 40311, trunk/blender/build_files/cmake/cmake_static_check_sparse.py)
===================================================================
--- branches/soc-2011-radish/build_files/cmake/cmake_static_check_sparse.py (rev 0)
+++ branches/soc-2011-radish/build_files/cmake/cmake_static_check_sparse.py 2011-09-18 02:35:26 UTC (rev 40312)
@@ -0,0 +1,66 @@
+#!/usr/bin/env python
+
+# $Id$
+# ***** BEGIN GPL LICENSE BLOCK *****
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# Contributor(s): Campbell Barton
+#
+# ***** END GPL LICENSE BLOCK *****
+
+# <pep8 compliant>
+
+CHECKER_IGNORE_PREFIX = [
+ "extern",
+ "intern/moto",
+ ]
+
+CHECKER_BIN = "sparse"
+CHECKER_ARGS = [
+ ]
+
+import project_source_info
+import subprocess
+import sys
+
+
+def main():
+ source_info = project_source_info.build_info(use_cxx=False, ignore_prefix_list=CHECKER_IGNORE_PREFIX)
+
+ check_commands = []
+ for c, inc_dirs, defs in source_info:
+
+ cmd = ([CHECKER_BIN] +
+ CHECKER_ARGS +
+ [c] +
+ [("-I%s" % i) for i in inc_dirs] +
+ [("-D%s" % d) for d in defs]
+ )
+
+ check_commands.append((c, cmd))
+
+ for i, (c, cmd) in enumerate(check_commands):
+ percent = 100.0 * (i / (len(check_commands) - 1))
+ percent_str = "[" + ("%.2f]" % percent).rjust(7) + " %:"
+
+ sys.stdout.write("%s %s\n" % (percent_str, c))
+ sys.stdout.flush()
+
+ process = subprocess.Popen(cmd)
+ process.wait()
+
+if __name__ == "__main__":
+ main()
Copied: branches/soc-2011-radish/build_files/cmake/cmake_static_check_splint.py (from rev 40311, trunk/blender/build_files/cmake/cmake_static_check_splint.py)
===================================================================
--- branches/soc-2011-radish/build_files/cmake/cmake_static_check_splint.py (rev 0)
+++ branches/soc-2011-radish/build_files/cmake/cmake_static_check_splint.py 2011-09-18 02:35:26 UTC (rev 40312)
@@ -0,0 +1,94 @@
+#!/usr/bin/env python
+
+# $Id$
+# ***** BEGIN GPL LICENSE BLOCK *****
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# Contributor(s): Campbell Barton
+#
+# ***** END GPL LICENSE BLOCK *****
+
+# <pep8 compliant>
+
+CHECKER_IGNORE_PREFIX = [
+ "extern",
+ "intern/moto",
+ ]
+
+CHECKER_BIN = "splint"
+
+CHECKER_ARGS = [
+ "-weak",
+ "-posix-lib",
+ "-linelen", "10000",
+ "+ignorequals",
+ "+relaxtypes",
+ "-retvalother",
+ "+matchanyintegral",
+ "+longintegral",
+ "+ignoresigns",
+ "-nestcomment",
+ "-predboolothers",
+ "-ifempty",
+ "-unrecogcomments",
+
+ # we may want to remove these later
+ "-type",
+ "-fixedformalarray",
+ "-fullinitblock",
+ "-fcnuse",
+ "-initallelements",
+ "-castfcnptr",
+ # -forcehints,
+ "-bufferoverflowhigh", # warns a lot about sprintf()
+
+ # re-definitions, rna causes most of these
+ "-redef",
+ "-syntax",
+ ]
+
+
+import project_source_info
+import subprocess
+import sys
+
+
+def main():
+ source_info = project_source_info.build_info(use_cxx=False, ignore_prefix_list=CHECKER_IGNORE_PREFIX)
+
+ check_commands = []
+ for c, inc_dirs, defs in source_info:
+ cmd = ([CHECKER_BIN] +
+ CHECKER_ARGS +
+ [c] +
+ [("-I%s" % i) for i in inc_dirs] +
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list