From 606398fa2f422c7929778df0c5bf3ded2ad55d1f Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 12 Feb 2010 12:29:39 +0000 Subject: scons option - WITHOUT_BF_OVERWRITE_INSTALL only use this if your not making packages for others. --- SConstruct | 9 ++++----- tools/btools.py | 2 ++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/SConstruct b/SConstruct index 8d0c1e36434..9d57b230770 100644 --- a/SConstruct +++ b/SConstruct @@ -192,11 +192,10 @@ if not env['BF_FANCY']: # remove install dir so old and new files are not mixed. # NOTE: only do the scripts directory for now, otherwise is too disruptive for developers # TODO: perhaps we need an option (off by default) to not do this altogether... -if not env['WITHOUT_BF_INSTALL']: - scriptsDir = env['BF_INSTALLDIR']+os.sep+'.blender'+os.sep+'scripts' - if os.path.isdir(scriptsDir): - print B.bc.OKGREEN + "Clearing installed scripts directory%s: %s" % (B.bc.ENDC, os.path.abspath(scriptsDir)) - shutil.rmtree(scriptsDir) +if not env['WITHOUT_BF_INSTALL'] and not env['WITHOUT_BF_OVERWRITE_INSTALL']: + if os.path.isdir(env['BF_INSTALLDIR']): + print B.bc.OKGREEN + "Clearing installation directory%s: %s" % (B.bc.ENDC, os.path.abspath(env['BF_INSTALLDIR'])) + shutil.rmtree(env['BF_INSTALLDIR']) SetOption('num_jobs', int(env['BF_NUMJOBS'])) diff --git a/tools/btools.py b/tools/btools.py index a8e39e3d100..4cb86ecee62 100644 --- a/tools/btools.py +++ b/tools/btools.py @@ -63,6 +63,7 @@ def validate_arguments(args, bc): 'BF_TWEAK_MODE', 'BF_SPLIT_SRC', 'WITHOUT_BF_INSTALL', 'WITHOUT_BF_PYTHON_INSTALL', + 'WITHOUT_BF_OVERWRITE_INSTALL', 'WITH_BF_OPENMP', 'BF_OPENMP', 'BF_OPENMP_INC', @@ -407,6 +408,7 @@ def read_opts(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('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)), (BoolVariable('BF_QUIET', 'Enable silent output if true', True)), (BoolVariable('BF_LINE_OVERWRITE', 'Enable overwriting of compile line in BF_QUIET mode if true', False)), -- cgit v1.2.3