[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38531] branches/soc-2011-onion: merge with trunk -r38530
Antony Riakiotakis
kalast at gmail.com
Wed Jul 20 11:54:28 CEST 2011
Revision: 38531
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38531
Author: psy-fi
Date: 2011-07-20 09:54:27 +0000 (Wed, 20 Jul 2011)
Log Message:
-----------
merge with trunk -r38530
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38530
Modified Paths:
--------------
branches/soc-2011-onion/GNUmakefile
branches/soc-2011-onion/build_files/cmake/cmake_consistency_check.py
branches/soc-2011-onion/build_files/scons/tools/Blender.py
branches/soc-2011-onion/intern/ffmpeg/ffmpeg_compat.h
branches/soc-2011-onion/intern/ghost/intern/GHOST_SystemX11.cpp
branches/soc-2011-onion/release/scripts/modules/addon_utils.py
branches/soc-2011-onion/release/scripts/modules/bpy/path.py
branches/soc-2011-onion/release/scripts/modules/bpy_extras/image_utils.py
branches/soc-2011-onion/release/scripts/modules/bpy_extras/io_utils.py
branches/soc-2011-onion/release/scripts/startup/bl_operators/image.py
branches/soc-2011-onion/release/scripts/startup/bl_operators/object_align.py
branches/soc-2011-onion/release/scripts/startup/bl_operators/uvcalc_smart_project.py
branches/soc-2011-onion/release/scripts/startup/bl_ui/properties_material.py
branches/soc-2011-onion/release/scripts/startup/bl_ui/space_userpref.py
branches/soc-2011-onion/source/blender/blenkernel/intern/particle_system.c
branches/soc-2011-onion/source/blender/blenkernel/intern/sequencer.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/editors/space_node/node_edit.c
branches/soc-2011-onion/source/blender/editors/space_node/node_header.c
branches/soc-2011-onion/source/blender/editors/space_node/node_ops.c
branches/soc-2011-onion/source/blender/makesdna/DNA_scene_types.h
branches/soc-2011-onion/source/blender/makesrna/intern/rna_object.c
branches/soc-2011-onion/source/blender/makesrna/intern/rna_object_api.c
branches/soc-2011-onion/source/blender/modifiers/intern/MOD_util.h
branches/soc-2011-onion/source/blender/nodes/intern/SHD_util.c
branches/soc-2011-onion/source/blender/python/generic/bgl.c
branches/soc-2011-onion/source/blender/python/intern/bpy_rna.c
branches/soc-2011-onion/source/blender/python/mathutils/mathutils_Matrix.c
branches/soc-2011-onion/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2011-onion/source/gameengine/Converter/BL_BlenderDataConversion.cpp
Added Paths:
-----------
branches/soc-2011-onion/release/scripts/templates/batch_export.py
branches/soc-2011-onion/source/tests/check_deprecated.py
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-30783,30792-30793,30797-30798,30815
/trunk/blender:36833-38443
+ /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-30783,30792-30793,30797-30798,30815
/trunk/blender:36833-38530
Modified: branches/soc-2011-onion/GNUmakefile
===================================================================
--- branches/soc-2011-onion/GNUmakefile 2011-07-20 09:27:17 UTC (rev 38530)
+++ branches/soc-2011-onion/GNUmakefile 2011-07-20 09:54:27 UTC (rev 38531)
@@ -73,7 +73,7 @@
@echo
@echo Building Blender ...
- make -C $(BUILD_DIR) -s -j $(NPROCS) install
+ $(MAKE) -C $(BUILD_DIR) -s -j $(NPROCS) install
@echo
@echo edit build configuration with: "$(BUILD_DIR)/CMakeCache.txt" run make again to rebuild.
@echo blender installed, run from: "$(BUILD_DIR)/bin/blender"
@@ -99,15 +99,19 @@
# 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
+ $(MAKE) -C $(BUILD_DIR) clean
.PHONY: all
Modified: branches/soc-2011-onion/build_files/cmake/cmake_consistency_check.py
===================================================================
--- branches/soc-2011-onion/build_files/cmake/cmake_consistency_check.py 2011-07-20 09:27:17 UTC (rev 38530)
+++ branches/soc-2011-onion/build_files/cmake/cmake_consistency_check.py 2011-07-20 09:54:27 UTC (rev 38531)
@@ -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-onion/build_files/scons/tools/Blender.py
===================================================================
--- branches/soc-2011-onion/build_files/scons/tools/Blender.py 2011-07-20 09:27:17 UTC (rev 38530)
+++ branches/soc-2011-onion/build_files/scons/tools/Blender.py 2011-07-20 09:54:27 UTC (rev 38531)
@@ -320,11 +320,7 @@
defs.append('WITH_PYTHON')
if env['BF_DEBUG']:
defs.append('_DEBUG')
-
- if env['BF_BUILDINFO']:
- defs.append('BUILD_DATE')
- defs.append('NAN_BUILDINFO')
-
+
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
incs.append(env['BF_PTHREADS_INC'])
Modified: branches/soc-2011-onion/intern/ffmpeg/ffmpeg_compat.h
===================================================================
--- branches/soc-2011-onion/intern/ffmpeg/ffmpeg_compat.h 2011-07-20 09:27:17 UTC (rev 38530)
+++ branches/soc-2011-onion/intern/ffmpeg/ffmpeg_compat.h 2011-07-20 09:54:27 UTC (rev 38531)
@@ -40,7 +40,7 @@
#define FFMPEG_HAVE_AVIO 1
#endif
-#if (LIBAVCODEC_VERSION_MAJOR > 53) || ((LIBAVCODEC_VERSION_MAJOR == 53) && (LIBAVCODEC_VERSION_MINOR > 1)) || ((LIBAVCODEC_VERSION_MAJOR == 53) && (LIBAVCODEC_VERSION_MINOR == 1) && (LIBAVCODEC_VERSION_MICRO >= 1)) || ((LIBAVCODEC_VERSION_MAJOR == 52) && (LIBAVCODEC_VERSION_MINOR >= 122))
+#if (LIBAVCODEC_VERSION_MAJOR > 53) || ((LIBAVCODEC_VERSION_MAJOR == 53) && (LIBAVCODEC_VERSION_MINOR > 1)) || ((LIBAVCODEC_VERSION_MAJOR == 53) && (LIBAVCODEC_VERSION_MINOR == 1) && (LIBAVCODEC_VERSION_MICRO >= 1)) || ((LIBAVCODEC_VERSION_MAJOR == 52) && (LIBAVCODEC_VERSION_MINOR >= 121))
#define FFMPEG_HAVE_DEFAULT_VAL_UNION 1
#endif
Modified: branches/soc-2011-onion/intern/ghost/intern/GHOST_SystemX11.cpp
===================================================================
--- branches/soc-2011-onion/intern/ghost/intern/GHOST_SystemX11.cpp 2011-07-20 09:27:17 UTC (rev 38530)
+++ branches/soc-2011-onion/intern/ghost/intern/GHOST_SystemX11.cpp 2011-07-20 09:54:27 UTC (rev 38531)
@@ -150,10 +150,11 @@
if (gettimeofday(&tv,NULL) == -1) {
GHOST_ASSERT(false,"Could not instantiate timer!");
}
-
- m_start_time = GHOST_TUns64(tv.tv_sec*1000 + tv.tv_usec/1000);
+ // Taking care not to overflow the tv.tv_sec*1000
+ m_start_time = GHOST_TUns64(tv.tv_sec)*1000 + tv.tv_usec/1000;
+
/* use detectable autorepeate, mac and windows also do this */
int use_xkb;
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list