Support the -f option allowing specification of a different top-level

"SConstruct" file name to search for when using the -D, -U or -u options.

5 files changed, 228 insertions, 5 deletions

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 57c6e22..516850e 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -18,6 +18,9 @@ RELEASE 1.X - XXX
     - Fix env.Append() and env.Prepend()'s ability to add a string to
       list-like variables like $CCFLAGS under Python 2.6.
 
+    - Support using the -f option to search for a different top-level
+      file name when walking up with the -D, -U or -u options.
+
 
 
 RELEASE 1.1.0 - Thu, 09 Oct 2008 08:33:47 -0700
diff --git a/src/engine/SCons/Script/Main.py b/src/engine/SCons/Script/Main.py
index 22ca331..7b6b52b 100644
--- a/src/engine/SCons/Script/Main.py
+++ b/src/engine/SCons/Script/Main.py
@@ -600,12 +600,14 @@ def _scons_internal_error():
     traceback.print_exc()
     sys.exit(2)
 
-def _SConstruct_exists(dirname='', repositories=[]):
+def _SConstruct_exists(dirname='', repositories=[], filelist=None):
     """This function checks that an SConstruct file exists in a directory.
     If so, it returns the path of the file. By default, it checks the
     current directory.
     """
-    for file in ['SConstruct', 'Sconstruct', 'sconstruct']:
+    if not filelist:
+        filelist = ['SConstruct', 'Sconstruct', 'sconstruct']
+    for file in filelist:
         sfile = os.path.join(dirname, file)
         if os.path.isfile(sfile):
             return sfile
@@ -779,13 +781,15 @@ def _main(parser):
     if options.climb_up:
         target_top = '.'  # directory to prepend to targets
         script_dir = os.getcwd()  # location of script
-        while script_dir and not _SConstruct_exists(script_dir, options.repository):
+        while script_dir and not _SConstruct_exists(script_dir,
+                                                    options.repository,
+                                                    options.file):
             script_dir, last_part = os.path.split(script_dir)
             if last_part:
                 target_top = os.path.join(last_part, target_top)
             else:
                 script_dir = ''
-        if script_dir:
+        if script_dir and script_dir != os.getcwd():
             display("scons: Entering directory `%s'" % script_dir)
             os.chdir(script_dir)
 
@@ -804,7 +808,8 @@ def _main(parser):
     if options.file:
         scripts.extend(options.file)
     if not scripts:
-        sfile = _SConstruct_exists(repositories=options.repository)
+        sfile = _SConstruct_exists(repositories=options.repository,
+                                   filelist=options.file)
         if sfile:
             scripts.append(sfile)
 
diff --git a/test/Climb/filename--D.py b/test/Climb/filename--D.py
new file mode 100644
index 0000000..1b3c300
--- /dev/null
+++ b/test/Climb/filename--D.py
@@ -0,0 +1,73 @@
+#!/usr/bin/env python
+#
+# __COPYRIGHT__
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
+
+"""
+Verify the ability to use the -D option with the -f option to
+specify a different top-level file name.
+"""
+
+import TestSCons
+
+test = TestSCons.TestSCons()
+
+test.subdir('subdir', 'other')
+
+test.write('main.scons', """\
+print "main.scons"
+SConscript('subdir/sub.scons')
+""")
+
+test.write(['subdir', 'sub.scons'], """\
+print "subdir/sub.scons"
+""")
+
+
+
+read_str = """\
+main.scons
+subdir/sub.scons
+"""
+
+expect = "scons: Entering directory `%s'\n" % test.workpath() \
+         + test.wrap_stdout(read_str = read_str,
+                            build_str = "scons: `subdir' is up to date.\n")
+
+test.run(chdir='subdir', arguments='-D -f main.scons .', stdout=expect)
+
+
+
+expect = test.wrap_stdout(read_str = "subdir/sub.scons\n",
+                          build_str = "scons: `.' is up to date.\n")
+
+test.run(chdir='other', arguments='-D -f ../subdir/sub.scons .', stdout=expect)
+
+test.run(chdir='other',
+         arguments='-D -f %s .' % test.workpath('subdir', 'sub.scons'),
+         stdout=expect)
+
+
+
+test.pass_test()
diff --git a/test/Climb/filename--U.py b/test/Climb/filename--U.py
new file mode 100644
index 0000000..10c1c8a
--- /dev/null
+++ b/test/Climb/filename--U.py
@@ -0,0 +1,71 @@
+#!/usr/bin/env python
+#
+# __COPYRIGHT__
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
+
+"""
+Verify the ability to use the -U option with the -f option to
+specify a different top-level file name.
+"""
+
+import TestSCons
+
+test = TestSCons.TestSCons()
+
+test.subdir('subdir', 'other')
+
+test.write('main.scons', """\
+print "main.scons"
+SConscript('subdir/sub.scons')
+""")
+
+test.write(['subdir', 'sub.scons'], """\
+print "subdir/sub.scons"
+""")
+
+read_str = """\
+main.scons
+subdir/sub.scons
+"""
+
+expect = "scons: Entering directory `%s'\n" % test.workpath() \
+         + test.wrap_stdout(read_str = read_str,
+                            build_str = "scons: `subdir' is up to date.\n")
+
+test.run(chdir='subdir', arguments='-U -f main.scons .', stdout=expect)
+
+
+
+expect = test.wrap_stdout(read_str = "subdir/sub.scons\n",
+                          build_str = "scons: `.' is up to date.\n")
+
+test.run(chdir='other', arguments='-U -f ../subdir/sub.scons .', stdout=expect)
+
+test.run(chdir='other',
+         arguments='-U -f %s .' % test.workpath('subdir', 'sub.scons'),
+         stdout=expect)
+
+
+
+test.pass_test()
diff --git a/test/Climb/filename-u.py b/test/Climb/filename-u.py
new file mode 100644
index 0000000..ec67e65
--- /dev/null
+++ b/test/Climb/filename-u.py
@@ -0,0 +1,71 @@
+#!/usr/bin/env python
+#
+# __COPYRIGHT__
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
+
+"""
+Verify the ability to use the -u option with the -f option to
+specify a different top-level file name.
+"""
+
+import TestSCons
+
+test = TestSCons.TestSCons()
+
+test.subdir('subdir', 'other')
+
+test.write('main.scons', """\
+print "main.scons"
+SConscript('subdir/sub.scons')
+""")
+
+test.write(['subdir', 'sub.scons'], """\
+print "subdir/sub.scons"
+""")
+
+read_str = """\
+main.scons
+subdir/sub.scons
+"""
+
+expect = "scons: Entering directory `%s'\n" % test.workpath() \
+         + test.wrap_stdout(read_str = read_str,
+                            build_str = "scons: `subdir' is up to date.\n")
+
+test.run(chdir='subdir', arguments='-u -f main.scons .', stdout=expect)
+
+
+
+expect = test.wrap_stdout(read_str = "subdir/sub.scons\n",
+                          build_str = "scons: `.' is up to date.\n")
+
+test.run(chdir='other', arguments='-u -f ../subdir/sub.scons .', stdout=expect)
+
+test.run(chdir='other',
+         arguments='-u -f %s .' % test.workpath('subdir', 'sub.scons'),
+         stdout=expect)
+
+
+
+test.pass_test()