Document the -f option correctly, support building a parallel tree by pointing to an SConstruct file using -f.

2 files changed, 13 insertions, 0 deletions

diff --git a/src/engine/SCons/Node/FS.py b/src/engine/SCons/Node/FS.py
index 551ae06..b0bc3e4 100644
--- a/src/engine/SCons/Node/FS.py
+++ b/src/engine/SCons/Node/FS.py
@@ -366,6 +366,7 @@ class FS:
             self.pathTop = path
         self.Root = {}
         self.Top = None
+        self.SConstruct = None
         self.CachePath = None
         self.cache_force = None
         self.cache_show = None
@@ -373,6 +374,9 @@ class FS:
     def set_toplevel_dir(self, path):
         assert not self.Top, "You can only set the top-level path on an FS object that has not had its File, Dir, or Entry methods called yet."
         self.pathTop = path
+
+    def set_SConstruct(self, path):
+        self.SConstruct = self.File(path)
         
     def __setTopLevelDir(self):
         if not self.Top:
diff --git a/src/engine/SCons/Node/FSTests.py b/src/engine/SCons/Node/FSTests.py
index 10e4676..3a862eb 100644
--- a/src/engine/SCons/Node/FSTests.py
+++ b/src/engine/SCons/Node/FSTests.py
@@ -1265,6 +1265,14 @@ class get_actionsTestCase(unittest.TestCase):
         a = dir.get_actions()
         assert a == [], a
 
+class SConstructTestCase(unittest.TestCase):
+    def runTest(self):
+        """Test setting the SConstruct file"""
+
+        fs = SCons.Node.FS.FS()
+        fs.set_SConstruct('xxx')
+        assert fs.SConstruct.path == 'xxx'
+
 class CacheDirTestCase(unittest.TestCase):
     def runTest(self):
         """Test CacheDir functionality"""
@@ -1397,6 +1405,7 @@ if __name__ == "__main__":
     suite.addTest(has_builderTestCase())
     suite.addTest(prepareTestCase())
     suite.addTest(get_actionsTestCase())
+    suite.addTest(SConstructTestCase())
     suite.addTest(CacheDirTestCase())
     if not unittest.TextTestRunner().run(suite).wasSuccessful():
         sys.exit(1)