[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30409] branches/render25: Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r30308 :30407

Brecht Van Lommel brecht at blender.org
Fri Jul 16 14:15:30 CEST 2010 

Revision: 30409
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30409
Author:   blendix
Date:     2010-07-16 14:15:28 +0200 (Fri, 16 Jul 2010)

Log Message:
-----------
Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r30308:30407

Modified Paths:
--------------
    branches/render25/CMakeLists.txt
    branches/render25/SConstruct
    branches/render25/build_files/cmake/macros.cmake
    branches/render25/build_files/scons/tools/Blender.py
    branches/render25/doc/blender.1
    branches/render25/doc/blender.1.py
    branches/render25/intern/ghost/CMakeLists.txt
    branches/render25/intern/ghost/SConscript
    branches/render25/intern/ghost/intern/GHOST_SystemX11.cpp
    branches/render25/intern/ghost/intern/GHOST_WindowCarbon.cpp
    branches/render25/intern/ghost/intern/GHOST_WindowCocoa.mm
    branches/render25/intern/ghost/intern/GHOST_WindowWin32.cpp
    branches/render25/projectfiles_vc9/blender/editors/ED_editors.vcproj
    branches/render25/projectfiles_vc9/blender/gpu/BL_gpu.vcproj
    branches/render25/release/freedesktop/blender.desktop
    branches/render25/release/scripts/io/export_3ds.py
    branches/render25/release/scripts/io/export_fbx.py
    branches/render25/release/scripts/io/export_mdd.py
    branches/render25/release/scripts/io/export_obj.py
    branches/render25/release/scripts/io/export_ply.py
    branches/render25/release/scripts/io/export_x3d.py
    branches/render25/release/scripts/io/import_anim_bvh.py
    branches/render25/release/scripts/io/import_scene_3ds.py
    branches/render25/release/scripts/io/import_scene_obj.py
    branches/render25/release/scripts/io/netrender/repath.py
    branches/render25/release/scripts/modules/add_object_utils.py
    branches/render25/release/scripts/modules/bpy/utils.py
    branches/render25/release/scripts/modules/bpy_types.py
    branches/render25/release/scripts/modules/console/complete_calltip.py
    branches/render25/release/scripts/modules/rigify/__init__.py
    branches/render25/release/scripts/modules/rigify/arm_biped.py
    branches/render25/release/scripts/modules/rna_info.py
    branches/render25/release/scripts/op/console_python.py
    branches/render25/release/scripts/op/fcurve_euler_filter.py
    branches/render25/release/scripts/op/mesh.py
    branches/render25/release/scripts/op/nla.py
    branches/render25/release/scripts/op/object.py
    branches/render25/release/scripts/op/sequencer.py
    branches/render25/release/scripts/op/uv.py
    branches/render25/release/scripts/op/uvcalc_follow_active.py
    branches/render25/release/scripts/op/uvcalc_smart_project.py
    branches/render25/release/scripts/op/vertexpaint_dirt.py
    branches/render25/release/scripts/presets/interaction/maya.py
    branches/render25/release/scripts/templates/operator_uv.py
    branches/render25/release/scripts/ui/properties_data_bone.py
    branches/render25/release/scripts/ui/properties_data_modifier.py
    branches/render25/release/scripts/ui/properties_game.py
    branches/render25/release/scripts/ui/properties_object_constraint.py
    branches/render25/release/scripts/ui/properties_texture.py
    branches/render25/release/scripts/ui/space_time.py
    branches/render25/release/scripts/ui/space_userpref.py
    branches/render25/release/scripts/ui/space_view3d.py
    branches/render25/release/scripts/ui/space_view3d_toolbar.py
    branches/render25/source/blender/blenkernel/BKE_blender.h
    branches/render25/source/blender/blenkernel/BKE_brush.h
    branches/render25/source/blender/blenkernel/BKE_paint.h
    branches/render25/source/blender/blenkernel/intern/DerivedMesh.c
    branches/render25/source/blender/blenkernel/intern/brush.c
    branches/render25/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/render25/source/blender/blenkernel/intern/colortools.c
    branches/render25/source/blender/blenkernel/intern/curve.c
    branches/render25/source/blender/blenkernel/intern/icons.c
    branches/render25/source/blender/blenkernel/intern/image.c
    branches/render25/source/blender/blenkernel/intern/sequencer.c
    branches/render25/source/blender/blenlib/BLI_path_util.h
    branches/render25/source/blender/blenlib/BLI_pbvh.h
    branches/render25/source/blender/blenlib/BLI_winstuff.h
    branches/render25/source/blender/blenlib/intern/fileops.c
    branches/render25/source/blender/blenlib/intern/math_geom.c
    branches/render25/source/blender/blenlib/intern/path_util.c
    branches/render25/source/blender/blenlib/intern/pbvh.c
    branches/render25/source/blender/blenlib/intern/storage.c
    branches/render25/source/blender/blenloader/intern/readfile.c
    branches/render25/source/blender/blenloader/intern/writefile.c
    branches/render25/source/blender/editors/animation/fmodifier_ui.c
    branches/render25/source/blender/editors/animation/keyframing.c
    branches/render25/source/blender/editors/curve/editcurve.c
    branches/render25/source/blender/editors/gpencil/gpencil_buttons.c
    branches/render25/source/blender/editors/include/UI_interface.h
    branches/render25/source/blender/editors/interface/interface_icons.c
    branches/render25/source/blender/editors/interface/interface_regions.c
    branches/render25/source/blender/editors/interface/interface_style.c
    branches/render25/source/blender/editors/interface/interface_templates.c
    branches/render25/source/blender/editors/interface/resources.c
    branches/render25/source/blender/editors/object/object_edit.c
    branches/render25/source/blender/editors/object/object_intern.h
    branches/render25/source/blender/editors/object/object_ops.c
    branches/render25/source/blender/editors/sculpt_paint/SConscript
    branches/render25/source/blender/editors/sculpt_paint/paint_image.c
    branches/render25/source/blender/editors/sculpt_paint/paint_intern.h
    branches/render25/source/blender/editors/sculpt_paint/paint_ops.c
    branches/render25/source/blender/editors/sculpt_paint/paint_stroke.c
    branches/render25/source/blender/editors/sculpt_paint/paint_utils.c
    branches/render25/source/blender/editors/sculpt_paint/sculpt.c
    branches/render25/source/blender/editors/sculpt_paint/sculpt_intern.h
    branches/render25/source/blender/editors/space_image/image_buttons.c
    branches/render25/source/blender/editors/space_logic/logic_window.c
    branches/render25/source/blender/editors/space_nla/nla_buttons.c
    branches/render25/source/blender/editors/space_node/drawnode.c
    branches/render25/source/blender/editors/space_outliner/outliner.c
    branches/render25/source/blender/editors/space_view3d/drawmesh.c
    branches/render25/source/blender/editors/space_view3d/view3d_edit.c
    branches/render25/source/blender/gpu/GPU_extensions.h
    branches/render25/source/blender/gpu/intern/gpu_buffers.c
    branches/render25/source/blender/gpu/intern/gpu_draw.c
    branches/render25/source/blender/gpu/intern/gpu_extensions.c
    branches/render25/source/blender/imbuf/intern/openexr/openexr_api.cpp
    branches/render25/source/blender/imbuf/intern/thumbs_blend.c
    branches/render25/source/blender/makesdna/DNA_ID.h
    branches/render25/source/blender/makesdna/DNA_brush_types.h
    branches/render25/source/blender/makesdna/DNA_color_types.h
    branches/render25/source/blender/makesdna/DNA_scene_types.h
    branches/render25/source/blender/makesdna/DNA_userdef_types.h
    branches/render25/source/blender/makesdna/DNA_windowmanager_types.h
    branches/render25/source/blender/makesrna/SConscript
    branches/render25/source/blender/makesrna/intern/CMakeLists.txt
    branches/render25/source/blender/makesrna/intern/rna_action.c
    branches/render25/source/blender/makesrna/intern/rna_animviz.c
    branches/render25/source/blender/makesrna/intern/rna_armature.c
    branches/render25/source/blender/makesrna/intern/rna_brush.c
    branches/render25/source/blender/makesrna/intern/rna_color.c
    branches/render25/source/blender/makesrna/intern/rna_constraint.c
    branches/render25/source/blender/makesrna/intern/rna_controller.c
    branches/render25/source/blender/makesrna/intern/rna_curve.c
    branches/render25/source/blender/makesrna/intern/rna_fcurve.c
    branches/render25/source/blender/makesrna/intern/rna_gpencil.c
    branches/render25/source/blender/makesrna/intern/rna_image.c
    branches/render25/source/blender/makesrna/intern/rna_mesh.c
    branches/render25/source/blender/makesrna/intern/rna_nla.c
    branches/render25/source/blender/makesrna/intern/rna_object.c
    branches/render25/source/blender/makesrna/intern/rna_pose.c
    branches/render25/source/blender/makesrna/intern/rna_sculpt_paint.c
    branches/render25/source/blender/makesrna/intern/rna_sequencer.c
    branches/render25/source/blender/makesrna/intern/rna_space.c
    branches/render25/source/blender/makesrna/intern/rna_timeline.c
    branches/render25/source/blender/makesrna/intern/rna_ui_api.c
    branches/render25/source/blender/makesrna/intern/rna_userdef.c
    branches/render25/source/blender/makesrna/rna_cleanup/rna_booleans.txt
    branches/render25/source/blender/makesrna/rna_cleanup/rna_cleaner.py
    branches/render25/source/blender/python/doc/examples/bpy.data.py
    branches/render25/source/blender/python/doc/sphinx_doc_gen.py
    branches/render25/source/blender/python/generic/bgl.c
    branches/render25/source/blender/python/intern/bpy.c
    branches/render25/source/blender/python/intern/bpy_app.c
    branches/render25/source/blender/windowmanager/CMakeLists.txt
    branches/render25/source/blender/windowmanager/SConscript
    branches/render25/source/blender/windowmanager/intern/wm_draw.c
    branches/render25/source/blender/windowmanager/intern/wm_files.c
    branches/render25/source/blender/windowmanager/intern/wm_init_exit.c
    branches/render25/source/blender/windowmanager/intern/wm_operators.c
    branches/render25/source/blender/windowmanager/intern/wm_window.c
    branches/render25/source/blenderplayer/bad_level_call_stubs/stubs.c
    branches/render25/source/creator/CMakeLists.txt
    branches/render25/source/creator/creator.c
    branches/render25/source/gameengine/Ketsji/KX_Camera.cpp
    branches/render25/source/gameengine/Ketsji/KX_Camera.h
    branches/render25/source/gameengine/PyDoc/bge.logic.rst
    branches/render25/source/gameengine/PyDoc/bge.render.rst
    branches/render25/source/gameengine/PyDoc/bge.types.rst

