[Bf-blender-cvs] [0187356] master: python tar.gz changed structure due to python.exe being added. remove /lib/ from cmake as lib and bin are both in the tar.gz

Martijn Berger noreply at git.blender.org
Sat May 30 09:45:08 CEST 2015


Commit: 0187356613493b31d0359c04a199bf96b24802f4
Author: Martijn Berger
Date:   Sat May 30 09:44:44 2015 +0200
Branches: master
https://developer.blender.org/rB0187356613493b31d0359c04a199bf96b24802f4

python tar.gz changed structure due to python.exe being added. remove /lib/ from cmake as lib and bin are both in the tar.gz

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

M	build_files/scons/tools/Blender.py

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

diff --git a/build_files/scons/tools/Blender.py b/build_files/scons/tools/Blender.py
index 16bb19b..2ab0307 100644
--- a/build_files/scons/tools/Blender.py
+++ b/build_files/scons/tools/Blender.py
@@ -630,7 +630,7 @@ def WinPyBundle(target=None, source=None, env=None):
         py_tar+= '/release/python' + env['BF_PYTHON_VERSION'].replace('.','') + '.tar.gz'
 
     py_target = env.subst(env['BF_INSTALLDIR']).lstrip("#")
-    py_target = os.path.join(py_target, VERSION, 'python', 'lib')
+    py_target = os.path.join(py_target, VERSION, 'python')
     def printexception(func,path,ex):
         if os.path.exists(path): #do not report if path does not exist. eg on a fresh build.
             print str(func) + ' failed on ' + str(path)




More information about the Bf-blender-cvs mailing list