[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26832] trunk/blender/SConstruct: Tweak to the changes from r26820 (nuking scons install directory):

[Joshua Leung]

Revision: 26832
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26832
Author:   aligorith
Date:     2010-02-12 10:18:10 +0100 (Fri, 12 Feb 2010)

Log Message:
-----------
Tweak to the changes from r26820 (nuking scons install directory):

Those changes made developing Blender using scons as buildsystem impractical. They were nuking my various configs everytime I compiled resulting in a long wait for all the files to get copied over again at the end, or else I'd have to manually go scouting out files to copy over. 

Now, made this only nuke the scripts directory there which IMO solves the main issues that the original commit intended to solve (outdated scripts lingering in that folder, and mixing with the new ones). 

If there are complaints that only doing the scripts dir is not enough, then we better just make this destructive stuff an optional thing (i.e. by default, nuking will still occur, but at least developers can disable)

Modified Paths:
--------------
    trunk/blender/SConstruct

Modified: trunk/blender/SConstruct
===================================================================
--- trunk/blender/SConstruct	2010-02-12 05:02:29 UTC (rev 26831)
+++ trunk/blender/SConstruct	2010-02-12 09:18:10 UTC (rev 26832)
@@ -190,10 +190,13 @@
 
 
 # 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']:
-    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'])
+    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)
 
 
 SetOption('num_jobs', int(env['BF_NUMJOBS']))