[Bf-blender-cvs] [2c4c4a5] master: Build system copy release/site-packages for windows
Campbell Barton
noreply at git.blender.org
Tue Mar 4 18:14:50 CET 2014
Commit: 2c4c4a56b84c90baa9bf93468baee6bb34d7a012
Author: Campbell Barton
Date: Wed Mar 5 04:12:21 2014 +1100
https://developer.blender.org/rB2c4c4a56b84c90baa9bf93468baee6bb34d7a012
Build system copy release/site-packages for windows
===================================================================
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 2015bb4..3684401 100644
--- a/build_files/scons/tools/Blender.py
+++ b/build_files/scons/tools/Blender.py
@@ -643,6 +643,21 @@ def WinPyBundle(target=None, source=None, env=None):
print("Unpacking '" + py_tar + "' to '" + py_target + "'")
untar_pybundle(py_tar, py_target, exclude_re)
+ # --------------------
+ # Copy 'site-packages'
+ py_dir = env.subst(env['LCGDIR'])
+ if py_dir[0] == '#':
+ py_dir = py_dir[1:]
+ py_dir += '/release/site-packages'
+ # grr, we have to do one by one because the dir exists
+ for f in os.listdir(py_dir):
+ fn_src = os.path.join(py_dir, f)
+ fn_dst = os.path.join(py_target, f)
+
+ shutil.rmtree(fn_dst, False, printexception)
+ shutil.copytree(fn_src, fn_dst)
+
+
def my_appit_print(target, source, env):
a = '%s' % (target[0])
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index d765c33..0f8de9f 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -586,6 +586,17 @@ elseif(WIN32)
)
endif()
+ # release/site-packages
+ install(
+ CODE
+ "
+ execute_process(COMMAND \"${CMAKE_COMMAND}\" -E copy_directory
+ ${LIBDIR}/release/site-packages
+ \"${TARGETDIR_VER}/python/lib/site-packages\")
+ "
+ )
+
+
# doesnt work, todo
# install(CODE "execute_process(COMMAND find ${TARGETDIR}/${BLENDER_VERSION}/python/lib/ -name '*.so' -exec strip -s {} '\;')")
endif()
More information about the Bf-blender-cvs
mailing list