[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38823] branches/soc-2011-garlic: merge with trunk r38787
xiao xiangquan
xiaoxiangquan at gmail.com
Fri Jul 29 19:42:54 CEST 2011
Revision: 38823
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38823
Author: xiaoxiangquan
Date: 2011-07-29 17:42:53 +0000 (Fri, 29 Jul 2011)
Log Message:
-----------
merge with trunk r38787
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38787
Modified Paths:
--------------
branches/soc-2011-garlic/CMakeLists.txt
branches/soc-2011-garlic/GNUmakefile
branches/soc-2011-garlic/SConstruct
branches/soc-2011-garlic/build_files/cmake/cmake_consistency_check.py
branches/soc-2011-garlic/build_files/scons/tools/Blender.py
branches/soc-2011-garlic/doc/python_api/examples/mathutils.Vector.py
branches/soc-2011-garlic/doc/python_api/sphinx_doc_gen.sh
branches/soc-2011-garlic/extern/binreloc/CMakeLists.txt
branches/soc-2011-garlic/extern/eltopo/CMakeLists.txt
branches/soc-2011-garlic/extern/glew/CMakeLists.txt
branches/soc-2011-garlic/extern/lzo/CMakeLists.txt
branches/soc-2011-garlic/intern/audaspace/CMakeLists.txt
branches/soc-2011-garlic/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
branches/soc-2011-garlic/intern/audaspace/OpenAL/AUD_OpenALDevice.h
branches/soc-2011-garlic/intern/boolop/CMakeLists.txt
branches/soc-2011-garlic/intern/bsp/CMakeLists.txt
branches/soc-2011-garlic/intern/ffmpeg/ffmpeg_compat.h
branches/soc-2011-garlic/intern/ghost/CMakeLists.txt
branches/soc-2011-garlic/intern/ghost/intern/GHOST_SystemX11.cpp
branches/soc-2011-garlic/intern/mikktspace/mikktspace.c
branches/soc-2011-garlic/intern/smoke/CMakeLists.txt
branches/soc-2011-garlic/po/POTFILES.in
branches/soc-2011-garlic/release/scripts/modules/addon_utils.py
branches/soc-2011-garlic/release/scripts/modules/bpy/path.py
branches/soc-2011-garlic/release/scripts/modules/bpy/utils.py
branches/soc-2011-garlic/release/scripts/modules/bpy_extras/image_utils.py
branches/soc-2011-garlic/release/scripts/modules/bpy_extras/io_utils.py
branches/soc-2011-garlic/release/scripts/modules/bpy_extras/view3d_utils.py
branches/soc-2011-garlic/release/scripts/modules/bpy_types.py
branches/soc-2011-garlic/release/scripts/startup/bl_operators/add_mesh_torus.py
branches/soc-2011-garlic/release/scripts/startup/bl_operators/image.py
branches/soc-2011-garlic/release/scripts/startup/bl_operators/mesh.py
branches/soc-2011-garlic/release/scripts/startup/bl_operators/object.py
branches/soc-2011-garlic/release/scripts/startup/bl_operators/object_align.py
branches/soc-2011-garlic/release/scripts/startup/bl_operators/object_quick_effects.py
branches/soc-2011-garlic/release/scripts/startup/bl_operators/object_randomize_transform.py
branches/soc-2011-garlic/release/scripts/startup/bl_operators/presets.py
branches/soc-2011-garlic/release/scripts/startup/bl_operators/screen_play_rendered_anim.py
branches/soc-2011-garlic/release/scripts/startup/bl_operators/uvcalc_smart_project.py
branches/soc-2011-garlic/release/scripts/startup/bl_operators/wm.py
branches/soc-2011-garlic/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/soc-2011-garlic/release/scripts/startup/bl_ui/properties_material.py
branches/soc-2011-garlic/release/scripts/startup/bl_ui/properties_world.py
branches/soc-2011-garlic/release/scripts/startup/bl_ui/space_image.py
branches/soc-2011-garlic/release/scripts/startup/bl_ui/space_info.py
branches/soc-2011-garlic/release/scripts/startup/bl_ui/space_sequencer.py
branches/soc-2011-garlic/release/scripts/startup/bl_ui/space_text.py
branches/soc-2011-garlic/release/scripts/startup/bl_ui/space_userpref.py
branches/soc-2011-garlic/release/scripts/startup/bl_ui/space_userpref_keymap.py
branches/soc-2011-garlic/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2011-garlic/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/soc-2011-garlic/source/blender/avi/CMakeLists.txt
branches/soc-2011-garlic/source/blender/blenfont/CMakeLists.txt
branches/soc-2011-garlic/source/blender/blenkernel/BKE_blender.h
branches/soc-2011-garlic/source/blender/blenkernel/BKE_effect.h
branches/soc-2011-garlic/source/blender/blenkernel/CMakeLists.txt
branches/soc-2011-garlic/source/blender/blenkernel/SConscript
branches/soc-2011-garlic/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2011-garlic/source/blender/blenkernel/intern/customdata.c
branches/soc-2011-garlic/source/blender/blenkernel/intern/effect.c
branches/soc-2011-garlic/source/blender/blenkernel/intern/image.c
branches/soc-2011-garlic/source/blender/blenkernel/intern/material.c
branches/soc-2011-garlic/source/blender/blenkernel/intern/multires.c
branches/soc-2011-garlic/source/blender/blenkernel/intern/particle_system.c
branches/soc-2011-garlic/source/blender/blenkernel/intern/seqeffects.c
branches/soc-2011-garlic/source/blender/blenkernel/intern/sequencer.c
branches/soc-2011-garlic/source/blender/blenkernel/intern/text.c
branches/soc-2011-garlic/source/blender/blenkernel/intern/writeavi.c
branches/soc-2011-garlic/source/blender/blenkernel/intern/writeframeserver.c
branches/soc-2011-garlic/source/blender/blenlib/BLI_path_util.h
branches/soc-2011-garlic/source/blender/blenlib/CMakeLists.txt
branches/soc-2011-garlic/source/blender/blenlib/intern/path_util.c
branches/soc-2011-garlic/source/blender/blenloader/CMakeLists.txt
branches/soc-2011-garlic/source/blender/blenloader/intern/readfile.c
branches/soc-2011-garlic/source/blender/blenloader/intern/writefile.c
branches/soc-2011-garlic/source/blender/blenpluginapi/CMakeLists.txt
branches/soc-2011-garlic/source/blender/collada/CMakeLists.txt
branches/soc-2011-garlic/source/blender/collada/MaterialExporter.cpp
branches/soc-2011-garlic/source/blender/collada/MaterialExporter.h
branches/soc-2011-garlic/source/blender/editors/animation/CMakeLists.txt
branches/soc-2011-garlic/source/blender/editors/armature/CMakeLists.txt
branches/soc-2011-garlic/source/blender/editors/armature/editarmature.c
branches/soc-2011-garlic/source/blender/editors/curve/CMakeLists.txt
branches/soc-2011-garlic/source/blender/editors/gpencil/CMakeLists.txt
branches/soc-2011-garlic/source/blender/editors/include/ED_node.h
branches/soc-2011-garlic/source/blender/editors/interface/CMakeLists.txt
branches/soc-2011-garlic/source/blender/editors/interface/interface_handlers.c
branches/soc-2011-garlic/source/blender/editors/interface/interface_layout.c
branches/soc-2011-garlic/source/blender/editors/interface/interface_panel.c
branches/soc-2011-garlic/source/blender/editors/interface/interface_regions.c
branches/soc-2011-garlic/source/blender/editors/interface/interface_style.c
branches/soc-2011-garlic/source/blender/editors/interface/interface_templates.c
branches/soc-2011-garlic/source/blender/editors/interface/resources.c
branches/soc-2011-garlic/source/blender/editors/mesh/CMakeLists.txt
branches/soc-2011-garlic/source/blender/editors/mesh/editmesh_mods.c
branches/soc-2011-garlic/source/blender/editors/metaball/CMakeLists.txt
branches/soc-2011-garlic/source/blender/editors/object/CMakeLists.txt
branches/soc-2011-garlic/source/blender/editors/object/object_add.c
branches/soc-2011-garlic/source/blender/editors/object/object_bake.c
branches/soc-2011-garlic/source/blender/editors/object/object_edit.c
branches/soc-2011-garlic/source/blender/editors/physics/CMakeLists.txt
branches/soc-2011-garlic/source/blender/editors/physics/physics_fluid.c
branches/soc-2011-garlic/source/blender/editors/render/CMakeLists.txt
branches/soc-2011-garlic/source/blender/editors/render/SConscript
branches/soc-2011-garlic/source/blender/editors/render/render_shading.c
branches/soc-2011-garlic/source/blender/editors/screen/CMakeLists.txt
branches/soc-2011-garlic/source/blender/editors/sculpt_paint/CMakeLists.txt
branches/soc-2011-garlic/source/blender/editors/sound/CMakeLists.txt
branches/soc-2011-garlic/source/blender/editors/space_action/CMakeLists.txt
branches/soc-2011-garlic/source/blender/editors/space_api/CMakeLists.txt
branches/soc-2011-garlic/source/blender/editors/space_buttons/CMakeLists.txt
branches/soc-2011-garlic/source/blender/editors/space_file/CMakeLists.txt
branches/soc-2011-garlic/source/blender/editors/space_file/file_ops.c
branches/soc-2011-garlic/source/blender/editors/space_graph/CMakeLists.txt
branches/soc-2011-garlic/source/blender/editors/space_image/CMakeLists.txt
branches/soc-2011-garlic/source/blender/editors/space_image/image_buttons.c
branches/soc-2011-garlic/source/blender/editors/space_image/image_ops.c
branches/soc-2011-garlic/source/blender/editors/space_info/CMakeLists.txt
branches/soc-2011-garlic/source/blender/editors/space_logic/CMakeLists.txt
branches/soc-2011-garlic/source/blender/editors/space_nla/CMakeLists.txt
branches/soc-2011-garlic/source/blender/editors/space_node/CMakeLists.txt
branches/soc-2011-garlic/source/blender/editors/space_node/drawnode.c
branches/soc-2011-garlic/source/blender/editors/space_node/node_draw.c
branches/soc-2011-garlic/source/blender/editors/space_node/node_edit.c
branches/soc-2011-garlic/source/blender/editors/space_node/node_header.c
branches/soc-2011-garlic/source/blender/editors/space_node/node_ops.c
branches/soc-2011-garlic/source/blender/editors/space_node/space_node.c
branches/soc-2011-garlic/source/blender/editors/space_outliner/CMakeLists.txt
branches/soc-2011-garlic/source/blender/editors/space_script/CMakeLists.txt
branches/soc-2011-garlic/source/blender/editors/space_sequencer/CMakeLists.txt
branches/soc-2011-garlic/source/blender/editors/space_sequencer/sequencer_add.c
branches/soc-2011-garlic/source/blender/editors/space_sound/CMakeLists.txt
branches/soc-2011-garlic/source/blender/editors/space_text/CMakeLists.txt
branches/soc-2011-garlic/source/blender/editors/space_text/text_ops.c
branches/soc-2011-garlic/source/blender/editors/space_time/CMakeLists.txt
branches/soc-2011-garlic/source/blender/editors/space_userpref/CMakeLists.txt
branches/soc-2011-garlic/source/blender/editors/space_view3d/CMakeLists.txt
branches/soc-2011-garlic/source/blender/editors/space_view3d/drawobject.c
branches/soc-2011-garlic/source/blender/editors/space_view3d/view3d_buttons.c
branches/soc-2011-garlic/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2011-garlic/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2011-garlic/source/blender/editors/space_view3d/view3d_header.c
branches/soc-2011-garlic/source/blender/editors/space_view3d/view3d_intern.h
branches/soc-2011-garlic/source/blender/editors/transform/CMakeLists.txt
branches/soc-2011-garlic/source/blender/editors/transform/transform.c
branches/soc-2011-garlic/source/blender/editors/transform/transform.h
branches/soc-2011-garlic/source/blender/editors/transform/transform_conversions.c
branches/soc-2011-garlic/source/blender/editors/transform/transform_generics.c
branches/soc-2011-garlic/source/blender/editors/transform/transform_ops.c
branches/soc-2011-garlic/source/blender/editors/transform/transform_snap.c
branches/soc-2011-garlic/source/blender/editors/util/CMakeLists.txt
branches/soc-2011-garlic/source/blender/editors/util/undo.c
branches/soc-2011-garlic/source/blender/editors/uvedit/CMakeLists.txt
branches/soc-2011-garlic/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2011-garlic/source/blender/gpu/CMakeLists.txt
branches/soc-2011-garlic/source/blender/gpu/intern/gpu_material.c
branches/soc-2011-garlic/source/blender/ikplugin/CMakeLists.txt
branches/soc-2011-garlic/source/blender/imbuf/CMakeLists.txt
branches/soc-2011-garlic/source/blender/imbuf/IMB_imbuf.h
branches/soc-2011-garlic/source/blender/imbuf/intern/cineon/CMakeLists.txt
branches/soc-2011-garlic/source/blender/imbuf/intern/dds/CMakeLists.txt
branches/soc-2011-garlic/source/blender/imbuf/intern/filter.c
branches/soc-2011-garlic/source/blender/imbuf/intern/openexr/CMakeLists.txt
branches/soc-2011-garlic/source/blender/makesdna/DNA_image_types.h
branches/soc-2011-garlic/source/blender/makesdna/DNA_modifier_types.h
branches/soc-2011-garlic/source/blender/makesdna/DNA_node_types.h
branches/soc-2011-garlic/source/blender/makesdna/DNA_particle_types.h
branches/soc-2011-garlic/source/blender/makesdna/DNA_scene_types.h
branches/soc-2011-garlic/source/blender/makesrna/intern/CMakeLists.txt
branches/soc-2011-garlic/source/blender/makesrna/intern/SConscript
branches/soc-2011-garlic/source/blender/makesrna/intern/rna_access.c
branches/soc-2011-garlic/source/blender/makesrna/intern/rna_image.c
branches/soc-2011-garlic/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2011-garlic/source/blender/makesrna/intern/rna_object.c
branches/soc-2011-garlic/source/blender/makesrna/intern/rna_object_api.c
branches/soc-2011-garlic/source/blender/makesrna/intern/rna_object_force.c
branches/soc-2011-garlic/source/blender/makesrna/intern/rna_scene.c
branches/soc-2011-garlic/source/blender/makesrna/intern/rna_space.c
branches/soc-2011-garlic/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2011-garlic/source/blender/makesrna/intern/rna_wm.c
branches/soc-2011-garlic/source/blender/modifiers/CMakeLists.txt
branches/soc-2011-garlic/source/blender/modifiers/intern/MOD_util.h
branches/soc-2011-garlic/source/blender/nodes/CMakeLists.txt
branches/soc-2011-garlic/source/blender/nodes/intern/SHD_util.c
branches/soc-2011-garlic/source/blender/python/CMakeLists.txt
branches/soc-2011-garlic/source/blender/python/SConscript
branches/soc-2011-garlic/source/blender/python/generic/CMakeLists.txt
branches/soc-2011-garlic/source/blender/python/generic/bgl.c
branches/soc-2011-garlic/source/blender/python/intern/CMakeLists.txt
branches/soc-2011-garlic/source/blender/python/intern/bpy.c
branches/soc-2011-garlic/source/blender/python/intern/bpy_interface.c
branches/soc-2011-garlic/source/blender/python/intern/bpy_rna.c
branches/soc-2011-garlic/source/blender/quicktime/CMakeLists.txt
branches/soc-2011-garlic/source/blender/render/CMakeLists.txt
branches/soc-2011-garlic/source/blender/render/intern/source/convertblender.c
branches/soc-2011-garlic/source/blender/render/intern/source/rendercore.c
branches/soc-2011-garlic/source/blender/windowmanager/CMakeLists.txt
branches/soc-2011-garlic/source/blender/windowmanager/WM_api.h
branches/soc-2011-garlic/source/blender/windowmanager/intern/wm.c
branches/soc-2011-garlic/source/blender/windowmanager/intern/wm_init_exit.c
branches/soc-2011-garlic/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2011-garlic/source/blenderplayer/CMakeLists.txt
branches/soc-2011-garlic/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
branches/soc-2011-garlic/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2011-garlic/source/creator/CMakeLists.txt
branches/soc-2011-garlic/source/gameengine/BlenderRoutines/CMakeLists.txt
branches/soc-2011-garlic/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2011-garlic/source/gameengine/Converter/CMakeLists.txt
branches/soc-2011-garlic/source/gameengine/Expressions/CMakeLists.txt
branches/soc-2011-garlic/source/gameengine/Expressions/PyObjectPlus.cpp
branches/soc-2011-garlic/source/gameengine/Expressions/PyObjectPlus.h
branches/soc-2011-garlic/source/gameengine/GameLogic/CMakeLists.txt
branches/soc-2011-garlic/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
branches/soc-2011-garlic/source/gameengine/GamePlayer/common/CMakeLists.txt
branches/soc-2011-garlic/source/gameengine/GamePlayer/ghost/CMakeLists.txt
branches/soc-2011-garlic/source/gameengine/Ketsji/CMakeLists.txt
branches/soc-2011-garlic/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt
branches/soc-2011-garlic/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/soc-2011-garlic/source/gameengine/Ketsji/KX_PyMath.h
branches/soc-2011-garlic/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/soc-2011-garlic/source/gameengine/Ketsji/SConscript
branches/soc-2011-garlic/source/gameengine/Network/CMakeLists.txt
branches/soc-2011-garlic/source/gameengine/Network/LoopBackNetwork/CMakeLists.txt
branches/soc-2011-garlic/source/gameengine/Physics/Bullet/CMakeLists.txt
branches/soc-2011-garlic/source/gameengine/Rasterizer/CMakeLists.txt
branches/soc-2011-garlic/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
branches/soc-2011-garlic/source/gameengine/VideoTexture/CMakeLists.txt
branches/soc-2011-garlic/source/tests/CMakeLists.txt
Added Paths:
-----------
branches/soc-2011-garlic/release/scripts/templates/batch_export.py
branches/soc-2011-garlic/release/scripts/templates/ui_menu.py
branches/soc-2011-garlic/release/scripts/templates/ui_menu_simple.py
branches/soc-2011-garlic/release/scripts/templates/ui_panel_simple.py
branches/soc-2011-garlic/source/blender/python/mathutils/
branches/soc-2011-garlic/source/blender/python/mathutils/CMakeLists.txt
branches/soc-2011-garlic/source/blender/python/mathutils/mathutils.c
branches/soc-2011-garlic/source/blender/python/mathutils/mathutils.h
branches/soc-2011-garlic/source/blender/python/mathutils/mathutils_Color.c
branches/soc-2011-garlic/source/blender/python/mathutils/mathutils_Color.h
branches/soc-2011-garlic/source/blender/python/mathutils/mathutils_Euler.c
branches/soc-2011-garlic/source/blender/python/mathutils/mathutils_Euler.h
branches/soc-2011-garlic/source/blender/python/mathutils/mathutils_Matrix.c
branches/soc-2011-garlic/source/blender/python/mathutils/mathutils_Matrix.h
branches/soc-2011-garlic/source/blender/python/mathutils/mathutils_Quaternion.c
branches/soc-2011-garlic/source/blender/python/mathutils/mathutils_Quaternion.h
branches/soc-2011-garlic/source/blender/python/mathutils/mathutils_Vector.c
branches/soc-2011-garlic/source/blender/python/mathutils/mathutils_Vector.h
branches/soc-2011-garlic/source/blender/python/mathutils/mathutils_geometry.c
branches/soc-2011-garlic/source/blender/python/mathutils/mathutils_geometry.h
branches/soc-2011-garlic/source/tests/check_deprecated.py
Removed Paths:
-------------
branches/soc-2011-garlic/release/scripts/templates/panel_simple.py
branches/soc-2011-garlic/source/blender/python/generic/mathutils.c
branches/soc-2011-garlic/source/blender/python/generic/mathutils.h
branches/soc-2011-garlic/source/blender/python/generic/mathutils_Color.c
branches/soc-2011-garlic/source/blender/python/generic/mathutils_Color.h
branches/soc-2011-garlic/source/blender/python/generic/mathutils_Euler.c
branches/soc-2011-garlic/source/blender/python/generic/mathutils_Euler.h
branches/soc-2011-garlic/source/blender/python/generic/mathutils_Matrix.c
branches/soc-2011-garlic/source/blender/python/generic/mathutils_Matrix.h
branches/soc-2011-garlic/source/blender/python/generic/mathutils_Quaternion.c
branches/soc-2011-garlic/source/blender/python/generic/mathutils_Quaternion.h
branches/soc-2011-garlic/source/blender/python/generic/mathutils_Vector.c
branches/soc-2011-garlic/source/blender/python/generic/mathutils_Vector.h
branches/soc-2011-garlic/source/blender/python/generic/mathutils_geometry.c
branches/soc-2011-garlic/source/blender/python/generic/mathutils_geometry.h
Modified: branches/soc-2011-garlic/CMakeLists.txt
===================================================================
--- branches/soc-2011-garlic/CMakeLists.txt 2011-07-29 17:36:49 UTC (rev 38822)
+++ branches/soc-2011-garlic/CMakeLists.txt 2011-07-29 17:42:53 UTC (rev 38823)
@@ -155,6 +155,7 @@
option(WITH_IMAGE_CINEON "Enable CINEON and DPX Image Support" ON)
option(WITH_IMAGE_HDR "Enable HDR Image Support" ON)
option(WITH_IMAGE_REDCODE "Enable RedCode Image Support" OFF)
+option(WITH_IMAGE_FRAMESERVER "Enable image FrameServer Support for rendering" ON)
# Audio/Video format support
option(WITH_CODEC_FFMPEG "Enable FFMPeg Support (http://ffmpeg.org)" OFF)
@@ -729,10 +730,14 @@
endif()
if(WITH_PYTHON)
- set(PYTHON_VERSION 3.2)
- set(PYTHON_INCLUDE_DIRS "${LIBDIR}/python/include/python${PYTHON_VERSION}")
- # set(PYTHON_BINARY python) # not used yet
- set(PYTHON_LIBRARIES ${LIBDIR}/python/lib/python32.lib)
+ # normally cached but not since we include them with blender
+ set(PYTHON_VERSION 3.2) # CACHE STRING)
+ set(PYTHON_INCLUDE_DIR "${LIBDIR}/python/include/python${PYTHON_VERSION}") # CACHE PATH)
+ set(PYTHON_LIBRARY "${LIBDIR}/python/lib/python32.lib") #CACHE FILEPATH)
+
+ # uncached vars
+ set(PYTHON_INCLUDE_DIRS "${PYTHON_INCLUDE_DIR}")
+ set(PYTHON_LIBRARIES "${PYTHON_LIBRARY}")
endif()
set(PLATFORM_LINKFLAGS "/SUBSYSTEM:CONSOLE /STACK:2097152 /INCREMENTAL:NO /NODEFAULTLIB:msvcrt.lib /NODEFAULTLIB:msvcmrt.lib /NODEFAULTLIB:msvcurt.lib /NODEFAULTLIB:msvcrtd.lib")
@@ -832,12 +837,14 @@
endif()
if(WITH_PYTHON)
- set(PYTHON ${LIBDIR}/python)
- set(PYTHON_VERSION 3.2)
- set(PYTHON_INCLUDE_DIRS "${PYTHON}/include/python${PYTHON_VERSION}")
- # set(PYTHON_BINARY python) # not used yet
- set(PYTHON_LIBRARIES ${PYTHON}/lib/python32mw.lib)
- set(PYTHON_LIBPATH ${PYTHON}/lib)
+ # normally cached but not since we include them with blender
+ set(PYTHON_VERSION 3.2) # CACHE STRING)
+ set(PYTHON_INCLUDE_DIR "${LIBDIR}/python/include/python${PYTHON_VERSION}") # CACHE PATH)
+ set(PYTHON_LIBRARY "${LIBDIR}/python/lib/python32mw.lib") # CACHE FILEPATH)
+
+ # uncached vars
+ set(PYTHON_INCLUDE_DIRS "${PYTHON_INCLUDE_DIR}")
+ set(PYTHON_LIBRARIES "${PYTHON_LIBRARY}")
endif()
set(PLATFORM_LINKFLAGS "--stack,2097152")
@@ -888,27 +895,33 @@
set(SNDFILE_LIBPATH ${SNDFILE}/lib ${FFMPEG}/lib) # TODO, deprecate
endif()
- set(PYTHON_VERSION 3.2)
+ if(WITH_PYTHON)
+ set(PYTHON_VERSION 3.2)
+ if(PYTHON_VERSION MATCHES 3.2)
+ # we use precompiled libraries for py 3.2 and up by default
- if(PYTHON_VERSION MATCHES 3.2)
- # we use precompiled libraries for py 3.2 and up by default
+ # normally cached but not since we include them with blender
+ set(PYTHON_INCLUDE_DIR "${LIBDIR}/python/include/python${PYTHON_VERSION}")
+ # set(PYTHON_BINARY "${LIBDIR}/python/bin/python${PYTHON_VERSION}") # not used yet
+ set(PYTHON_LIBRARY python${PYTHON_VERSION})
+ set(PYTHON_LIBPATH "${LIBDIR}/python/lib/python${PYTHON_VERSION}")
+ # set(PYTHON_LINKFLAGS "-u _PyMac_Error") # won't build with this enabled
+ else()
+ # otherwise, use custom system framework
+ # *not used but maintained incase some dev wants to*
- set(PYTHON ${LIBDIR}/python)
- set(PYTHON_INCLUDE_DIRS "${PYTHON}/include/python${PYTHON_VERSION}")
- # set(PYTHON_BINARY "${PYTHON}/bin/python${PYTHON_VERSION}") # not used yet
- set(PYTHON_LIBRARIES python${PYTHON_VERSION})
- set(PYTHON_LIBPATH "${PYTHON}/lib/python${PYTHON_VERSION}")
- # set(PYTHON_LINKFLAGS "-u _PyMac_Error") # won't build with this enabled
- else()
- # otherwise, use custom system framework
+ set(PYTHON "/System/Library/Frameworks/Python.framework/Versions/" CACHE PATH)
+ set(PYTHON_INCLUDE_DIR "${PYTHON}${PYTHON_VERSION}/include/python${PYTHON_VERSION}" CACHE PATH)
+ # set(PYTHON_BINARY ${PYTHON}${PYTHON_VERSION}/bin/python${PYTHON_VERSION}) # not used yet
+ set(PYTHON_LIBRARY "" CACHE FILEPATH)
+ set(PYTHON_LIBPATH "${PYTHON}${PYTHON_VERSION}/lib/python${PYTHON_VERSION}/config" CACHE PATH)
+ set(PYTHON_LINKFLAGS "-u _PyMac_Error -framework System -framework Python" CACHE STRING)
+ unset(PYTHON)
+ endif()
- set(PYTHON /System/Library/Frameworks/Python.framework/Versions/)
- set(PYTHON_VERSION 3.2)
- set(PYTHON_INCLUDE_DIRS "${PYTHON}${PYTHON_VERSION}/include/python${PYTHON_VERSION}")
- # set(PYTHON_BINARY ${PYTHON}${PYTHON_VERSION}/bin/python${PYTHON_VERSION}) # not used yet
- set(PYTHON_LIBRARIES "")
- set(PYTHON_LIBPATH ${PYTHON}${PYTHON_VERSION}/lib/python${PYTHON_VERSION}/config)
- set(PYTHON_LINKFLAGS "-u _PyMac_Error -framework System -framework Python")
+ # uncached vars
+ set(PYTHON_INCLUDE_DIRS "${PYTHON_INCLUDE_DIR}")
+ set(PYTHON_LIBRARIES "${PYTHON_LIBRARY}")
endif()
if(WITH_INTERNATIONAL)
@@ -1203,6 +1216,20 @@
endif()
endif()
+
+# ensure python header is found since detection can fail, this could happen
+# with _any_ library but since we used a fixed python version this tends to
+# be most problematic.
+if(WITH_PYTHON)
+ if(NOT EXISTS "${PYTHON_INCLUDE_DIR}/Python.h")
+ message(FATAL_ERROR "Missing: \"${PYTHON_INCLUDE_DIR}/Python.h\",\n"
+ "Set the cache entry 'PYTHON_INCLUDE_DIR' to point "
+ "to a valid python include path. Containing "
+ "Python.h for python version \"${PYTHON_VERSION}\"")
+ endif()
+endif()
+
+
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${PLATFORM_CFLAGS} ${C_WARNINGS}")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${PLATFORM_CFLAGS} ${CXX_WARNINGS}")
Modified: branches/soc-2011-garlic/GNUmakefile
===================================================================
--- branches/soc-2011-garlic/GNUmakefile 2011-07-29 17:36:49 UTC (rev 38822)
+++ branches/soc-2011-garlic/GNUmakefile 2011-07-29 17:42:53 UTC (rev 38823)
@@ -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-garlic/SConstruct
===================================================================
--- branches/soc-2011-garlic/SConstruct 2011-07-29 17:36:49 UTC (rev 38822)
+++ branches/soc-2011-garlic/SConstruct 2011-07-29 17:42:53 UTC (rev 38823)
@@ -361,6 +361,23 @@
print B.bc.HEADER+'Already Clean, nothing to do.'+B.bc.ENDC
Exit()
+
+# ensure python header is found since detection can fail, this could happen
+# with _any_ library but since we used a fixed python version this tends to
+# be most problematic.
+if env['WITH_BF_PYTHON']:
+ py_h = os.path.join(Dir(env.subst('${BF_PYTHON_INC}')).abspath, "Python.h")
+
+ if not os.path.exists(py_h):
+ print("\nMissing: \"" + env.subst('${BF_PYTHON_INC}') + os.sep + "Python.h\",\n"
+ " Set 'BF_PYTHON_INC' to point "
+ "to a valid python include path.\n Containing "
+ "Python.h for python version \"" + env.subst('${BF_PYTHON_VERSION}') + "\"")
+
+ Exit()
+ del py_h
+
+
if not os.path.isdir ( B.root_build_dir):
os.makedirs ( B.root_build_dir )
os.makedirs ( B.root_build_dir + 'source' )
@@ -470,7 +487,7 @@
if f.endswith('.ttf'):
continue
- if 'locale' in dp:
+ if 'locale' in dp or 'fonts' in dp:
datafileslist.append(os.path.join(dp,f))
dir= os.path.join(*([env['BF_INSTALLDIR']] + [VERSION] + ['datafiles'] + dp.split(os.sep)[2:])) # skip bin/.blender
datafilestargetlist.append(dir + os.sep + f)
Modified: branches/soc-2011-garlic/build_files/cmake/cmake_consistency_check.py
===================================================================
--- branches/soc-2011-garlic/build_files/cmake/cmake_consistency_check.py 2011-07-29 17:36:49 UTC (rev 38822)
+++ branches/soc-2011-garlic/build_files/cmake/cmake_consistency_check.py 2011-07-29 17:42:53 UTC (rev 38823)
@@ -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:
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list