Change the default behavior when no arguments are specified to building everything in (or below) the current directory.

2 files changed, 9 insertions, 2 deletions

diff --git a/src/engine/SCons/Script/SConscript.py b/src/engine/SCons/Script/SConscript.py
index 7cfb312..5c4a2b3 100644
--- a/src/engine/SCons/Script/SConscript.py
+++ b/src/engine/SCons/Script/SConscript.py
@@ -51,7 +51,7 @@ import sys
 def do_nothing(text): pass
 HelpFunction = do_nothing
 
-default_targets = []
+default_targets = None
 clean_targets = {}
 arguments = {}
 launch_dir = os.path.abspath(os.curdir)
@@ -204,8 +204,13 @@ def SConscript(*ls, **kw):
         return tuple(results)
     
 def Default(*targets):
+    global default_targets
+    if default_targets is None:
+        default_targets = []
     for t in targets:
-        if isinstance(t, SCons.Node.Node):
+        if t is None:
+            default_targets = []
+        elif isinstance(t, SCons.Node.Node):
             default_targets.append(t)
         else:
             default_targets.extend(SCons.Node.arg2nodes(t,
diff --git a/src/engine/SCons/Script/__init__.py b/src/engine/SCons/Script/__init__.py
index 8bc3da4..eed045d 100644
--- a/src/engine/SCons/Script/__init__.py
+++ b/src/engine/SCons/Script/__init__.py
@@ -811,6 +811,8 @@ def _main():
 
     if not targets:
         targets = SCons.Script.SConscript.default_targets
+        if targets is None:
+            targets = [SCons.Node.FS.default_fs.Dir('.')]
 
     if not targets:
         sys.stderr.write("scons: *** No targets specified and no Default() targets found.  Stop.\n")