(subdirs)[GO_FAST_BUTTON]: Try to read all subdirs only when

necessary.

diff --git a/ChangeLog b/ChangeLog
index d3f310e3f537f5bb4fadbdc3d61d60b4e27bcccd..5380b8428941fea780601455e46b63b95799a680 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,11 @@
 2004-07-21  Jan Nieuwenhuizen  <janneke@gnu.org>
 
-       * SConstruct: GO_FAST_BUTTON: implement tips from Andreas Roach.
+       * SConstruct[GO_FAST_BUTTON]: implement tips from Andreas Roach.
        This brings SCons run-time on up-to-date tree down from 48s with
        only checksums, to 34s without 2day checksums, to 14s (make needs
        4 seconds).
+       (subdirs)[GO_FAST_BUTTON]: Try to read all subdirs only when
+       necessary.
 
 2004-07-20  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 

diff --git a/SConstruct b/SConstruct
index e8df51cf5edc82faff59a475c564a41b810ce133..daa7560ee14a58821e87260becdbe53fb5ed504e 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -86,7 +86,7 @@ usage = r'''Usage:
 scons [KEY=VALUE].. [TARGET|DIR]..
 
 TARGETS: clean, config, doc, dist, install, mf-essential, po-update,
-         realclean, release, tar, TAGS
+         realclean, release, sconsclean, tar, TAGS
 
 '''
       
@@ -561,6 +561,13 @@ if 'clean' in COMMAND_LINE_TARGETS:
                os.unlink (config_cache)
        Exit (s)
 
+if 'sconsclean' in COMMAND_LINE_TARGETS:
+       command = 'rm -rf scons.cache $(find . -name ".scon*")'
+       s = os.system (command)
+       if os.path.exists (config_cache):
+               os.unlink (config_cache)
+       Exit (s)
+       
 if 'realclean' in COMMAND_LINE_TARGETS:
        command = 'rm -rf $(find . -name "out-scons" -o -name ".scon*")'
        sys.stdout.write ('Running %s ... ' % command)
@@ -717,7 +724,15 @@ def flatten (tree, lst):
                                lst.append (i)
        return lst
 
-subdirs = flatten (cvs_dirs ('.'), [])
+if GO_FAST_BUTTON\
+   and 'all' not in COMMAND_LINE_TARGETS\
+   and 'doc' not in COMMAND_LINE_TARGETS\
+   and 'web' not in COMMAND_LINE_TARGETS\
+   and 'install' not in COMMAND_LINE_TARGETS\
+   and 'clean' not in COMMAND_LINE_TARGETS:
+       subdirs = ['lily','flower', 'mf']
+else:
+       subdirs = flatten (cvs_dirs ('.'), [])
 readme_files = ['AUTHORS', 'README', 'INSTALL', 'NEWS']
 foo = map (lambda x: env.TXT (x + '.txt',
                              os.path.join ('Documentation/topdocs', x)),