[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38517] branches/soc-2011-salad: Merging r38432 through r38516 from trunk into soc-2011-salad
Sergey Sharybin
g.ulairi at gmail.com
Tue Jul 19 22:19:46 CEST 2011
Revision: 38517
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38517
Author: nazgul
Date: 2011-07-19 20:19:45 +0000 (Tue, 19 Jul 2011)
Log Message:
-----------
Merging r38432 through r38516 from trunk into soc-2011-salad
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38432
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38516
Modified Paths:
--------------
branches/soc-2011-salad/GNUmakefile
branches/soc-2011-salad/build_files/cmake/cmake_consistency_check.py
branches/soc-2011-salad/extern/binreloc/CMakeLists.txt
branches/soc-2011-salad/extern/eltopo/CMakeLists.txt
branches/soc-2011-salad/extern/glew/CMakeLists.txt
branches/soc-2011-salad/extern/lzo/CMakeLists.txt
branches/soc-2011-salad/intern/audaspace/CMakeLists.txt
branches/soc-2011-salad/intern/boolop/CMakeLists.txt
branches/soc-2011-salad/intern/bsp/CMakeLists.txt
branches/soc-2011-salad/intern/ffmpeg/ffmpeg_compat.h
branches/soc-2011-salad/intern/ghost/CMakeLists.txt
branches/soc-2011-salad/intern/ghost/intern/GHOST_SystemX11.cpp
branches/soc-2011-salad/intern/smoke/CMakeLists.txt
branches/soc-2011-salad/release/scripts/modules/addon_utils.py
branches/soc-2011-salad/release/scripts/modules/bpy/path.py
branches/soc-2011-salad/release/scripts/modules/bpy_extras/io_utils.py
branches/soc-2011-salad/release/scripts/startup/bl_operators/object_align.py
branches/soc-2011-salad/release/scripts/startup/bl_operators/uvcalc_smart_project.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/properties_material.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/space_userpref.py
branches/soc-2011-salad/source/blender/avi/CMakeLists.txt
branches/soc-2011-salad/source/blender/blenfont/CMakeLists.txt
branches/soc-2011-salad/source/blender/blenkernel/CMakeLists.txt
branches/soc-2011-salad/source/blender/blenkernel/intern/particle_system.c
branches/soc-2011-salad/source/blender/blenkernel/intern/sequencer.c
branches/soc-2011-salad/source/blender/blenlib/CMakeLists.txt
branches/soc-2011-salad/source/blender/blenloader/CMakeLists.txt
branches/soc-2011-salad/source/blender/blenloader/intern/readfile.c
branches/soc-2011-salad/source/blender/blenpluginapi/CMakeLists.txt
branches/soc-2011-salad/source/blender/collada/CMakeLists.txt
branches/soc-2011-salad/source/blender/editors/animation/CMakeLists.txt
branches/soc-2011-salad/source/blender/editors/armature/CMakeLists.txt
branches/soc-2011-salad/source/blender/editors/curve/CMakeLists.txt
branches/soc-2011-salad/source/blender/editors/gpencil/CMakeLists.txt
branches/soc-2011-salad/source/blender/editors/interface/CMakeLists.txt
branches/soc-2011-salad/source/blender/editors/mesh/CMakeLists.txt
branches/soc-2011-salad/source/blender/editors/metaball/CMakeLists.txt
branches/soc-2011-salad/source/blender/editors/object/CMakeLists.txt
branches/soc-2011-salad/source/blender/editors/object/object_bake.c
branches/soc-2011-salad/source/blender/editors/physics/CMakeLists.txt
branches/soc-2011-salad/source/blender/editors/render/CMakeLists.txt
branches/soc-2011-salad/source/blender/editors/screen/CMakeLists.txt
branches/soc-2011-salad/source/blender/editors/sculpt_paint/CMakeLists.txt
branches/soc-2011-salad/source/blender/editors/sound/CMakeLists.txt
branches/soc-2011-salad/source/blender/editors/space_action/CMakeLists.txt
branches/soc-2011-salad/source/blender/editors/space_api/CMakeLists.txt
branches/soc-2011-salad/source/blender/editors/space_buttons/CMakeLists.txt
branches/soc-2011-salad/source/blender/editors/space_file/CMakeLists.txt
branches/soc-2011-salad/source/blender/editors/space_graph/CMakeLists.txt
branches/soc-2011-salad/source/blender/editors/space_image/CMakeLists.txt
branches/soc-2011-salad/source/blender/editors/space_info/CMakeLists.txt
branches/soc-2011-salad/source/blender/editors/space_logic/CMakeLists.txt
branches/soc-2011-salad/source/blender/editors/space_nla/CMakeLists.txt
branches/soc-2011-salad/source/blender/editors/space_node/CMakeLists.txt
branches/soc-2011-salad/source/blender/editors/space_node/node_edit.c
branches/soc-2011-salad/source/blender/editors/space_node/node_header.c
branches/soc-2011-salad/source/blender/editors/space_node/node_ops.c
branches/soc-2011-salad/source/blender/editors/space_node/space_node.c
branches/soc-2011-salad/source/blender/editors/space_outliner/CMakeLists.txt
branches/soc-2011-salad/source/blender/editors/space_script/CMakeLists.txt
branches/soc-2011-salad/source/blender/editors/space_sequencer/CMakeLists.txt
branches/soc-2011-salad/source/blender/editors/space_sound/CMakeLists.txt
branches/soc-2011-salad/source/blender/editors/space_text/CMakeLists.txt
branches/soc-2011-salad/source/blender/editors/space_time/CMakeLists.txt
branches/soc-2011-salad/source/blender/editors/space_userpref/CMakeLists.txt
branches/soc-2011-salad/source/blender/editors/space_view3d/CMakeLists.txt
branches/soc-2011-salad/source/blender/editors/transform/CMakeLists.txt
branches/soc-2011-salad/source/blender/editors/util/CMakeLists.txt
branches/soc-2011-salad/source/blender/editors/uvedit/CMakeLists.txt
branches/soc-2011-salad/source/blender/gpu/CMakeLists.txt
branches/soc-2011-salad/source/blender/ikplugin/CMakeLists.txt
branches/soc-2011-salad/source/blender/imbuf/CMakeLists.txt
branches/soc-2011-salad/source/blender/imbuf/intern/cineon/CMakeLists.txt
branches/soc-2011-salad/source/blender/imbuf/intern/dds/CMakeLists.txt
branches/soc-2011-salad/source/blender/imbuf/intern/openexr/CMakeLists.txt
branches/soc-2011-salad/source/blender/makesdna/DNA_scene_types.h
branches/soc-2011-salad/source/blender/makesrna/intern/CMakeLists.txt
branches/soc-2011-salad/source/blender/makesrna/intern/rna_object.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_object_api.c
branches/soc-2011-salad/source/blender/modifiers/CMakeLists.txt
branches/soc-2011-salad/source/blender/modifiers/intern/MOD_util.h
branches/soc-2011-salad/source/blender/nodes/CMakeLists.txt
branches/soc-2011-salad/source/blender/nodes/intern/SHD_util.c
branches/soc-2011-salad/source/blender/python/generic/CMakeLists.txt
branches/soc-2011-salad/source/blender/python/generic/bgl.c
branches/soc-2011-salad/source/blender/python/intern/CMakeLists.txt
branches/soc-2011-salad/source/blender/python/intern/bpy_rna.c
branches/soc-2011-salad/source/blender/quicktime/CMakeLists.txt
branches/soc-2011-salad/source/blender/render/CMakeLists.txt
branches/soc-2011-salad/source/blender/windowmanager/CMakeLists.txt
branches/soc-2011-salad/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2011-salad/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
branches/soc-2011-salad/source/gameengine/BlenderRoutines/CMakeLists.txt
branches/soc-2011-salad/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2011-salad/source/gameengine/Converter/CMakeLists.txt
branches/soc-2011-salad/source/gameengine/Expressions/CMakeLists.txt
branches/soc-2011-salad/source/gameengine/GameLogic/CMakeLists.txt
branches/soc-2011-salad/source/gameengine/GamePlayer/common/CMakeLists.txt
branches/soc-2011-salad/source/gameengine/GamePlayer/ghost/CMakeLists.txt
branches/soc-2011-salad/source/gameengine/Ketsji/CMakeLists.txt
branches/soc-2011-salad/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt
branches/soc-2011-salad/source/gameengine/Network/CMakeLists.txt
branches/soc-2011-salad/source/gameengine/Network/LoopBackNetwork/CMakeLists.txt
branches/soc-2011-salad/source/gameengine/Physics/Bullet/CMakeLists.txt
branches/soc-2011-salad/source/gameengine/Rasterizer/CMakeLists.txt
branches/soc-2011-salad/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
branches/soc-2011-salad/source/gameengine/VideoTexture/CMakeLists.txt
Added Paths:
-----------
branches/soc-2011-salad/release/scripts/templates/batch_export.py
branches/soc-2011-salad/source/tests/check_deprecated.py
Property Changed:
----------------
branches/soc-2011-salad/
Property changes on: branches/soc-2011-salad
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-30783,30792-30793,30797-30798,30815
/branches/soc-2011-carrot:36854,37548,37564,37602,37622,37848,38043,38064,38226,38231,38282
/branches/soc-2011-cucumber:36829-36994
/branches/soc-2011-onion:36833-38309
/branches/soc-2011-pepper:36830-38208
/branches/soc-2011-tomato:36831-38430
/trunk/blender:36834-38431
+ /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-30783,30792-30793,30797-30798,30815
/branches/soc-2011-carrot:36854,37548,37564,37602,37622,37848,38043,38064,38226,38231,38282
/branches/soc-2011-cucumber:36829-36994
/branches/soc-2011-onion:36833-38309
/branches/soc-2011-pepper:36830-38208
/branches/soc-2011-tomato:36831-38430
/trunk/blender:36834-38516
Modified: branches/soc-2011-salad/GNUmakefile
===================================================================
--- branches/soc-2011-salad/GNUmakefile 2011-07-19 19:58:01 UTC (rev 38516)
+++ branches/soc-2011-salad/GNUmakefile 2011-07-19 20:19:45 UTC (rev 38517)
@@ -99,14 +99,18 @@
# run pep8 check check on scripts we distribute.
test_pep8:
- python source/tests/pep8.py > test_pep8.log 2>&1
+ python3 source/tests/pep8.py > test_pep8.log 2>&1
@echo "written: test_pep8.log"
# run some checks on our cmakefiles.
test_cmake:
- python build_files/cmake/cmake_consistency_check.py > test_cmake_consistency.log 2>&1
+ python3 build_files/cmake/cmake_consistency_check.py > test_cmake_consistency.log 2>&1
@echo "written: test_cmake_consistency.log"
+# run deprecation tests, see if we have anything to remove.
+test_deprecated:
+ python3 source/tests/check_deprecated.py
+
clean:
make -C $(BUILD_DIR) clean
Modified: branches/soc-2011-salad/build_files/cmake/cmake_consistency_check.py
===================================================================
--- branches/soc-2011-salad/build_files/cmake/cmake_consistency_check.py 2011-07-19 19:58:01 UTC (rev 38516)
+++ branches/soc-2011-salad/build_files/cmake/cmake_consistency_check.py 2011-07-19 20:19:45 UTC (rev 38517)
@@ -35,6 +35,21 @@
global_refs = {}
+def replace_line(f, i, text, keep_indent=True):
+ file_handle = open(f, 'r')
+ data = file_handle.readlines()
+ file_handle.close()
+
+ l = data[i]
+ ws = l[:len(l) - len(l.lstrip())]
+
+ data[i] = "%s%s\n" % (ws, text)
+
+ file_handle = open(f, 'w')
+ file_handle.writelines(data)
+ file_handle.close()
+
+
def source_list(path, filename_check=None):
for dirpath, dirnames, filenames in os.walk(path):
@@ -77,7 +92,20 @@
found = False
i = 0
# print(f)
+
+ def is_definition(l, f, i, name):
+ if ('set(%s' % name) in l or ('set(' in l and l.endswith(name)):
+ if len(l.split()) > 1:
+ raise Exception("strict formatting not kept 'set(%s*' %s:%d" % (name, f, i))
+ return True
+
+ if ("list(APPEND %s" % name) in l or ('list(APPEND ' in l and l.endswith(name)):
+ if l.endswith(")"):
+ raise Exception("strict formatting not kept 'list(APPEND %s...)' on 1 line %s:%d" % (name, f, i))
+ return True
+
while it is not None:
+ context_name = ""
while it is not None:
i += 1
try:
@@ -87,16 +115,13 @@
break
l = l.strip()
if not l.startswith("#"):
- if 'set(SRC' in l or ('set(' in l and l.endswith("SRC")):
- if len(l.split()) > 1:
- raise Exception("strict formatting not kept 'set(SRC*' %s:%d" % (f, i))
- found = True
+ found = is_definition(l, f, i, "SRC")
+ if found:
+ context_name = "SRC"
break
-
- if "list(APPEND SRC" in l or ('list(APPEND ' in l and l.endswith("SRC")):
- if l.endswith(")"):
- raise Exception("strict formatting not kept 'list(APPEND SRC...)' on 1 line %s:%d" % (f, i))
- found = True
+ found = is_definition(l, f, i, "INC")
+ if found:
+ context_name = "INC"
break
if found:
@@ -125,30 +150,45 @@
if not l:
pass
elif l.startswith("$"):
- # assume if it ends with SRC we know about it
- if not l.split("}")[0].endswith("SRC"):
- print("Can't use var '%s' %s:%d" % (l, f, i))
+ if context_name == "SRC":
+ # assume if it ends with context_name we know about it
+ if not l.split("}")[0].endswith(context_name):
+ print("Can't use var '%s' %s:%d" % (l, f, i))
elif len(l.split()) > 1:
raise Exception("Multi-line define '%s' %s:%d" % (l, f, i))
else:
new_file = normpath(join(cmake_base, l))
- if is_c_header(new_file):
- sources_h.append(new_file)
- global_refs.setdefault(new_file, []).append((f, i))
- elif is_c(new_file):
- sources_c.append(new_file)
- global_refs.setdefault(new_file, []).append((f, i))
- elif l in ("PARENT_SCOPE", ):
- # cmake var, ignore
- pass
- elif new_file.endswith(".list"):
- pass
- elif new_file.endswith(".def"):
- pass
- else:
- raise Exception("unknown file type - not c or h %s -> %s" % (f, new_file))
+ if context_name == "SRC":
+ if is_c_header(new_file):
+ sources_h.append(new_file)
+ global_refs.setdefault(new_file, []).append((f, i))
+ elif is_c(new_file):
+ sources_c.append(new_file)
+ global_refs.setdefault(new_file, []).append((f, i))
+ elif l in ("PARENT_SCOPE", ):
+ # cmake var, ignore
+ pass
+ elif new_file.endswith(".list"):
+ pass
+ elif new_file.endswith(".def"):
+ pass
+ else:
+ raise Exception("unknown file type - not c or h %s -> %s" % (f, new_file))
+ elif context_name == "INC":
+ if os.path.isdir(new_file):
+ new_path_rel = os.path.relpath(new_file, cmake_base)
+
+ if new_path_rel != l:
+ print("overly relative path:\n %s:%d\n %s\n %s" % (f, i, l, new_path_rel))
+
+ ## Save time. just replace the line
+ # replace_line(f, i - 1, new_path_rel)
+
+ else:
+ raise Exception("non existant include %s:%d -> %s" % (f, i, new_file))
+
# print(new_file)
global_h.update(set(sources_h))
@@ -166,6 +206,10 @@
if ff not in sources_c:
print(" missing: " + ff)
'''
+
+ # reset
+ sources_h[:] = []
+ sources_c[:] = []
filen.close()
Modified: branches/soc-2011-salad/extern/binreloc/CMakeLists.txt
===================================================================
--- branches/soc-2011-salad/extern/binreloc/CMakeLists.txt 2011-07-19 19:58:01 UTC (rev 38516)
+++ branches/soc-2011-salad/extern/binreloc/CMakeLists.txt 2011-07-19 20:19:45 UTC (rev 38517)
@@ -19,7 +19,7 @@
#
set(INC
- ./include
+ include
)
set(INC_SYS
Modified: branches/soc-2011-salad/extern/eltopo/CMakeLists.txt
===================================================================
--- branches/soc-2011-salad/extern/eltopo/CMakeLists.txt 2011-07-19 19:58:01 UTC (rev 38516)
+++ branches/soc-2011-salad/extern/eltopo/CMakeLists.txt 2011-07-19 20:19:45 UTC (rev 38517)
@@ -27,10 +27,10 @@
set(INC
.
common
+ eltopo3d
+ common/meshes
common/newsparse
common/tunicate
- common/meshes
- eltopo3d
)
set(INC_SYS
@@ -51,11 +51,19 @@
common/makelevelset2.cpp
common/makelevelset3.cpp
common/marching_triangles.cpp
+ common/predicates.cpp
+ common/sos_ccd_wrapper.cpp
+ common/wallclocktime.cpp
+ eltopo3d/accelerationgrid.cpp
+ eltopo3d/broadphasegrid.cpp
+ eltopo3d/dynamicsurface.cpp
+ eltopo3d/eltopo.cpp
+ eltopo3d/nondestructivetrimesh.cpp
+ eltopo3d/subdivisionscheme.cpp
+ eltopo3d/surftrack.cpp
common/newsparse/dense_matrix.cpp
common/newsparse/krylov_solvers.cpp
common/newsparse/sparse_matrix.cpp
- common/predicates.cpp
- common/sos_ccd_wrapper.cpp
common/sparse/incomplete_qr.cpp
common/tunicate/expansion.cpp
common/tunicate/intersection.cpp
@@ -63,14 +71,6 @@
common/tunicate/orientation.cpp
common/tunicate/sos_intersection.cpp
common/tunicate/sos_orientation.cpp
- common/wallclocktime.cpp
- eltopo3d/accelerationgrid.cpp
- eltopo3d/broadphasegrid.cpp
- eltopo3d/dynamicsurface.cpp
- eltopo3d/eltopo.cpp
- eltopo3d/nondestructivetrimesh.cpp
- eltopo3d/subdivisionscheme.cpp
- eltopo3d/surftrack.cpp
eltopo-capi.h
common/array1.h
@@ -93,21 +93,8 @@
common/marching_triangles.h
common/mat.h
common/matlapack.h
- common/newsparse/dense_matrix.h
- common/newsparse/krylov_solvers.h
- common/newsparse/linear_operator.h
- common/newsparse/sparse_matrix.h
common/openglutils.h
common/predicates.h
- common/sparse/cgsolver.h
- common/sparse/crsolver.h
- common/sparse/incomplete_qr.h
- common/sparse/sparseilu.h
- common/sparse/sparsematrix.h
- common/sparse/sparsemilu.h
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list