Added Paths:
-----------
    branches/render25/build_files/cmake/example_scripts/
    branches/render25/build_files/cmake/example_scripts/cmake_linux_install.sh
    branches/render25/release/freedesktop/blender-thumbnailer.py
    branches/render25/source/blender/editors/sculpt_paint/sculpt_undo.c
    branches/render25/source/blender/gpu/GPU_buffers.h

Removed Paths:
-------------
    branches/render25/build_files/cmake/example_scripts/cmake_linux_install.sh
    branches/render25/source/blender/gpu/gpu_buffers.h

Property Changed:
----------------
    branches/render25/release/scripts/io/import_scene_3ds.py
    branches/render25/release/scripts/ui/properties_data_curve.py
    branches/render25/release/scripts/ui/properties_object.py
    branches/render25/release/scripts/ui/properties_object_constraint.py
    branches/render25/release/scripts/ui/properties_physics_cloth.py
    branches/render25/release/scripts/ui/properties_physics_common.py
    branches/render25/release/scripts/ui/properties_physics_softbody.py
    branches/render25/release/scripts/ui/properties_render.py
    branches/render25/release/scripts/ui/properties_scene.py
    branches/render25/release/scripts/ui/space_userpref.py

Modified: branches/render25/CMakeLists.txt
===================================================================
--- branches/render25/CMakeLists.txt	2010-07-16 11:57:26 UTC (rev 30408)
+++ branches/render25/CMakeLists.txt	2010-07-16 12:15:28 UTC (rev 30409)
@@ -55,10 +55,6 @@
 SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin)
 SET(LIBRARY_OUTPUT_PATH  ${CMAKE_BINARY_DIR}/lib)
 
