diff options
| author | Steven Knight <knight@baldmt.com> | 2003-11-12 15:14:47 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2003-11-12 15:14:47 (GMT) |
| commit | 8d1c196a9da9634739875c94607cf423b6e35a22 (patch) | |
| tree | 72ad78f5695eb82226e4791a88de48b74e7818b7 /src | |
| parent | 19204bddabbc5ac5905bbd4deeb54d4e3e2db28e (diff) | |
| download | SCons-8d1c196a9da9634739875c94607cf423b6e35a22.zip SCons-8d1c196a9da9634739875c94607cf423b6e35a22.tar.gz SCons-8d1c196a9da9634739875c94607cf423b6e35a22.tar.bz2 | |
Make duplicate build dir specifications be an error. (Anthony Roach)
Diffstat (limited to 'src')
| -rw-r--r-- | src/CHANGES.txt | 7 | ||||
| -rw-r--r-- | src/engine/SCons/Node/FS.py | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt index f48c587..d4fb532 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -1,4 +1,4 @@ -# __COPYRIGHT__ +r __COPYRIGHT__ # __FILE__ __REVISION__ __DATE__ __DEVELOPER__ @@ -37,6 +37,11 @@ RELEASE 0.95 - XXX - Allow the LIBS construction variable to be a single string or File node, not a list, when only one library is needed. + From Anthony Roach: + + - Supply an error message if the user tries to configure a BuildDir + for a directory that already has one. + RELEASE 0.94 - Fri, 07 Nov 2003 05:29:48 -0600 diff --git a/src/engine/SCons/Node/FS.py b/src/engine/SCons/Node/FS.py index e7ab14a..9a4fb97 100644 --- a/src/engine/SCons/Node/FS.py +++ b/src/engine/SCons/Node/FS.py @@ -792,6 +792,8 @@ class FS: 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: + raise SCons.Errors.UserError, "'%s' already has a source directory: '%s'."%(build_dir, build_dir.srcdir) build_dir.link(src_dir, duplicate) def Repository(self, *dirs): |