Issue 2121: fix handling #includes of files in VariantDir subdirectories,

by having it handle checking for VariantDir directories on disk like
it does VariantDir files.
(patch:  Jared Grubb; test case:  Ali Tofigh)

3 files changed, 88 insertions, 1 deletions

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 53d2b24..c87ff0c 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -14,6 +14,10 @@ RELEASE 1.X - XXX
 
     - Fix Glob() polluting LIBPATH by returning copy of list
 
+  From Jared Grubb:
+
+    - Fix VariantDir duplication of #included files in subdirectories.
+
   From Steven Knight:
 
     - Fix the ability of the add_src_builder() method to add a new
@@ -31,6 +35,10 @@ RELEASE 1.X - XXX
     - Make Glob() sort the returned list of Files or Nodes
       to prevent spurious rebuilds.
 
+  From Ali Tofigh:
+
+    - Add a test to verify duplication of files in VariantDir subdirectories.
+
 
 
 RELEASE 1.0.1 - Sat, 06 Sep 2008 07:29:34 -0700
diff --git a/src/engine/SCons/Node/FS.py b/src/engine/SCons/Node/FS.py
index a94171b..8d11e4e 100644
--- a/src/engine/SCons/Node/FS.py
+++ b/src/engine/SCons/Node/FS.py
@@ -1780,7 +1780,10 @@ class Dir(Base):
         if self.entry_exists_on_disk(name):
             try: return self.Dir(name)
             except TypeError: pass
-        return None
+        node = self.srcdir_duplicate(name)
+        if isinstance(node, File):
+            return None
+        return node
 
     def file_on_disk(self, name):
         if self.entry_exists_on_disk(name) or \
diff --git a/test/VariantDir/include-subdir.py b/test/VariantDir/include-subdir.py
new file mode 100644
index 0000000..0c8ceee
--- /dev/null
+++ b/test/VariantDir/include-subdir.py
@@ -0,0 +1,76 @@
+#!/usr/bin/env python
+#
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 The SCons Foundation
+#
+# 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__ = "test/VariantDir/removed-files.py 3057 2008/06/09 22:21:00 knight"
+
+"""
+Test VariantDir handling of #include files in subdirectories.
+
+When a source file #includes a file that is not in the current directory,
+we have to make sure that the file gets copied to the variant dir. (This
+was not the case for 0.98.5 and earlier)
+
+Test case supplied by Jared Grubb, based on a minimal example supplied
+by Ali Tofigh, filed as issue #2121 at tigris.org.
+"""
+
+import TestSCons
+
+test = TestSCons.TestSCons()
+
+#-------------------------------------------------------------------------------
+#1- Create dep.cpp and the SConstruct. dep.h is missing and the build is
+#expected to fail with 2.
+#-------------------------------------------------------------------------------
+
+test.subdir('src')
+test.subdir('src/utils')
+test.write(['src', 'main.cpp'], """\
+#include "main.h"
+#include "utils/util.h"
+
+int main(int argc, char* argv[])
+{
+    return MAIN_VALUE+UTIL_VALUE;
+}
+""")
+
+test.write(['src', 'main.h'], """\
+#define MAIN_VALUE 2
+""")
+
+test.write(['src', 'utils', 'util.h'], """\
+#define UTIL_VALUE -2
+""")
+
+test.write('SConstruct', """
+env = Environment()
+env.VariantDir('bin', 'src')
+o = env.Object('bin/main', 'bin/main.cpp')
+env.Program('bin/main', o)
+""")
+
+test.run(arguments = '.')
+
+test.pass_test()