diff options
| author | Steven Knight <knight@baldmt.com> | 2009-02-09 21:09:43 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2009-02-09 21:09:43 (GMT) |
| commit | a21a4aa4056e379660f86570d939a75b4e6c5872 (patch) | |
| tree | 7ba7fa02e39ea084fd4ebe450a58639c3a871214 /src | |
| parent | ba21ffe311490bb348716e8e9127109e7fdc2f08 (diff) | |
| download | SCons-a21a4aa4056e379660f86570d939a75b4e6c5872.zip SCons-a21a4aa4056e379660f86570d939a75b4e6c5872.tar.gz SCons-a21a4aa4056e379660f86570d939a75b4e6c5872.tar.bz2 | |
Handle finding implicit dependents defined with doubled path
separators, as can happen on Windows systems when the backslashes
in the path name are escaped (e.g. "C:\\some\\include.h").
Diffstat (limited to 'src')
| -rw-r--r-- | src/CHANGES.txt | 3 | ||||
| -rw-r--r-- | src/engine/SCons/Node/FS.py | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 57eb348..5198219 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -22,6 +22,9 @@ RELEASE X.X.X - XXX - Fix interaction of $CHANGED_SOURCES with the --config=force option. + - Fix finding #include files when the string contains escaped + backslashes like "C:\\some\\include.h". + From Robert P. J. Day: - User's Guide updates. diff --git a/src/engine/SCons/Node/FS.py b/src/engine/SCons/Node/FS.py index 76852aa..5a2e1aa 100644 --- a/src/engine/SCons/Node/FS.py +++ b/src/engine/SCons/Node/FS.py @@ -3005,8 +3005,9 @@ class FileFinder: fd = self.default_filedir dir, name = os.path.split(fd) drive, d = os.path.splitdrive(dir) - if d in ('/', os.sep): - return p.fs.get_root(drive).dir_on_disk(name) + if not name and d[:1] in ('/', os.sep): + #return p.fs.get_root(drive).dir_on_disk(name) + return p.fs.get_root(drive) if dir: p = self.filedir_lookup(p, dir) if not p: |