[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36994] branches/soc-2011-cucumber: Merge from trunk r36993
Daniel Stokes
kupomail at gmail.com
Sun May 29 11:15:38 CEST 2011
Revision: 36994
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36994
Author: kupoman
Date: 2011-05-29 09:15:37 +0000 (Sun, 29 May 2011)
Log Message:
-----------
Merge from trunk r36993
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36993
Modified Paths:
--------------
branches/soc-2011-cucumber/CMakeLists.txt
branches/soc-2011-cucumber/build_files/cmake/cmake_netbeans_project.py
branches/soc-2011-cucumber/build_files/cmake/cmake_qtcreator_project.py
branches/soc-2011-cucumber/build_files/cmake/macros.cmake
branches/soc-2011-cucumber/build_files/cmake/project_info.py
branches/soc-2011-cucumber/build_files/scons/tools/Blender.py
branches/soc-2011-cucumber/build_files/scons/tools/btools.py
branches/soc-2011-cucumber/doc/python_api/examples/bpy.types.BlendDataLibraries.load.py
branches/soc-2011-cucumber/doc/python_api/sphinx_doc_gen.py
branches/soc-2011-cucumber/extern/bullet2/src/BulletCollision/BroadphaseCollision/btAxisSweep3.h
branches/soc-2011-cucumber/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp
branches/soc-2011-cucumber/intern/audaspace/CMakeLists.txt
branches/soc-2011-cucumber/intern/audaspace/SConscript
branches/soc-2011-cucumber/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
branches/soc-2011-cucumber/intern/ghost/intern/GHOST_SystemX11.cpp
branches/soc-2011-cucumber/intern/ghost/intern/GHOST_WindowX11.cpp
branches/soc-2011-cucumber/intern/ghost/intern/GHOST_WindowX11.h
branches/soc-2011-cucumber/release/scripts/modules/bpy_extras/image_utils.py
branches/soc-2011-cucumber/release/scripts/modules/bpy_extras/io_utils.py
branches/soc-2011-cucumber/release/scripts/modules/bpy_extras/mesh_utils.py
branches/soc-2011-cucumber/release/scripts/modules/bpy_extras/object_utils.py
branches/soc-2011-cucumber/release/scripts/modules/bpy_extras/view3d_utils.py
branches/soc-2011-cucumber/release/scripts/modules/bpy_types.py
branches/soc-2011-cucumber/release/scripts/startup/bl_operators/mesh.py
branches/soc-2011-cucumber/release/scripts/startup/bl_operators/uvcalc_follow_active.py
branches/soc-2011-cucumber/release/scripts/startup/bl_operators/wm.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/__init__.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_data_empty.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_object_constraint.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_scene.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/space_image.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/space_logic.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/space_userpref.py
branches/soc-2011-cucumber/release/windows/installer/00.sconsblender.nsi
branches/soc-2011-cucumber/source/blender/blenkernel/BKE_blender.h
branches/soc-2011-cucumber/source/blender/blenkernel/BKE_sequencer.h
branches/soc-2011-cucumber/source/blender/blenkernel/CMakeLists.txt
branches/soc-2011-cucumber/source/blender/blenkernel/SConscript
branches/soc-2011-cucumber/source/blender/blenkernel/intern/anim_sys.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/brush.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/curve.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/image.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/lattice.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/object.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/sequencer.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/text.c
branches/soc-2011-cucumber/source/blender/blenkernel/intern/writeffmpeg.c
branches/soc-2011-cucumber/source/blender/blenlib/BLI_path_util.h
branches/soc-2011-cucumber/source/blender/blenlib/BLI_string.h
branches/soc-2011-cucumber/source/blender/blenlib/intern/math_color.c
branches/soc-2011-cucumber/source/blender/blenlib/intern/path_util.c
branches/soc-2011-cucumber/source/blender/blenlib/intern/string.c
branches/soc-2011-cucumber/source/blender/blenloader/BLO_readfile.h
branches/soc-2011-cucumber/source/blender/blenloader/intern/readfile.c
branches/soc-2011-cucumber/source/blender/editors/animation/keyingsets.c
branches/soc-2011-cucumber/source/blender/editors/armature/editarmature_sketch.c
branches/soc-2011-cucumber/source/blender/editors/armature/poselib.c
branches/soc-2011-cucumber/source/blender/editors/gpencil/gpencil_edit.c
branches/soc-2011-cucumber/source/blender/editors/gpencil/gpencil_paint.c
branches/soc-2011-cucumber/source/blender/editors/include/ED_keyframing.h
branches/soc-2011-cucumber/source/blender/editors/interface/interface.c
branches/soc-2011-cucumber/source/blender/editors/interface/interface_layout.c
branches/soc-2011-cucumber/source/blender/editors/mesh/editmesh_mods.c
branches/soc-2011-cucumber/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2011-cucumber/source/blender/editors/object/object_edit.c
branches/soc-2011-cucumber/source/blender/editors/object/object_hook.c
branches/soc-2011-cucumber/source/blender/editors/object/object_modifier.c
branches/soc-2011-cucumber/source/blender/editors/object/object_relations.c
branches/soc-2011-cucumber/source/blender/editors/object/object_vgroup.c
branches/soc-2011-cucumber/source/blender/editors/physics/particle_edit.c
branches/soc-2011-cucumber/source/blender/editors/sculpt_paint/paint_intern.h
branches/soc-2011-cucumber/source/blender/editors/sculpt_paint/paint_ops.c
branches/soc-2011-cucumber/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2011-cucumber/source/blender/editors/space_file/space_file.c
branches/soc-2011-cucumber/source/blender/editors/space_node/drawnode.c
branches/soc-2011-cucumber/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2011-cucumber/source/blender/editors/space_view3d/drawobject.c
branches/soc-2011-cucumber/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2011-cucumber/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2011-cucumber/source/blender/editors/space_view3d/view3d_fly.c
branches/soc-2011-cucumber/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2011-cucumber/source/blender/editors/util/undo.c
branches/soc-2011-cucumber/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2011-cucumber/source/blender/imbuf/CMakeLists.txt
branches/soc-2011-cucumber/source/blender/imbuf/SConscript
branches/soc-2011-cucumber/source/blender/imbuf/intern/anim_movie.c
branches/soc-2011-cucumber/source/blender/imbuf/intern/imageprocess.c
branches/soc-2011-cucumber/source/blender/imbuf/intern/scaling.c
branches/soc-2011-cucumber/source/blender/imbuf/intern/util.c
branches/soc-2011-cucumber/source/blender/makesrna/RNA_access.h
branches/soc-2011-cucumber/source/blender/makesrna/RNA_define.h
branches/soc-2011-cucumber/source/blender/makesrna/RNA_enum_types.h
branches/soc-2011-cucumber/source/blender/makesrna/RNA_types.h
branches/soc-2011-cucumber/source/blender/makesrna/intern/makesrna.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_access.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_actuator.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_brush.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_constraint.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_define.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_image.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_internal_types.h
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_material.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_object.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_object_force.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_particle.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_rna.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_scene.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_sculpt_paint.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_sensor.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_sequencer.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_sequencer_api.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_space.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_texture.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_wm.c
branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_armature.c
branches/soc-2011-cucumber/source/blender/python/generic/IDProp.c
branches/soc-2011-cucumber/source/blender/python/generic/bpy_internal_import.h
branches/soc-2011-cucumber/source/blender/python/generic/mathutils_Color.c
branches/soc-2011-cucumber/source/blender/python/generic/mathutils_Euler.c
branches/soc-2011-cucumber/source/blender/python/generic/mathutils_Matrix.c
branches/soc-2011-cucumber/source/blender/python/generic/mathutils_Quaternion.c
branches/soc-2011-cucumber/source/blender/python/generic/mathutils_Vector.c
branches/soc-2011-cucumber/source/blender/python/intern/bpy.c
branches/soc-2011-cucumber/source/blender/python/intern/bpy_interface.c
branches/soc-2011-cucumber/source/blender/python/intern/bpy_library.c
branches/soc-2011-cucumber/source/blender/python/intern/bpy_props.c
branches/soc-2011-cucumber/source/blender/python/intern/bpy_rna.c
branches/soc-2011-cucumber/source/blender/python/intern/bpy_rna.h
branches/soc-2011-cucumber/source/blender/render/intern/source/shadeinput.c
branches/soc-2011-cucumber/source/blender/windowmanager/intern/wm_files.c
branches/soc-2011-cucumber/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2011-cucumber/source/creator/CMakeLists.txt
branches/soc-2011-cucumber/source/creator/creator.c
branches/soc-2011-cucumber/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/soc-2011-cucumber/source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.cpp
branches/soc-2011-cucumber/source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.h
branches/soc-2011-cucumber/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/soc-2011-cucumber/source/gameengine/Expressions/PyObjectPlus.cpp
branches/soc-2011-cucumber/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp
branches/soc-2011-cucumber/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/soc-2011-cucumber/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
branches/soc-2011-cucumber/source/gameengine/VideoTexture/CMakeLists.txt
branches/soc-2011-cucumber/source/gameengine/VideoTexture/SConscript
branches/soc-2011-cucumber/source/gameengine/VideoTexture/VideoFFmpeg.cpp
branches/soc-2011-cucumber/source/gameengine/VideoTexture/VideoFFmpeg.h
Added Paths:
-----------
branches/soc-2011-cucumber/intern/ffmpeg/
branches/soc-2011-cucumber/intern/ffmpeg/ffmpeg_compat.h
Removed Paths:
-------------
branches/soc-2011-cucumber/intern/ffmpeg/ffmpeg_compat.h
Property Changed:
----------------
branches/soc-2011-cucumber/
Property changes on: branches/soc-2011-cucumber
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:36829-36889
+ /trunk/blender:36829-36993
Modified: branches/soc-2011-cucumber/CMakeLists.txt
===================================================================
--- branches/soc-2011-cucumber/CMakeLists.txt 2011-05-29 05:22:17 UTC (rev 36993)
+++ branches/soc-2011-cucumber/CMakeLists.txt 2011-05-29 09:15:37 UTC (rev 36994)
@@ -88,7 +88,7 @@
option(WITH_PYTHON "Enable Embedded Python API (only disable for development)" ON)
option(WITH_PYTHON_SECURITY "Disables execution of scripts within blend files by default (recommend to leave off)" OFF)
mark_as_advanced(WITH_PYTHON) # dont want people disabling this unless they really know what they are doing.
-mark_as_advanced(WITH_PYTHON_SECURITY) # some distrobutions see this as a security issue, rather then have them patch it, make a build option.
+mark_as_advanced(WITH_PYTHON_SECURITY) # some distrobutions see this as a security issue, rather than have them patch it, make a build option.
option(WITH_PYTHON_SAFETY "Enable internal API error checking to track invalid data to prevent crash on access (at the expense of some effeciency, only enable for development)." OFF)
option(WITH_PYTHON_MODULE "Enable building as a python module (experemental, only enable for development)" OFF)
Modified: branches/soc-2011-cucumber/build_files/cmake/cmake_netbeans_project.py
===================================================================
--- branches/soc-2011-cucumber/build_files/cmake/cmake_netbeans_project.py 2011-05-29 05:22:17 UTC (rev 36993)
+++ branches/soc-2011-cucumber/build_files/cmake/cmake_netbeans_project.py 2011-05-29 09:15:37 UTC (rev 36994)
@@ -33,7 +33,7 @@
from project_info import *
import os
-from os.path import join, dirname, normpath, abspath, splitext, relpath, exists
+from os.path import join, dirname, normpath, relpath, exists
def create_nb_project_main():
@@ -50,7 +50,6 @@
includes.sort()
PROJECT_NAME = "Blender"
- FILE_NAME = PROJECT_NAME.lower()
# --------------- NB spesific
defines = [("%s=%s" % cdef) if cdef[1] else cdef[0] for cdef in defines]
@@ -76,7 +75,7 @@
if not exists(PROJECT_DIR_NB):
os.mkdir(PROJECT_DIR_NB)
- SOURCE_DIR_REL = relpath(SOURCE_DIR, PROJECT_DIR)
+ # SOURCE_DIR_REL = relpath(SOURCE_DIR, PROJECT_DIR)
f = open(join(PROJECT_DIR_NB, "project.xml"), 'w')
Modified: branches/soc-2011-cucumber/build_files/cmake/cmake_qtcreator_project.py
===================================================================
--- branches/soc-2011-cucumber/build_files/cmake/cmake_qtcreator_project.py 2011-05-29 05:22:17 UTC (rev 36993)
+++ branches/soc-2011-cucumber/build_files/cmake/cmake_qtcreator_project.py 2011-05-29 09:15:37 UTC (rev 36994)
@@ -34,54 +34,52 @@
from project_info import *
import os
-from os.path import join, dirname, normpath, abspath, splitext, relpath, exists
-
import sys
def create_qtc_project_main():
files = list(source_list(SOURCE_DIR, filename_check=is_project_file))
- files_rel = [relpath(f, start=PROJECT_DIR) for f in files]
+ files_rel = [os.path.relpath(f, start=PROJECT_DIR) for f in files]
files_rel.sort()
# --- qtcreator specific, simple format
if SIMPLE_PROJECTFILE:
# --- qtcreator specific, simple format
PROJECT_NAME = "Blender"
- f = open(join(PROJECT_DIR, "%s.files" % PROJECT_NAME), 'w')
+ f = open(os.path.join(PROJECT_DIR, "%s.files" % PROJECT_NAME), 'w')
f.write("\n".join(files_rel))
- f = open(join(PROJECT_DIR, "%s.includes" % PROJECT_NAME), 'w')
- f.write("\n".join(sorted(list(set(dirname(f) for f in files_rel if is_c_header(f))))))
+ f = open(os.path.join(PROJECT_DIR, "%s.includes" % PROJECT_NAME), 'w')
+ f.write("\n".join(sorted(list(set(os.path.dirname(f) for f in files_rel if is_c_header(f))))))
- qtc_prj = join(PROJECT_DIR, "%s.creator" % PROJECT_NAME)
+ qtc_prj = os.path.join(PROJECT_DIR, "%s.creator" % PROJECT_NAME)
f = open(qtc_prj, 'w')
f.write("[General]\n")
- qtc_cfg = join(PROJECT_DIR, "%s.config" % PROJECT_NAME)
- if not exists(qtc_cfg):
+ qtc_cfg = os.path.join(PROJECT_DIR, "%s.config" % PROJECT_NAME)
+ if not os.path.exists(qtc_cfg):
f = open(qtc_cfg, 'w')
f.write("// ADD PREDEFINED MACROS HERE!\n")
else:
includes, defines = cmake_advanced_info()
# for some reason it doesnt give all internal includes
- includes = list(set(includes) | set(dirname(f) for f in files_rel if is_c_header(f)))
+ includes = list(set(includes) | set(os.path.dirname(f) for f in files_rel if is_c_header(f)))
includes.sort()
PROJECT_NAME = "Blender"
FILE_NAME = PROJECT_NAME.lower()
- f = open(join(PROJECT_DIR, "%s.files" % FILE_NAME), 'w')
+ f = open(os.path.join(PROJECT_DIR, "%s.files" % FILE_NAME), 'w')
f.write("\n".join(files_rel))
- f = open(join(PROJECT_DIR, "%s.includes" % FILE_NAME), 'w')
+ f = open(os.path.join(PROJECT_DIR, "%s.includes" % FILE_NAME), 'w')
f.write("\n".join(sorted(includes)))
- qtc_prj = join(PROJECT_DIR, "%s.creator" % FILE_NAME)
+ qtc_prj = os.path.join(PROJECT_DIR, "%s.creator" % FILE_NAME)
f = open(qtc_prj, 'w')
f.write("[General]\n")
- qtc_cfg = join(PROJECT_DIR, "%s.config" % FILE_NAME)
+ qtc_cfg = os.path.join(PROJECT_DIR, "%s.config" % FILE_NAME)
f = open(qtc_cfg, 'w')
f.write("// ADD PREDEFINED MACROS HERE!\n")
defines_final = [("#define %s %s" % item) for item in defines]
@@ -95,21 +93,21 @@
def create_qtc_project_python():
files = list(source_list(SOURCE_DIR, filename_check=is_py))
- files_rel = [relpath(f, start=PROJECT_DIR) for f in files]
+ files_rel = [os.path.relpath(f, start=PROJECT_DIR) for f in files]
files_rel.sort()
# --- qtcreator specific, simple format
PROJECT_NAME = "Blender_Python"
FILE_NAME = PROJECT_NAME.lower()
- f = open(join(PROJECT_DIR, "%s.files" % FILE_NAME), 'w')
+ f = open(os.path.join(PROJECT_DIR, "%s.files" % FILE_NAME), 'w')
f.write("\n".join(files_rel))
- qtc_prj = join(PROJECT_DIR, "%s.creator" % FILE_NAME)
+ qtc_prj = os.path.join(PROJECT_DIR, "%s.creator" % FILE_NAME)
f = open(qtc_prj, 'w')
f.write("[General]\n")
- qtc_cfg = join(PROJECT_DIR, "%s.config" % FILE_NAME)
- if not exists(qtc_cfg):
+ qtc_cfg = os.path.join(PROJECT_DIR, "%s.config" % FILE_NAME)
+ if not os.path.exists(qtc_cfg):
f = open(qtc_cfg, 'w')
f.write("// ADD PREDEFINED MACROS HERE!\n")
Modified: branches/soc-2011-cucumber/build_files/cmake/macros.cmake
===================================================================
--- branches/soc-2011-cucumber/build_files/cmake/macros.cmake 2011-05-29 05:22:17 UTC (rev 36993)
+++ branches/soc-2011-cucumber/build_files/cmake/macros.cmake 2011-05-29 09:15:37 UTC (rev 36994)
@@ -13,19 +13,13 @@
include_directories(${all_incs})
endmacro()
-# only MSVC uses SOURCE_GROUP
-macro(blender_add_lib_nolist
- name
- sources
- includes)
- # message(STATUS "Configuring library ${name}")
+macro(blender_source_group
+ sources)
- blender_include_dirs("${includes}")
- add_library(${name} ${sources})
-
# Group by location on disk
source_group("Source Files" FILES CMakeLists.txt)
+
foreach(SRC ${sources})
get_filename_component(SRC_EXT ${SRC} EXT)
if(${SRC_EXT} MATCHES ".h" OR ${SRC_EXT} MATCHES ".hpp")
@@ -36,17 +30,27 @@
endforeach()
endmacro()
-# # works fine but having the includes listed is helpful for IDE's (QtCreator/MSVC)
-# macro(blender_add_lib_nolist
-# name
-# sources
-# includes)
-#
-# message(STATUS "Configuring library ${name}")
-# include_directories(${includes})
-# add_library(${name} ${sources})
-# endmacro()
+# only MSVC uses SOURCE_GROUP
+macro(blender_add_lib_nolist
+ name
+ sources
+ includes)
+
+ # message(STATUS "Configuring library ${name}")
+
+ # include_directories(${includes})
+ blender_include_dirs("${includes}")
+
+ add_library(${name} ${sources})
+
+ # works fine without having the includes
+ # listed is helpful for IDE's (QtCreator/MSVC)
+ blender_source_group("${sources}")
+
+endmacro()
+
+
macro(blender_add_lib
name
sources
@@ -55,9 +59,9 @@
blender_add_lib_nolist(${name} "${sources}" "${includes}")
set_property(GLOBAL APPEND PROPERTY BLENDER_LINK_LIBS ${name})
-
endmacro()
+
macro(SETUP_LIBDIRS)
# see "cmake --help-policy CMP0003"
if(COMMAND cmake_policy)
Modified: branches/soc-2011-cucumber/build_files/cmake/project_info.py
===================================================================
--- branches/soc-2011-cucumber/build_files/cmake/project_info.py 2011-05-29 05:22:17 UTC (rev 36993)
+++ branches/soc-2011-cucumber/build_files/cmake/project_info.py 2011-05-29 09:15:37 UTC (rev 36994)
@@ -46,7 +46,7 @@
import sys
import os
-from os.path import join, dirname, normpath, abspath, splitext, relpath, exists
+from os.path import join, dirname, normpath, abspath, splitext, exists
SOURCE_DIR = join(dirname(__file__), "..", "..")
SOURCE_DIR = normpath(SOURCE_DIR)
Modified: branches/soc-2011-cucumber/build_files/scons/tools/Blender.py
===================================================================
--- branches/soc-2011-cucumber/build_files/scons/tools/Blender.py 2011-05-29 05:22:17 UTC (rev 36993)
+++ branches/soc-2011-cucumber/build_files/scons/tools/Blender.py 2011-05-29 09:15:37 UTC (rev 36994)
@@ -449,10 +449,16 @@
shutil.rmtree(py_target, False, printexception)
exclude_re=[re.compile('.*/test/.*'),
re.compile('^config/.*'),
+ re.compile('^config-*/.*'),
re.compile('^distutils/.*'),
re.compile('^idlelib/.*'),
re.compile('^lib2to3/.*'),
- re.compile('^tkinter/.*')]
+ re.compile('^tkinter/.*'),
+ re.compile('^_tkinter_d.pyd'),
+ re.compile('^turtledemo'),
+ re.compile('^turtle.py'),
+ ]
+
print "Unpacking '" + py_tar + "' to '" + py_target + "'"
untar_pybundle(py_tar,py_target,exclude_re)
@@ -569,17 +575,17 @@
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list