Win32 portability for recent RootDir and rel_path() changes.

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

diff --git a/src/engine/SCons/Node/FS.py b/src/engine/SCons/Node/FS.py
index 52919b0f6ae618637215a3769128b4c080604593..75efc15be0aed50d615fb89c2cb838171085c54b 100644 (file)
--- a/src/engine/SCons/Node/FS.py
+++ b/src/engine/SCons/Node/FS.py
@@ -1399,6 +1399,9 @@ class RootDir(Dir):
         self.path = name + os.sep
         self._morph()
 
+    def __str__(self):
+        return self.abspath
+
     def entry_abspath(self, name):
         return self.abspath + name
 

diff --git a/src/engine/SCons/Node/__init__.py b/src/engine/SCons/Node/__init__.py
index 8754c7de0f525d873d667b5b4fdbf82523c8ea57..28f1c194a74839262cfdce95d5e356e822ca9264 100644 (file)
--- a/src/engine/SCons/Node/__init__.py
+++ b/src/engine/SCons/Node/__init__.py
@@ -608,7 +608,10 @@ class Node:
         return binfo
 
     def rel_path(self, other):
-        return str(other)
+        # Using other.__str__() instead of str(other) lets the Memoizer
+        # get the right method for the underlying Node object, not the
+        # __str__() method for the Memoizer wrapper object.
+        return other.__str__()
 
     def del_cinfo(self):
         try: