Revision: 22619
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22619
Author: theeth
Date: 2009-08-19 03:03:34 +0200 (Wed, 19 Aug 2009)
Log Message:
-----------
New scons option (WITHOUT_BF_PYTHON_INSTALL) to disable copying python files
from system
Modified Paths:
--------------
branches/blender2.5/blender/tools/Blender.py
branches/blender2.5/blender/tools/btools.py
Modified: branches/blender2.5/blender/tools/Blender.py
===================================================================
--- branches/blender2.5/blender/tools/Blender.py 2009-08-19 00:55:30 UTC
(rev 22618)
+++ branches/blender2.5/blender/tools/Blender.py 2009-08-19 01:03:34 UTC
(rev 22619)
@@ -587,7 +587,7 @@
lenv.AddPostAction(prog,Action(AppIt,strfunction=my_appit_print))
elif os.sep == '/': # any unix
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))
return prog
Modified: branches/blender2.5/blender/tools/btools.py
===================================================================
--- branches/blender2.5/blender/tools/btools.py 2009-08-19 00:55:30 UTC (rev
22618)
+++ branches/blender2.5/blender/tools/btools.py 2009-08-19 01:03:34 UTC (rev
22619)
@@ -59,8 +59,8 @@
'BF_CXX', 'WITH_BF_STATICCXX', 'BF_CXX_LIB_STATIC',
'BF_TWEAK_MODE', 'BF_SPLIT_SRC',
'WITHOUT_BF_INSTALL',
+ 'WITHOUT_BF_PYTHON_INSTALL',
'WITH_BF_OPENMP',
- 'WITHOUT_BF_INSTALL',
'BF_FANCY', 'BF_QUIET',
'BF_X264_CONFIG',
'BF_XVIDCORE_CONFIG',
@@ -363,6 +363,7 @@
(BoolVariable('BF_TWEAK_MODE', 'Enable tweak mode 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_PYTHON_INSTALL', 'dont install Python
modules if true', False)),
(BoolVariable('BF_FANCY', 'Enable fancy output if true', True)),
(BoolVariable('BF_QUIET', 'Enable silent output if true',
True)),
(BoolVariable('WITH_BF_BINRELOC', 'Enable relocatable binary
(linux only)', False)),
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