-# Note! - Could create this from the blender version string
-# ...but thats quite involved, make sure this matches the blender version.
-SET(BLENDER_VERSION  2.5)
-
 #-----------------------------------------------------------------------------
 # Load some macros.
 INCLUDE(build_files/cmake/macros.cmake)
@@ -66,6 +62,8 @@
 #-----------------------------------------------------------------------------
 # Set default config options
 
+GET_BLENDER_VERSION()
+
 # Blender internal features
 OPTION(WITH_INTERNATIONAL "Enable I18N   (International fonts and text)" ON)
 OPTION(WITH_LCMS          "Enable color correction with lcms" OFF)
@@ -628,6 +626,12 @@
 			SET(WITH_JACK OFF)
 		ENDIF(WITH_JACK)
 
+		IF(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD)
+			SET(PLATFORM_CFLAGS " -msse -msse2 ${PLATFORM_CFLAGS}")
+			ADD_DEFINITIONS(-D__SSE__)
+			ADD_DEFINITIONS(-D__MMX__)
+		ENDIF(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD)
+
 	ENDIF(MSVC)
 
 ENDIF(WIN32)

Modified: branches/render25/SConstruct
===================================================================
--- branches/render25/SConstruct	2010-07-16 11:57:26 UTC (rev 30408)
+++ branches/render25/SConstruct	2010-07-16 12:15:28 UTC (rev 30409)
@@ -47,19 +47,18 @@
 from tempfile import mkdtemp
 
 # needed for importing tools
