[Bf-blender-cvs] [413036b] master: Fix T46377: No python executable in 2.76 rc3 distribution for OSX

Sergey Sharybin noreply at git.blender.org
Mon Oct 5 12:44:40 CEST 2015


Commit: 413036b0d81d4c69e4faf97985c37d40ff6b6ec4
Author: Sergey Sharybin
Date:   Mon Oct 5 15:43:56 2015 +0500
Branches: master
https://developer.blender.org/rB413036b0d81d4c69e4faf97985c37d40ff6b6ec4

Fix T46377: No python executable in 2.76 rc3 distribution for OSX

===================================================================

M	build_files/scons/tools/Blender.py
M	source/creator/CMakeLists.txt

===================================================================

diff --git a/build_files/scons/tools/Blender.py b/build_files/scons/tools/Blender.py
index 8419f97..d44c5ca 100644
--- a/build_files/scons/tools/Blender.py
+++ b/build_files/scons/tools/Blender.py
@@ -796,6 +796,8 @@ def AppIt(target=None, source=None, env=None):
         commands.getoutput(cmd)
         cmd = 'cp -R %s/release/site-packages/ %s/%s.app/Contents/Resources/%s/python/lib/python%s/site-packages/'%(libdir,installdir,binary,VERSION,env['BF_PYTHON_VERSION'])
         commands.getoutput(cmd)
+        cmd = 'cp -r %s/python/bin -d %s/%s.app/Contents/Resources/%s/python/'%(libdir,installdir,binary,VERSION)
+        commands.getoutput(cmd)
 
     cmd = 'chmod +x  %s/%s.app/Contents/MacOS/%s'%(installdir,binary, binary)
     commands.getoutput(cmd)
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index a358917..8feb882 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -948,6 +948,10 @@ elseif(APPLE)
 			${CMAKE_CURRENT_BINARY_DIR}/python/lib/python${PYTHON_VERSION}/site-packages
 		)
 
+		install(DIRECTORY ${LIBDIR}/python/bin
+			DESTINATION ${TARGETDIR_VER}/python
+			USE_SOURCE_PERMISSIONS
+		)
 	endif()
 	
 	# install blenderplayer bundle - copy of blender.app above. re-using macros et al




More information about the Bf-blender-cvs mailing list