[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31564] branches/soc-2010-leifandersen: Merge with trunk: svn merge -r 31442:31558 https://svn.blender.org/svnroot /bf-blender/trunk/blender/ .
Leif Andersen
leif.a.andersen at gmail.com
Wed Aug 25 04:58:40 CEST 2010
Revision: 31564
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31564
Author: leifandersen
Date: 2010-08-25 04:58:40 +0200 (Wed, 25 Aug 2010)
Log Message:
-----------
Merge with trunk: svn merge -r 31442:31558 https://svn.blender.org/svnroot/bf-blender/trunk/blender/ .
I'm 'hoping' that I should still be able too commit, even though the code submissions haven't been done yet. The last revision to be submited to google next week can be updated by:
svn up --revision 31362
Anyway, I know the last merge had a bunch of issues do to the changed API. I had much of it fixed locally, but not all of it, and I thought since it's been about a week anyway, and there's probably been other changes, I should probably just get the latest build, and use that rather than refactoring again.
Revision Links:
--------------
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31362
Modified Paths:
--------------
branches/soc-2010-leifandersen/CMakeLists.txt
branches/soc-2010-leifandersen/SConstruct
branches/soc-2010-leifandersen/build_files/scons/tools/Blender.py
branches/soc-2010-leifandersen/build_files/scons/tools/btools.py
branches/soc-2010-leifandersen/extern/libopenjpeg/CMakeLists.txt
branches/soc-2010-leifandersen/extern/lzma/CMakeLists.txt
branches/soc-2010-leifandersen/extern/lzo/CMakeLists.txt
branches/soc-2010-leifandersen/intern/audaspace/CMakeLists.txt
branches/soc-2010-leifandersen/intern/audaspace/intern/AUD_C-API.cpp
branches/soc-2010-leifandersen/intern/boolop/CMakeLists.txt
branches/soc-2010-leifandersen/intern/bsp/CMakeLists.txt
branches/soc-2010-leifandersen/intern/container/CMakeLists.txt
branches/soc-2010-leifandersen/intern/decimation/CMakeLists.txt
branches/soc-2010-leifandersen/intern/elbeem/CMakeLists.txt
branches/soc-2010-leifandersen/intern/ghost/CMakeLists.txt
branches/soc-2010-leifandersen/intern/guardedalloc/CMakeLists.txt
branches/soc-2010-leifandersen/intern/iksolver/CMakeLists.txt
branches/soc-2010-leifandersen/intern/itasc/CMakeLists.txt
branches/soc-2010-leifandersen/intern/memutil/CMakeLists.txt
branches/soc-2010-leifandersen/intern/moto/CMakeLists.txt
branches/soc-2010-leifandersen/intern/opennl/CMakeLists.txt
branches/soc-2010-leifandersen/intern/smoke/CMakeLists.txt
branches/soc-2010-leifandersen/intern/smoke/intern/WTURBULENCE.cpp
branches/soc-2010-leifandersen/intern/string/CMakeLists.txt
branches/soc-2010-leifandersen/release/scripts/io/export_3ds.py
branches/soc-2010-leifandersen/release/scripts/io/export_fbx.py
branches/soc-2010-leifandersen/release/scripts/io/export_obj.py
branches/soc-2010-leifandersen/release/scripts/io/export_ply.py
branches/soc-2010-leifandersen/release/scripts/io/export_x3d.py
branches/soc-2010-leifandersen/release/scripts/io/import_scene_3ds.py
branches/soc-2010-leifandersen/release/scripts/io/import_scene_obj.py
branches/soc-2010-leifandersen/release/scripts/io/netrender/client.py
branches/soc-2010-leifandersen/release/scripts/io/netrender/operators.py
branches/soc-2010-leifandersen/release/scripts/io/netrender/repath.py
branches/soc-2010-leifandersen/release/scripts/io/netrender/slave.py
branches/soc-2010-leifandersen/release/scripts/io/netrender/ui.py
branches/soc-2010-leifandersen/release/scripts/modules/bpy/__init__.py
branches/soc-2010-leifandersen/release/scripts/modules/rigify/__init__.py
branches/soc-2010-leifandersen/release/scripts/modules/rigify/arm_biped.py
branches/soc-2010-leifandersen/release/scripts/modules/rigify/eye_balls.py
branches/soc-2010-leifandersen/release/scripts/modules/rigify/eye_lid.py
branches/soc-2010-leifandersen/release/scripts/modules/rigify/leg_biped.py
branches/soc-2010-leifandersen/release/scripts/modules/rigify/leg_quadruped.py
branches/soc-2010-leifandersen/release/scripts/modules/rigify/mouth.py
branches/soc-2010-leifandersen/release/scripts/modules/rigify/stretch.py
branches/soc-2010-leifandersen/release/scripts/modules/rigify/stretch_twist.py
branches/soc-2010-leifandersen/release/scripts/modules/rigify_utils.py
branches/soc-2010-leifandersen/release/scripts/modules/rna_info.py
branches/soc-2010-leifandersen/release/scripts/op/object.py
branches/soc-2010-leifandersen/release/scripts/op/presets.py
branches/soc-2010-leifandersen/release/scripts/op/sequencer.py
branches/soc-2010-leifandersen/release/scripts/op/uv.py
branches/soc-2010-leifandersen/release/scripts/op/uvcalc_follow_active.py
branches/soc-2010-leifandersen/release/scripts/op/uvcalc_smart_project.py
branches/soc-2010-leifandersen/release/scripts/presets/interaction/maya.py
branches/soc-2010-leifandersen/release/scripts/templates/operator_uv.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_animviz.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_data_armature.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_data_armature_rigify.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_data_bone.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_data_curve.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_data_lamp.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_data_lattice.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_data_mesh.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_data_metaball.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_data_modifier.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_game.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_material.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_object.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_object_constraint.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_particle.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_physics_cloth.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_physics_common.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_physics_field.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_physics_fluid.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_physics_smoke.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_physics_softbody.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_render.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_scene.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_texture.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_world.py
branches/soc-2010-leifandersen/release/scripts/ui/space_filebrowser.py
branches/soc-2010-leifandersen/release/scripts/ui/space_image.py
branches/soc-2010-leifandersen/release/scripts/ui/space_info.py
branches/soc-2010-leifandersen/release/scripts/ui/space_logic.py
branches/soc-2010-leifandersen/release/scripts/ui/space_outliner.py
branches/soc-2010-leifandersen/release/scripts/ui/space_sequencer.py
branches/soc-2010-leifandersen/release/scripts/ui/space_time.py
branches/soc-2010-leifandersen/release/scripts/ui/space_userpref_keymap.py
branches/soc-2010-leifandersen/release/scripts/ui/space_view3d.py
branches/soc-2010-leifandersen/release/scripts/ui/space_view3d_toolbar.py
branches/soc-2010-leifandersen/source/blender/blenkernel/BKE_constraint.h
branches/soc-2010-leifandersen/source/blender/blenkernel/BKE_customdata.h
branches/soc-2010-leifandersen/source/blender/blenkernel/BKE_deform.h
branches/soc-2010-leifandersen/source/blender/blenkernel/BKE_fcurve.h
branches/soc-2010-leifandersen/source/blender/blenkernel/BKE_mball.h
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/BME_conversions.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/action.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/blender.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/constraint.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/context.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/customdata.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/deform.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/fmodifier.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/key.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/library.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/mball.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/node.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/property.c
branches/soc-2010-leifandersen/source/blender/editors/animation/fmodifier_ui.c
branches/soc-2010-leifandersen/source/blender/editors/animation/keyingsets.c
branches/soc-2010-leifandersen/source/blender/editors/armature/editarmature.c
branches/soc-2010-leifandersen/source/blender/editors/armature/poselib.c
branches/soc-2010-leifandersen/source/blender/editors/include/ED_mesh.h
branches/soc-2010-leifandersen/source/blender/editors/include/UI_interface.h
branches/soc-2010-leifandersen/source/blender/editors/interface/interface.c
branches/soc-2010-leifandersen/source/blender/editors/interface/interface_icons.c
branches/soc-2010-leifandersen/source/blender/editors/interface/interface_templates.c
branches/soc-2010-leifandersen/source/blender/editors/mesh/editmesh_add.c
branches/soc-2010-leifandersen/source/blender/editors/mesh/editmesh_lib.c
branches/soc-2010-leifandersen/source/blender/editors/mesh/mesh_data.c
branches/soc-2010-leifandersen/source/blender/editors/mesh/meshtools.c
branches/soc-2010-leifandersen/source/blender/editors/metaball/mball_edit.c
branches/soc-2010-leifandersen/source/blender/editors/object/object_add.c
branches/soc-2010-leifandersen/source/blender/editors/object/object_ops.c
branches/soc-2010-leifandersen/source/blender/editors/object/object_vgroup.c
branches/soc-2010-leifandersen/source/blender/editors/render/render_preview.c
branches/soc-2010-leifandersen/source/blender/editors/screen/screen_ops.c
branches/soc-2010-leifandersen/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2010-leifandersen/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2010-leifandersen/source/blender/editors/space_buttons/space_buttons.c
branches/soc-2010-leifandersen/source/blender/editors/space_graph/graph_buttons.c
branches/soc-2010-leifandersen/source/blender/editors/space_graph/graph_edit.c
branches/soc-2010-leifandersen/source/blender/editors/space_image/image_buttons.c
branches/soc-2010-leifandersen/source/blender/editors/space_logic/logic_window.c
branches/soc-2010-leifandersen/source/blender/editors/space_nla/nla_buttons.c
branches/soc-2010-leifandersen/source/blender/editors/space_node/drawnode.c
branches/soc-2010-leifandersen/source/blender/editors/space_outliner/outliner.c
branches/soc-2010-leifandersen/source/blender/editors/space_view3d/drawobject.c
branches/soc-2010-leifandersen/source/blender/editors/space_view3d/view3d_buttons.c
branches/soc-2010-leifandersen/source/blender/editors/space_view3d/view3d_ops.c
branches/soc-2010-leifandersen/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2010-leifandersen/source/blender/editors/transform/transform_conversions.c
branches/soc-2010-leifandersen/source/blender/editors/transform/transform_manipulator.c
branches/soc-2010-leifandersen/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2010-leifandersen/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/soc-2010-leifandersen/source/blender/gpu/intern/gpu_buffers.c
branches/soc-2010-leifandersen/source/blender/imbuf/intern/cineon/cineon_dpx.c
branches/soc-2010-leifandersen/source/blender/imbuf/intern/util.c
branches/soc-2010-leifandersen/source/blender/makesdna/DNA_modifier_types.h
branches/soc-2010-leifandersen/source/blender/makesrna/RNA_access.h
branches/soc-2010-leifandersen/source/blender/makesrna/RNA_define.h
branches/soc-2010-leifandersen/source/blender/makesrna/RNA_types.h
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_ID.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_access.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_animation.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_animviz.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_armature.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_boid.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_cloth.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_color.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_constraint.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_curve.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_define.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_fcurve.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_fluidsim.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_image.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_internal.h
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_lamp.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_main_api.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_material.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_material_api.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_mesh_api.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_meta.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_nla.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_object.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_object_force.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_particle.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_pose.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_property.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_rna.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_scene.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_sculpt_paint.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_sequencer.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_smoke.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_space.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_text.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_texture.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_ui.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_ui_api.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_wm.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_world.c
branches/soc-2010-leifandersen/source/blender/makesrna/rna_cleanup/rna_cleaner.py
branches/soc-2010-leifandersen/source/blender/makesrna/rna_cleanup/rna_properties.txt
branches/soc-2010-leifandersen/source/blender/makesrna/rna_cleanup/rna_update.sh
branches/soc-2010-leifandersen/source/blender/python/generic/CMakeLists.txt
branches/soc-2010-leifandersen/source/blender/python/generic/mathutils_matrix.c
branches/soc-2010-leifandersen/source/blender/python/generic/mathutils_vector.c
branches/soc-2010-leifandersen/source/blender/python/intern/bpy_operator_wrap.c
branches/soc-2010-leifandersen/source/blender/python/intern/bpy_rna.c
branches/soc-2010-leifandersen/source/blender/python/intern/bpy_rna.h
branches/soc-2010-leifandersen/source/blender/render/CMakeLists.txt
branches/soc-2010-leifandersen/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2010-leifandersen/source/blenderplayer/CMakeLists.txt
branches/soc-2010-leifandersen/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2010-leifandersen/source/creator/CMakeLists.txt
branches/soc-2010-leifandersen/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/soc-2010-leifandersen/source/gameengine/Converter/BL_ArmatureChannel.cpp
branches/soc-2010-leifandersen/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/soc-2010-leifandersen/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
branches/soc-2010-leifandersen/source/gameengine/Ketsji/KX_Scene.cpp
Added Paths:
-----------
branches/soc-2010-leifandersen/build_files/cmake/example_scripts/make_quicky.py
branches/soc-2010-leifandersen/release/scripts/modules/animsys_refactor.py
branches/soc-2010-leifandersen/release/scripts/op/animsys_update.py
Property Changed:
----------------
branches/soc-2010-leifandersen/source/blender/makesrna/rna_cleanup/rna_update.sh
Modified: branches/soc-2010-leifandersen/CMakeLists.txt
===================================================================
--- branches/soc-2010-leifandersen/CMakeLists.txt 2010-08-25 02:56:37 UTC (rev 31563)
+++ branches/soc-2010-leifandersen/CMakeLists.txt 2010-08-25 02:58:40 UTC (rev 31564)
@@ -294,9 +294,9 @@
SET(EXPAT_LIB expat)
ENDIF (WITH_OPENCOLLADA)
+ FIND_PACKAGE(X11 REQUIRED)
- # Could use ${X11_Xinput_LIB} ${X11_X11_LIB} too
- SET(LLIBS "-lXi -lutil -lc -lm -lpthread -lstdc++ -lX11")
+ SET(LLIBS "-lutil -lc -lm -lpthread -lstdc++ ${X11_X11_LIB} ${X11_Xinput_LIB}")
IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
# BSD's dont use libdl.so
@@ -873,7 +873,7 @@
IF(WITH_IMAGE_OPENJPEG)
set(OPENJPEG ${CMAKE_SOURCE_DIR}/extern/libopenjpeg)
set(OPENJPEG_INC ${OPENJPEG})
- set(OPENJPEG_LIb extern_libopenjpeg)
+ set(OPENJPEG_LIb extern_openjpeg)
ENDIF(WITH_IMAGE_OPENJPEG)
#-----------------------------------------------------------------------------
Modified: branches/soc-2010-leifandersen/SConstruct
===================================================================
--- branches/soc-2010-leifandersen/SConstruct 2010-08-25 02:56:37 UTC (rev 31563)
+++ branches/soc-2010-leifandersen/SConstruct 2010-08-25 02:58:40 UTC (rev 31564)
@@ -427,6 +427,8 @@
for dp, dn, df in os.walk(bundle):
if '.svn' in dn:
dn.remove('.svn')
+ if '_svn' in dn:
+ dn.remove('_svn')
dir=env['BF_INSTALLDIR']+dp[len(bundledir):]
source=[dp+os.sep+f for f in df]
blenderinstall.append(env.Install(dir=dir,source=source))
@@ -445,6 +447,8 @@
for dp, dn, df in os.walk('bin/.blender'):
if '.svn' in dn:
dn.remove('.svn')
+ if '_svn' in dn:
+ dn.remove('_svn')
for f in df:
if not env['WITH_BF_INTERNATIONAL']:
@@ -481,6 +485,8 @@
for dp, dn, df in os.walk(scriptpath):
if '.svn' in dn:
dn.remove('.svn')
+ if '_svn' in dn:
+ dn.remove('_svn')
dir = os.path.join(env['BF_INSTALLDIR'], VERSION)
dir += os.sep + os.path.basename(scriptpath) + dp[len(scriptpath):]
@@ -496,6 +502,8 @@
for tp, tn, tf in os.walk('release/freedesktop/icons'):
if '.svn' in tn:
tn.remove('.svn')
+ if '_svn' in tn:
+ tn.remove('_svn')
for f in tf:
iconlist.append(os.path.join(tp, f))
icontargetlist.append( os.path.join(*([env['BF_INSTALLDIR']] + tp.split(os.sep)[2:] + [f])) )
@@ -522,6 +530,8 @@
for tp, tn, tf in os.walk('release/plugins'):
if '.svn' in tn:
tn.remove('.svn')
+ if '_svn' in tn:
+ tn.remove('_svn')
df = tp[8:] # remove 'release/'
for f in tf:
pluglist.append(os.path.join(tp, f))
@@ -554,6 +564,8 @@
for tp, tn, tf in os.walk('release/text'):
if '.svn' in tn:
tn.remove('.svn')
+ if '_svn' in tn:
+ tn.remove('_svn')
for f in tf:
textlist.append(tp+os.sep+f)
Copied: branches/soc-2010-leifandersen/build_files/cmake/example_scripts/make_quicky.py (from rev 31558, trunk/blender/build_files/cmake/example_scripts/make_quicky.py)
===================================================================
--- branches/soc-2010-leifandersen/build_files/cmake/example_scripts/make_quicky.py (rev 0)
+++ branches/soc-2010-leifandersen/build_files/cmake/example_scripts/make_quicky.py 2010-08-25 02:58:40 UTC (rev 31564)
@@ -0,0 +1,119 @@
+#! /usr/bin/env python
+
+# ##### 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.
+#
+# ##### END GPL LICENSE BLOCK #####
+
+# <pep8 compliant>
+
+def print_help(targets):
+ print("CMake quicky wrapper, no valid targets given.")
+ print(" * targets can contain a subset of the full target name.")
+ print(" * arguments with a '-' prefix are passed onto make.")
+ print(" * this must run from the cmake build dir")
+ print(" * alias this with a short command for speedy access, in bash:")
+ print(" alias mk='../blender/build_files/cmake/example_scripts/make_quicky.py'")
+ print("")
+ print(" eg: make_quicky.py -j3 extern python")
+ print(" ...will execute")
+ print(" make -j3 extern_binreloc extern_glew bf_python bf_python_ext blender/fast")
+ print("")
+ print("Target List:")
+ for t in targets:
+ print(" %s" % t)
+ print("...exiting")
+
+
+def main():
+ targets = set()
+
+ # collect targets
+ file = open("Makefile", "r")
+ for line in file:
+ line = line.rstrip()
+ if not line or line[0] in ". \t@$#":
+ continue
+
+ line = line.split("#", 1)[0]
+ if ":" not in line:
+ continue
+
+ line = line.split(":", 1)[0]
+
+ if "/" in line: # cmake terget options, dont need these
+ continue
+
+ targets.add(line)
+ file.close()
+
+
+ # remove cmake targets
+ bad = set([
+ "help",
+ "clean",
+ "all",
+ "preinstall",
+ "install",
+ "default_target",
+ "edit_cache",
+ "cmake_force",
+ "rebuild_cache",
+ "depend",
+ "cmake_check_build_system",
+ ])
+
+ targets -= set(bad)
+
+
+ # parse args
+ targets = list(targets)
+ targets.sort()
+
+ import sys
+ if len(sys.argv) == 1:
+ print_help(targets)
+ return
+
+ targets_new = []
+ args = []
+ for arg in sys.argv[1:]:
+ if arg[0] in "/-":
+ args.append(arg)
+ else:
+ found = False
+ for t in targets:
+ if arg in t and t not in targets_new:
+ targets_new.append(t)
+ found = True
+
+ if not found:
+ print("Error '%s' not found in...")
+ for t in targets:
+ print(" %s" % t)
+ print("...aborting.")
+ return
+
+ # execute
+ cmd = "make %s %s blender/fast" % (" ".join(args), " ".join(targets_new))
+ print("cmake building with targets: %s" % " ".join(targets_new))
+ print("executing: %s" % cmd)
+
+ import os
+ os.system(cmd)
+
+if __name__ == "__main__":
+ main()
Modified: branches/soc-2010-leifandersen/build_files/scons/tools/Blender.py
===================================================================
--- branches/soc-2010-leifandersen/build_files/scons/tools/Blender.py 2010-08-25 02:56:37 UTC (rev 31563)
+++ branches/soc-2010-leifandersen/build_files/scons/tools/Blender.py 2010-08-25 02:58:40 UTC (rev 31564)
@@ -155,6 +155,8 @@
libincs += Split(lenv['BF_FFTW3_LIBPATH'])
if lenv['WITH_BF_INTERNATIONAL']:
libincs += Split(lenv['BF_GETTEXT_LIBPATH'])
+ if lenv['WITH_BF_GETTEXT_STATIC']:
+ statlibs += Split(lenv['BF_GETTEXT_LIB_STATIC'])
if lenv['WITH_BF_OPENAL']:
libincs += Split(lenv['BF_OPENAL_LIBPATH'])
if lenv['WITH_BF_STATICOPENAL']:
@@ -201,7 +203,7 @@
syslibs.append(lenv['BF_PYTHON_LIB']+'_d')
else:
syslibs.append(lenv['BF_PYTHON_LIB'])
- if lenv['WITH_BF_INTERNATIONAL']:
+ if lenv['WITH_BF_INTERNATIONAL'] and not lenv['WITH_BF_GETTEXT_STATIC']:
syslibs += Split(lenv['BF_GETTEXT_LIB'])
if lenv['WITH_BF_OPENAL']:
if not lenv['WITH_BF_STATICOPENAL']:
Modified: branches/soc-2010-leifandersen/build_files/scons/tools/btools.py
===================================================================
--- branches/soc-2010-leifandersen/build_files/scons/tools/btools.py 2010-08-25 02:56:37 UTC (rev 31563)
+++ branches/soc-2010-leifandersen/build_files/scons/tools/btools.py 2010-08-25 02:58:40 UTC (rev 31564)
@@ -46,7 +46,7 @@
'WITH_BF_TIFF', 'BF_TIFF', 'BF_TIFF_INC', 'BF_TIFF_LIB', 'BF_TIFF_LIBPATH',
'WITH_BF_ZLIB', 'BF_ZLIB', 'BF_ZLIB_INC', 'BF_ZLIB_LIB', 'BF_ZLIB_LIBPATH',
'WITH_BF_INTERNATIONAL',
- 'BF_GETTEXT', 'BF_GETTEXT_INC', 'BF_GETTEXT_LIB', 'BF_GETTEXT_LIBPATH',
+ 'BF_GETTEXT', 'BF_GETTEXT_INC', 'BF_GETTEXT_LIB', 'WITH_BF_GETTEXT_STATIC', 'BF_GETTEXT_LIB_STATIC', 'BF_GETTEXT_LIBPATH',
'WITH_BF_ICONV', 'BF_ICONV', 'BF_ICONV_INC', 'BF_ICONV_LIB', 'BF_ICONV_LIBPATH',
'WITH_BF_GAMEENGINE', 'WITH_BF_BULLET', 'BF_BULLET', 'BF_BULLET_INC', 'BF_BULLET_LIB',
'BF_WINTAB', 'BF_WINTAB_INC',
@@ -289,6 +289,8 @@
('BF_GETTEXT', 'gettext base path', ''),
('BF_GETTEXT_INC', 'gettext include path', ''),
('BF_GETTEXT_LIB', 'gettext library', ''),
+ (BoolVariable('WITH_BF_GETTEXT_STATIC', 'Use static gettext library if true', False)),
+ ('BF_GETTEXT_LIB_STATIC', 'static gettext library', ''),
('BF_GETTEXT_LIBPATH', 'gettext library path', ''),
(BoolVariable('WITH_BF_ICONV', 'Use iconv if true', True)),
Modified: branches/soc-2010-leifandersen/extern/libopenjpeg/CMakeLists.txt
===================================================================
--- branches/soc-2010-leifandersen/extern/libopenjpeg/CMakeLists.txt 2010-08-25 02:56:37 UTC (rev 31563)
+++ branches/soc-2010-leifandersen/extern/libopenjpeg/CMakeLists.txt 2010-08-25 02:58:40 UTC (rev 31564)
@@ -28,5 +28,5 @@
FILE(GLOB SRC *.c except t1_generate_luts.c)
ADD_DEFINITIONS(-DWITH_OPENJPEG)
-BLENDERLIB(extern_libopenjpeg "${SRC}" "${INC}")
+BLENDERLIB(extern_openjpeg "${SRC}" "${INC}")
#, libtype=['international','player'], priority=[5, 210])
Modified: branches/soc-2010-leifandersen/extern/lzma/CMakeLists.txt
===================================================================
--- branches/soc-2010-leifandersen/extern/lzma/CMakeLists.txt 2010-08-25 02:56:37 UTC (rev 31563)
+++ branches/soc-2010-leifandersen/extern/lzma/CMakeLists.txt 2010-08-25 02:58:40 UTC (rev 31564)
@@ -28,7 +28,4 @@
FILE(GLOB SRC ./*.c)
-
-
-BLENDERLIB(bf_lzma "${SRC}" "${INC}")
-#, libtype='blender', priority = 0 )
+BLENDERLIB(extern_lzma "${SRC}" "${INC}")
Modified: branches/soc-2010-leifandersen/extern/lzo/CMakeLists.txt
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list