Handle SConscript files in subdirectories.

2 files changed, 16 insertions, 1 deletions

diff --git a/src/engine/SCons/Node/FS.py b/src/engine/SCons/Node/FS.py
index c3566a6..860f46b 100644
--- a/src/engine/SCons/Node/FS.py
+++ b/src/engine/SCons/Node/FS.py
@@ -120,6 +120,7 @@ class FS:
         self.Top = self.__doLookup(Dir, path)
         self.Top.path = '.'
         self.Top.path_ = './'
+        self.cwd = self.Top
 
     def __doLookup(self, fsclass, name, directory=None):
         """This method differs from the File and Dir factory methods in
@@ -188,9 +189,15 @@ class FS:
             directory = self.Top
             name = os.path.join(os.path.normpath('./'), name[1:])
         elif not directory:
-            directory = self.Top
+            directory = self.cwd
         return (name, directory)
 
+    def chdir(self, dir):
+        """Change the current working directory for lookups.
+        """
+        if not dir is None:
+            self.cwd = dir
+
     def Entry(self, name, directory = None):
         """Lookup or create a generic Entry node with the specified name.
         If the name is a relative path (begins with ./, ../, or a file
diff --git a/src/engine/SCons/Node/FSTests.py b/src/engine/SCons/Node/FSTests.py
index 360132a..430d4b4 100644
--- a/src/engine/SCons/Node/FSTests.py
+++ b/src/engine/SCons/Node/FSTests.py
@@ -278,6 +278,14 @@ class FSTestCase(unittest.TestCase):
         assert d10.get_bsig() is None, d10.get_bsig()
         assert d10.get_csig() is None, d10.get_csig()
 
+        fs.chdir(fs.Dir('subdir'))
+        f11 = fs.File("f11")
+        assert f11.path == "subdir/f11"
+        d12 = fs.Dir("d12")
+        assert d12.path_ == "subdir/d12/"
+        e13 = fs.Entry("subdir/e13")
+        assert e13.path == "subdir/subdir/e13"
+
         #XXX test exists()
 
         #XXX test current() for directories