[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26839] trunk/blender: scons option - WITHOUT_BF_OVERWRITE_INSTALL

[Campbell Barton]

Revision: 26839
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26839
Author:   campbellbarton
Date:     2010-02-12 13:29:39 +0100 (Fri, 12 Feb 2010)

Log Message:
-----------
scons option - WITHOUT_BF_OVERWRITE_INSTALL
only use this if your not making packages for others.

Modified Paths:
--------------
    trunk/blender/SConstruct
    trunk/blender/tools/btools.py

Modified: trunk/blender/SConstruct
===================================================================
--- trunk/blender/SConstruct	2010-02-12 11:59:07 UTC (rev 26838)
+++ trunk/blender/SConstruct	2010-02-12 12:29:39 UTC (rev 26839)
@@ -192,11 +192,10 @@
 # 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']))

Modified: trunk/blender/tools/btools.py
===================================================================
--- trunk/blender/tools/btools.py	2010-02-12 11:59:07 UTC (rev 26838)
+++ trunk/blender/tools/btools.py	2010-02-12 12:29:39 UTC (rev 26839)
@@ -63,6 +63,7 @@
             '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 @@
         (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)),