-sys.path.append(os.path.join(".", "build_files", "scons"))
+sys.path.append(os.path.join(".", "build_files", "scons", "tools"))
 
-import tools.Blender
-import tools.btools
-import tools.bcolors
+import Blender
+import btools
+import bcolors
 
 EnsureSConsVersion(1,0,0)
 
-BlenderEnvironment = tools.Blender.BlenderEnvironment
-btools = tools.btools
-B = tools.Blender
+BlenderEnvironment = Blender.BlenderEnvironment
+B = Blender
 
-VERSION = tools.btools.VERSION # This is used in creating the local config directories
+VERSION = btools.VERSION # This is used in creating the local config directories
 
 ### globals ###
 platform = sys.platform

Copied: branches/render25/build_files/cmake/example_scripts (from rev 30407, trunk/blender/build_files/cmake/example_scripts)

Deleted: branches/render25/build_files/cmake/example_scripts/cmake_linux_install.sh
===================================================================
--- trunk/blender/build_files/cmake/example_scripts/cmake_linux_install.sh	2010-07-16 10:13:04 UTC (rev 30407)
+++ branches/render25/build_files/cmake/example_scripts/cmake_linux_install.sh	2010-07-16 12:15:28 UTC (rev 30409)
@@ -1,37 +0,0 @@
-#!/bin/sh
-
-# This shell script checks out and compiles blender, tested on ubuntu 10.04
-# assumes you have dependancies installed alredy
-
-# See this page for more info:
-#  http://wiki.blender.org/index.php/Dev:2.5/Doc/Building_Blender/Linux/Generic_Distro/CMake
-
-# grab blender
-mkdir ~/blender-svn 
-cd ~/blender-svn
-svn co https://svn.blender.org/svnroot/bf-blender/trunk/blender
-
-# create cmake dir
-mkdir ~/blender-svn/build-cmake
-cd ~/blender-svn/build-cmake
-
-# cmake without copying files for fast rebuilds
-# the files from svn will be used in place
-cmake ../blender -DWITH_INSTALL:BOOL=FALSE
-
-# make blender, will take some time
-make
-
-# link the binary to blenders source directory to run quickly
-ln -s ~/blender-svn/build-cmake/bin/blender ~/blender-svn/blender/blender.bin
-
-# useful info
-echo ""
-echo "* Useful Commands *"
-echo "   Run Blender: ~/blender-svn/blender/blender.bin"
-echo "   Update Blender: svn up ~/blender-svn/blender"
-echo "   Reconfigure Blender: cd ~/blender-svn/build-cmake ; cmake ."
-echo "   Build Blender: cd ~/blender-svn/build-cmake ; make"
-echo ""
-
-

