Commit: 5d74cac463742111999e15fb187d8457d1dd241a
Author: Campbell Barton
Date: Wed Mar 5 06:36:50 2014 +1100
https://developer.blender.org/rB5d74cac463742111999e15fb187d8457d1dd241a
Build system: option to copy 'requests' from scons.
===================================================================
M build_files/scons/tools/Blender.py
M build_files/scons/tools/btools.py
===================================================================
diff --git a/build_files/scons/tools/Blender.py
b/build_files/scons/tools/Blender.py
index d5f9446..d222089 100644
--- a/build_files/scons/tools/Blender.py
+++ b/build_files/scons/tools/Blender.py
@@ -868,6 +868,17 @@ def UnixPyBundle(target=None, source=None, env=None):
run("find '%s' -type d -name '*.a' -prune -exec rm -rf {} ';'" %
numpy_target)
else:
print 'Failed to find numpy at %s, skipping copying' % numpy_src
+ del numpy_src, numpy_target
+
+ if env['WITH_BF_PYTHON_INSTALL_REQUESTS']:
+ requests_src = py_src + "/site-packages/requests"
+ requests_target = py_target + "/site-packages/requests"
+ if os.path.exists(requests_src):
+ run("cp -R '%s' '%s'" % (requests_src,
os.path.dirname(requests_target)))
+ run("find '%s' -type d -name '*.pem -prune -exec rm -rf {} ';'" %
requests_target)
+ else:
+ print('Failed to find requests at %s, skipping copying' %
requests_src)
+ del requests_src, requests_target
run("find '%s' -type d -name 'test' -prune -exec rm -rf {} ';'" %
py_target)
run("find '%s' -type d -name '__pycache__' -exec rm -rf {} ';'" %
py_target)
diff --git a/build_files/scons/tools/btools.py
b/build_files/scons/tools/btools.py
index 744896c..3450f29 100644
--- a/build_files/scons/tools/btools.py
+++ b/build_files/scons/tools/btools.py
@@ -124,7 +124,8 @@ def validate_arguments(args, bc):
'BF_CXX', 'WITH_BF_STATICCXX', 'BF_CXX_LIB_STATIC',
'BF_TWEAK_MODE', 'BF_SPLIT_SRC',
'WITHOUT_BF_INSTALL',
- 'WITHOUT_BF_PYTHON_INSTALL', 'WITHOUT_BF_PYTHON_UNPACK',
'WITH_BF_PYTHON_INSTALL_NUMPY',
+ 'WITHOUT_BF_PYTHON_INSTALL', 'WITHOUT_BF_PYTHON_UNPACK',
+ 'WITH_BF_PYTHON_INSTALL_NUMPY', 'WITH_BF_PYTHON_INSTALL_REQUESTS',
'WITHOUT_BF_OVERWRITE_INSTALL',
'WITH_BF_OPENMP', 'BF_OPENMP', 'BF_OPENMP_LIBPATH',
'WITH_BF_STATICOPENMP', 'BF_OPENMP_STATIC_STATIC',
'WITH_GHOST_SDL',
@@ -520,7 +521,8 @@ def read_opts(env, cfg, args):
(BoolVariable('BF_SPLIT_SRC', 'Split src lib into several chunks if
true', False)),
(BoolVariable('WITHOUT_BF_INSTALL', 'dont install if true', False)),
(BoolVariable('WITHOUT_BF_PYTHON_INSTALL', 'dont install Python
modules if true', False)),
- (BoolVariable('WITH_BF_PYTHON_INSTALL_NUMPY', 'install Python mumpy
module', False)),
+ (BoolVariable('WITH_BF_PYTHON_INSTALL_NUMPY', 'install Python numpy
module', False)),
+ (BoolVariable('WITH_BF_PYTHON_INSTALL_REQUESTS', 'install Python
requests module', False)),
(BoolVariable('WITHOUT_BF_PYTHON_UNPACK', 'dont remove and unpack
Python modules everytime if true', False)),
(BoolVariable('WITHOUT_BF_OVERWRITE_INSTALL', 'dont remove existing
files before breating the new install directory (set to False when making
packages for others)', False)),
(BoolVariable('BF_FANCY', 'Enable fancy output if true', True)),
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
