Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

New scons option (WITHOUT_BF_PYTHON_INSTALL) to disable copying python files from system

Browse Source
This commit is contained in:
Martin Poirier
2009-08-19 01:03:34 +00:00
parent 184ac26dd0
commit eb6c5d7a7f
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/Blender.py
View File

@@ -587,7 +587,7 @@ class BlenderEnvironment(SConsEnvironment):
lenv.AddPostAction(prog,Action(AppIt,strfunction=my_appit_print)) lenv.AddPostAction(prog,Action(AppIt,strfunction=my_appit_print))
elif os.sep == '/': # any unix elif os.sep == '/': # any unix
if lenv['WITH_BF_PYTHON']: if lenv['WITH_BF_PYTHON']:
if not lenv['WITHOUT_BF_INSTALL']: if not lenv['WITHOUT_BF_INSTALL'] and not lenv['WITHOUT_BF_PYTHON_INSTALL']:
lenv.AddPostAction(prog,Action(PyInstall,strfunction=my_pyinst_print)) lenv.AddPostAction(prog,Action(PyInstall,strfunction=my_pyinst_print))
return prog return prog

3
tools/btools.py
View File

@@ -59,8 +59,8 @@ def validate_arguments(args, bc):
'BF_CXX', 'WITH_BF_STATICCXX', 'BF_CXX_LIB_STATIC', 'BF_CXX', 'WITH_BF_STATICCXX', 'BF_CXX_LIB_STATIC',
'BF_TWEAK_MODE', 'BF_SPLIT_SRC', 'BF_TWEAK_MODE', 'BF_SPLIT_SRC',
'WITHOUT_BF_INSTALL', 'WITHOUT_BF_INSTALL',
'WITHOUT_BF_PYTHON_INSTALL',
'WITH_BF_OPENMP', 'WITH_BF_OPENMP',
'WITHOUT_BF_INSTALL',
'BF_FANCY', 'BF_QUIET', 'BF_FANCY', 'BF_QUIET',
'BF_X264_CONFIG', 'BF_X264_CONFIG',
'BF_XVIDCORE_CONFIG', 'BF_XVIDCORE_CONFIG',
@@ -363,6 +363,7 @@ def read_opts(cfg, args):
(BoolVariable('BF_TWEAK_MODE', 'Enable tweak mode if true', False)), (BoolVariable('BF_TWEAK_MODE', 'Enable tweak mode if true', False)),
(BoolVariable('BF_SPLIT_SRC', 'Split src lib into several chunks if true', False)), (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_INSTALL', 'dont install if true', False)),
(BoolVariable('WITHOUT_BF_PYTHON_INSTALL', 'dont install Python modules if true', False)),
(BoolVariable('BF_FANCY', 'Enable fancy output if true', True)), (BoolVariable('BF_FANCY', 'Enable fancy output if true', True)),
(BoolVariable('BF_QUIET', 'Enable silent output if true', True)), (BoolVariable('BF_QUIET', 'Enable silent output if true', True)),
(BoolVariable('WITH_BF_BINRELOC', 'Enable relocatable binary (linux only)', False)), (BoolVariable('WITH_BF_BINRELOC', 'Enable relocatable binary (linux only)', False)),