Copied: branches/render25/build_files/cmake/example_scripts/cmake_linux_install.sh (from rev 30407, trunk/blender/build_files/cmake/example_scripts/cmake_linux_install.sh)
===================================================================
--- branches/render25/build_files/cmake/example_scripts/cmake_linux_install.sh	                        (rev 0)
+++ branches/render25/build_files/cmake/example_scripts/cmake_linux_install.sh	2010-07-16 12:15:28 UTC (rev 30409)
@@ -0,0 +1,37 @@
+#!/bin/sh
+
+# This shell script checks out and compiles blender, tested on ubuntu 10.04
+# assumes you have dependancies installed alredy
+
+# See this page for more info:
+#  http://wiki.blender.org/index.php/Dev:2.5/Doc/Building_Blender/Linux/Generic_Distro/CMake
+
+# grab blender
+mkdir ~/blender-svn 
+cd ~/blender-svn
+svn co https://svn.blender.org/svnroot/bf-blender/trunk/blender
+
+# create cmake dir
+mkdir ~/blender-svn/build-cmake
+cd ~/blender-svn/build-cmake
+
+# cmake without copying files for fast rebuilds
+# the files from svn will be used in place
+cmake ../blender -DWITH_INSTALL:BOOL=FALSE
+
+# make blender, will take some time
+make
+
+# link the binary to blenders source directory to run quickly
+ln -s ~/blender-svn/build-cmake/bin/blender ~/blender-svn/blender/blender.bin
+
+# useful info
+echo ""
+echo "* Useful Commands *"
+echo "   Run Blender: ~/blender-svn/blender/blender.bin"
+echo "   Update Blender: svn up ~/blender-svn/blender"
+echo "   Reconfigure Blender: cd ~/blender-svn/build-cmake ; cmake ."
+echo "   Build Blender: cd ~/blender-svn/build-cmake ; make"
+echo ""
+
+

Modified: branches/render25/build_files/cmake/macros.cmake
===================================================================
--- branches/render25/build_files/cmake/macros.cmake	2010-07-16 11:57:26 UTC (rev 30408)
+++ branches/render25/build_files/cmake/macros.cmake	2010-07-16 12:15:28 UTC (rev 30409)
@@ -198,3 +198,36 @@
 	SUPPORT_SSE_BUILD)
 ENDMACRO(TEST_SSE_SUPPORT)
 
+MACRO(GET_BLENDER_VERSION)
+	FILE(READ ${CMAKE_SOURCE_DIR}/source/blender/blenkernel/BKE_blender.h CONTENT)
+	STRING(REGEX REPLACE "\n" ";" CONTENT "${CONTENT}")
+	STRING(REGEX REPLACE "\t" ";" CONTENT "${CONTENT}")
+	STRING(REGEX REPLACE " " ";" CONTENT "${CONTENT}")
+
+	FOREACH(ITEM ${CONTENT})
+		IF(LASTITEM MATCHES "BLENDER_VERSION")
+			MATH(EXPR BLENDER_VERSION_MAJOR "${ITEM} / 100")
+			MATH(EXPR BLENDER_VERSION_MINOR "${ITEM} % 100")
+			SET(BLENDER_VERSION "${BLENDER_VERSION_MAJOR}.${BLENDER_VERSION_MINOR}")
+		ENDIF(LASTITEM MATCHES "BLENDER_VERSION")
+		
+		IF(LASTITEM MATCHES "BLENDER_SUBVERSION")
+			SET(BLENDER_SUBVERSION ${ITEM})
+		ENDIF(LASTITEM MATCHES "BLENDER_SUBVERSION")
+		
+		IF(LASTITEM MATCHES "BLENDER_MINVERSION")
+			MATH(EXPR BLENDER_MINVERSION_MAJOR "${ITEM} / 100")
+			MATH(EXPR BLENDER_MINVERSION_MINOR "${ITEM} % 100")
+			SET(BLENDER_MINVERSION "${BLENDER_MINVERSION_MAJOR}.${BLENDER_MINVERSION_MINOR}")
+		ENDIF(LASTITEM MATCHES "BLENDER_MINVERSION")
+		
+		IF(LASTITEM MATCHES "BLENDER_MINSUBVERSION")
+			SET(BLENDER_MINSUBVERSION ${ITEM})
+		ENDIF(LASTITEM MATCHES "BLENDER_MINSUBVERSION")
+
+		SET(LASTITEM ${ITEM})
+	ENDFOREACH(ITEM ${CONTENT})
+	
+	MESSAGE(STATUS "Version major: ${BLENDER_VERSION_MAJOR}, Version minor: ${BLENDER_VERSION_MINOR}, Subversion: ${BLENDER_SUBVERSION}, Version: ${BLENDER_VERSION}")
+	MESSAGE(STATUS "Minversion major: ${BLENDER_MINVERSION_MAJOR}, Minversion minor: ${BLENDER_MINVERSION_MINOR}, MinSubversion: ${BLENDER_MINSUBVERSION}, Minversion: ${BLENDER_MINVERSION}")
+ENDMACRO(GET_BLENDER_VERSION)

