From eb6c5d7a7f722493f38255825b908e0f3df831f3 Mon Sep 17 00:00:00 2001 From: Martin Poirier Date: Wed, 19 Aug 2009 01:03:34 +0000 Subject: [PATCH] New scons option (WITHOUT_BF_PYTHON_INSTALL) to disable copying python files from system --- tools/Blender.py | 2 +- tools/btools.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/Blender.py b/tools/Blender.py index 0d2671dbfac..789a6981558 100644 --- a/tools/Blender.py +++ b/tools/Blender.py @@ -587,7 +587,7 @@ class BlenderEnvironment(SConsEnvironment): 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 diff --git a/tools/btools.py b/tools/btools.py index 0314aba25b5..3e80ac453ce 100755 --- a/tools/btools.py +++ b/tools/btools.py @@ -59,8 +59,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', 'WITH_BF_OPENMP', - 'WITHOUT_BF_INSTALL', 'BF_FANCY', 'BF_QUIET', 'BF_X264_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_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)),