Get rid of the requirement that a source directory must be under the SConstruct direc...

git-svn-id: http://scons.tigris.org/svn/scons/trunk@1296 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 5edaafb57a016a34f3995664ca52263eb0216c24..f8f09fd3ddbb11b0e84fe454a89ea9412374ef10 100644 (file)
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -282,6 +282,9 @@ RELEASE 0.97 - XXX
   - Fix AddPreAction() and AddPostAction() when an action has more than
     one target file:  attach the actions to the Executor, not the Node.
 
+  - Allow the source directory of a BuildDir / build_dir to be outside
+    of the top-level SConstruct directory tree.
+
   From Wayne Lee:
 
   - Avoid "maximum recursion limit" errors when removing $(-$) pairs

diff --git a/src/engine/SCons/Node/FS.py b/src/engine/SCons/Node/FS.py
index 5ae14fc3aab8ceab2547f65bd278612ba03c4d94..9203e181239a89c62205238d5acc7fb196087669 100644 (file)
--- a/src/engine/SCons/Node/FS.py
+++ b/src/engine/SCons/Node/FS.py
@@ -973,8 +973,6 @@ class FS(LocalFS):
             src_dir = self.Dir(src_dir)
         if not isinstance(build_dir, SCons.Node.Node):
             build_dir = self.Dir(build_dir)
-        if not src_dir.is_under(self.Top):
-            raise SCons.Errors.UserError, "Source directory must be under top of build tree."
         if src_dir.is_under(build_dir):
             raise SCons.Errors.UserError, "Source directory cannot be under build directory."
         if build_dir.srcdir:

diff --git a/src/engine/SCons/Node/FSTests.py b/src/engine/SCons/Node/FSTests.py
index 6978a03a2489a2ba67372b88a00464d52b3d9cf7..1b31009fc0e0eb51d149f41c8fb22e194c49a0b1 100644 (file)
--- a/src/engine/SCons/Node/FSTests.py
+++ b/src/engine/SCons/Node/FSTests.py
@@ -380,13 +380,10 @@ class BuildDirTestCase(unittest.TestCase):
         assert (stat.S_IMODE(st[stat.ST_MODE]) & stat.S_IWRITE), \
                stat.S_IMODE(st[stat.ST_MODE])
 
-        exc_caught = 0
-        try:
-            fs = SCons.Node.FS.FS()
-            fs.BuildDir('build', '/test/foo')
-        except SCons.Errors.UserError:
-            exc_caught = 1
-        assert exc_caught, "Should have caught a UserError."
+        # This used to generate a UserError when we forbid the source
+        # directory from being outside the top-level SConstruct dir.
+        fs = SCons.Node.FS.FS()
+        fs.BuildDir('build', '/test/foo')
 
         exc_caught = 0
         try:

diff --git a/test/BuildDir/under.py b/test/BuildDir/under.py
new file mode 100644 (file)
index 0000000..9a3d561
--- /dev/null
+++ b/test/BuildDir/under.py
@@ -0,0 +1,94 @@
+#!/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__"
+
+"""
+Test various combinations of build_dir when the source directory is,
+or is not, underneath the SConstruct directory.
+"""
+
+import TestSCons
+
+test = TestSCons.TestSCons()
+
+test.subdir('work', ['work', 'sub'], 'other')
+
+test.write(['work', 'SConscript'], """\
+f = Command("file.out", "file.in", Copy("$TARGET", "$SOURCE"))
+Default(f)
+""")
+
+test.write(['work', 'file.in'], "work/file.in\n")
+
+
+
+test.write(['work', 'sub', 'SConstruct'], """\
+SConscript('../SConscript', build_dir='build1')
+""")
+
+test.run(chdir='work/sub')
+
+test.must_match(['work', 'sub', 'build1', 'file.out'], "work/file.in\n")
+
+
+
+test.write(['work', 'sub', 'SConstruct'], """
+SConscript('../SConscript', build_dir='../build2')
+""")
+
+test.run(chdir='work/sub')
+
+test.must_match(['work', 'build2', 'file.out'], "work/file.in\n")
+
+
+
+test.write(['work', 'sub', 'SConstruct'], """
+SConscript('../SConscript', build_dir='../../build3')
+""")
+
+test.run(chdir='work/sub')
+
+test.must_match(['build3', 'file.out'], "work/file.in\n")
+
+
+
+test.write(['work', 'SConstruct'], """
+SConscript('../other/SConscript', build_dir='build4')
+""")
+
+test.write(['other', 'SConscript'], """\
+f = Command("file.out", "file.in", Copy("$TARGET", "$SOURCE"))
+Default(f)
+""")
+
+test.write(['other', 'file.in'], "other/file.in\n")
+
+test.run(chdir='work')
+
+test.must_match(['work', 'build4', 'file.out'], "other/file.in\n")
+
+
+
+test.pass_test()