Modified: branches/render25/build_files/scons/tools/Blender.py
===================================================================
--- branches/render25/build_files/scons/tools/Blender.py	2010-07-16 11:57:26 UTC (rev 30408)
+++ branches/render25/build_files/scons/tools/Blender.py	2010-07-16 12:15:28 UTC (rev 30409)
@@ -498,7 +498,9 @@
 	builddir, b = os.path.split(a)
 	libdir = env['LCGDIR'][1:]
 	osxarch = env['MACOSX_ARCHITECTURE']
+	installdir = env['BF_INSTALLDIR']
 	print("compiled architecture: %s"%(osxarch))
+	print("Installing to %s"%(installdir))
 	if  libdir == '../lib/darwin-9.x.universal':
 		python_zip = 'python_' + osxarch + '.zip' # set specific python_arch.zip
 	else:
@@ -513,45 +515,45 @@
 	
 	sourcedir = bldroot + '/source/darwin/%s.app'%binary
 	sourceinfo = bldroot + "/source/darwin/%s.app/Contents/Info.plist"%binary
-	targetinfo = builddir +'/' + "%s.app/Contents/Info.plist"%binary
-	cmd = builddir + '/' +'%s.app'%binary
+	targetinfo = installdir +'/' + "%s.app/Contents/Info.plist"%binary
+	cmd = installdir + '/' +'%s.app'%binary
 	
 	if os.path.isdir(cmd):
 		shutil.rmtree(cmd)
 	shutil.copytree(sourcedir, cmd)
 	cmd = "cat %s | sed s/VERSION/`cat release/VERSION`/ | sed s/DATE/`date +'%%Y-%%b-%%d'`/ > %s"%(sourceinfo,targetinfo)
 	commands.getoutput(cmd)
-	cmd = 'cp %s/%s %s/%s.app/Contents/MacOS/%s'%(builddir, binary,builddir, binary, binary)
+	cmd = 'cp %s/%s %s/%s.app/Contents/MacOS/%s'%(builddir, binary,installdir, binary, binary)
 	commands.getoutput(cmd)
-	cmd = 'mkdir %s/%s.app/Contents/MacOS/%s/'%(builddir, binary, VERSION)
+	cmd = 'mkdir %s/%s.app/Contents/MacOS/%s/'%(installdir, binary, VERSION)
 #	print cmd
 	commands.getoutput(cmd)
-	cmd = builddir + '/%s.app/Contents/MacOS/%s'%(binary,VERSION)
+	cmd = installdir + '/%s.app/Contents/MacOS/%s'%(binary,VERSION)
 	shutil.copy(bldroot + '/bin/.blender/.bfont.ttf', cmd)
 	shutil.copy(bldroot + '/bin/.blender/.Blanguages', cmd)
-	cmd = 'cp -R %s/bin/%s/locale %s/%s.app/Contents/Resources/'%(bldroot,VERSION,builddir,binary)
+	cmd = 'cp -R %s/bin/%s/locale %s/%s.app/Contents/Resources/'%(bldroot,VERSION,installdir,binary)
 	commands.getoutput(cmd)
-	cmd = 'cp -R %s/bin/%s/locale %s/%s.app/Contents/MacOS/%s/'%(bldroot,VERSION,builddir,binary,VERSION)
+	cmd = 'cp -R %s/bin/%s/locale %s/%s.app/Contents/MacOS/%s/'%(bldroot,VERSION,installdir,binary,VERSION)
 	commands.getoutput(cmd)
-	cmd = 'cp %s/bin/%s/.Blanguages %s/%s.app/Contents/Resources/'%(bldroot,VERSION,builddir,binary)
+	cmd = 'cp %s/bin/%s/.Blanguages %s/%s.app/Contents/Resources/'%(bldroot,VERSION,installdir,binary)
 	commands.getoutput(cmd)
-	cmd = 'mkdir %s/%s.app/Contents/MacOS/%s/python/'%(builddir,binary, VERSION)
+	cmd = 'mkdir %s/%s.app/Contents/MacOS/%s/python/'%(installdir,binary, VERSION)
 	commands.getoutput(cmd)
-	cmd = 'unzip -q %s/release/%s -d %s/%s.app/Contents/MacOS/%s/python/'%(libdir,python_zip,builddir,binary,VERSION)

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list