From 2ddf7a139889ae06ca9776543eb72bd04a3f78bb Mon Sep 17 00:00:00 2001
From: stevenknight <stevenknight@fdb21ef1-2011-0410-befe-b5e4ea1792b1>
Date: Sat, 9 Feb 2002 21:18:40 +0000
Subject: [PATCH] Lookup implicit dependencies relative to the directory of the
 node in which the dependency was found.

git-svn-id: http://scons.tigris.org/svn/scons/trunk@248 fdb21ef1-2011-0410-befe-b5e4ea1792b1
---
 doc/{ => design}/copyright.sgml      |  0
 doc/design/main.sgml                 |  1 +
 doc/python10/copyright.sgml          | 32 ++++++++++++++++++++++++++++
 doc/python10/main.sgml               |  1 +
 doc/scons.mod                        |  4 ----
 doc/user/copyright.sgml              | 32 ++++++++++++++++++++++++++++
 doc/user/main.sgml                   | 27 ++++++++++++-----------
 src/CHANGES.txt                      |  3 +++
 src/engine/SCons/Scanner/__init__.py |  5 ++++-
 9 files changed, 87 insertions(+), 18 deletions(-)
 rename doc/{ => design}/copyright.sgml (100%)
 create mode 100644 doc/python10/copyright.sgml
 create mode 100644 doc/user/copyright.sgml

diff --git a/doc/copyright.sgml b/doc/design/copyright.sgml
similarity index 100%
rename from doc/copyright.sgml
rename to doc/design/copyright.sgml
diff --git a/doc/design/main.sgml b/doc/design/main.sgml
index e1589b9a..3f69b2f6 100644
--- a/doc/design/main.sgml
+++ b/doc/design/main.sgml
@@ -34,6 +34,7 @@
 
     <!ENTITY acks SYSTEM "acks.sgml">
     <!ENTITY bground SYSTEM "bground.sgml">
+    <!ENTITY copyright SYSTEM "copyright.sgml">
     <!ENTITY engine SYSTEM "engine.sgml">
     <!ENTITY goals SYSTEM "goals.sgml">
     <!ENTITY install SYSTEM "install.sgml">
diff --git a/doc/python10/copyright.sgml b/doc/python10/copyright.sgml
new file mode 100644
index 00000000..833dd80b
--- /dev/null
+++ b/doc/python10/copyright.sgml
@@ -0,0 +1,32 @@
+<!--
+
+  Copyright (c) 2001, 2002 Steven Knight
+
+  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.
+
+-->
+
+<blockquote>
+ <para>
+
+  Copyright (c) 2001, 2002 Steven Knight
+
+ </para>
+</blockquote>
diff --git a/doc/python10/main.sgml b/doc/python10/main.sgml
index 5b813b20..889ef4dc 100644
--- a/doc/python10/main.sgml
+++ b/doc/python10/main.sgml
@@ -31,6 +31,7 @@
 
     <!ENTITY abstract SYSTEM "abstract.sgml">
     <!ENTITY acks SYSTEM "acks.sgml">
+    <!ENTITY copyright SYSTEM "copyright.sgml">
     <!ENTITY design SYSTEM "design.sgml">
     <!ENTITY future SYSTEM "future.sgml">
     <!ENTITY install SYSTEM "install.sgml">
diff --git a/doc/scons.mod b/doc/scons.mod
index 255085c2..b156e4ce 100644
--- a/doc/scons.mod
+++ b/doc/scons.mod
@@ -8,10 +8,6 @@
 
 
 
-<!ENTITY copyright SYSTEM "copyright.sgml">
-
-
-
 <!--
 
   Other applications that we reference.
diff --git a/doc/user/copyright.sgml b/doc/user/copyright.sgml
new file mode 100644
index 00000000..79eda92a
--- /dev/null
+++ b/doc/user/copyright.sgml
@@ -0,0 +1,32 @@
+<!--
+
+  Copyright (c) 2001, 2002 Steven Knight
+
+  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.
+
+-->
+
+<blockquote>
+ <para>
+
+  Copyright (c) 2002 Steven Knight
+
+ </para>
+</blockquote>
diff --git a/doc/user/main.sgml b/doc/user/main.sgml
index 22d977d4..4b6bbb17 100644
--- a/doc/user/main.sgml
+++ b/doc/user/main.sgml
@@ -32,24 +32,25 @@
     <!ENTITY % scons SYSTEM "../scons.mod">
     %scons;
 
-    <!ENTITY preface SYSTEM "preface.sgml">
-    <!ENTITY simple SYSTEM "simple.sgml">
-    <!ENTITY environments SYSTEM "environments.sgml">
-    <!ENTITY depends SYSTEM "depends.sgml">
-    <!ENTITY more SYSTEM "more.sgml">
-    <!ENTITY hierarchy SYSTEM "hierarchy.sgml">
-    <!ENTITY variants SYSTEM "variants.sgml">
     <!ENTITY builders SYSTEM "builders.sgml">
-    <!ENTITY scanners SYSTEM "scanners.sgml">
-    <!ENTITY repositories SYSTEM "repositories.sgml">
     <!ENTITY caching SYSTEM "caching.sgml">
-    <!ENTITY run SYSTEM "run.sgml">
-    <!ENTITY troubleshoot SYSTEM "troubleshoot.sgml">
-    <!ENTITY reference SYSTEM "reference.sgml">
+    <!ENTITY cons SYSTEM "cons.sgml">
+    <!ENTITY copyright SYSTEM "copyright.sgml">
+    <!ENTITY depends SYSTEM "depends.sgml">
+    <!ENTITY environments SYSTEM "environments.sgml">
     <!ENTITY errors SYSTEM "errors.sgml">
     <!ENTITY example SYSTEM "example.sgml">
+    <!ENTITY hierarchy SYSTEM "hierarchy.sgml">
     <!ENTITY make SYSTEM "make.sgml">
-    <!ENTITY cons SYSTEM "cons.sgml">
+    <!ENTITY more SYSTEM "more.sgml">
+    <!ENTITY preface SYSTEM "preface.sgml">
+    <!ENTITY reference SYSTEM "reference.sgml">
+    <!ENTITY repositories SYSTEM "repositories.sgml">
+    <!ENTITY run SYSTEM "run.sgml">
+    <!ENTITY scanners SYSTEM "scanners.sgml">
+    <!ENTITY simple SYSTEM "simple.sgml">
+    <!ENTITY troubleshoot SYSTEM "troubleshoot.sgml">
+    <!ENTITY variants SYSTEM "variants.sgml">
 
 ]>
 
diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 037db1e1..7ac99798 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -33,6 +33,9 @@ RELEASE 0.05 -
   - Allow Scanners to return a list of strings, and document how to
     write your own Scanners.
 
+  - Look up implicit (scanned) dependencies relative to the directory
+    of file being scanned.
+
   From Anthony Roach:
 
   - Make the scons script return an error code on failures.
diff --git a/src/engine/SCons/Scanner/__init__.py b/src/engine/SCons/Scanner/__init__.py
index a00a75bc..53c67e40 100644
--- a/src/engine/SCons/Scanner/__init__.py
+++ b/src/engine/SCons/Scanner/__init__.py
@@ -109,10 +109,13 @@ class Base:
             list = self.function(node, env, self.argument)
         else:
             list = self.function(node, env)
+        kw = {}
+        if hasattr(node, 'dir'):
+            kw['directory'] = node.dir
         nodes = []
         for l in list:
             if not isinstance(l, SCons.Node.FS.Entry):
-                l = self.node_factory(l)
+                l = apply(self.node_factory, (l,), kw)
             nodes.append(l)
         return nodes
 
-- 
2.26.2