diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2016-04-19 09:24:38 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2016-04-19 15:25:50 +0200 |
| commit | fc18a6dc1fcb02b505f07914e484cebbaf268698 (patch) | |
| tree | 2cb9b04c5924dfd46e7d934912b41c3efd894a93 /build2/context | |
| parent | ae20570f2ad55b2fa8e71cf450457cb9c4b21b1b (diff) | |
Redesign src/out scoping
We no longer enter paths from the src tree into scope map. Instead, targets
from the src tree now include their out tree directory (in essence their
"configuration"). This is then used to find a target's scope. See the
comment in class target for details.
The result of this change is that we can now again build multiple
configurations (out trees) for same project at once.
Diffstat (limited to 'build2/context')
| -rw-r--r-- | build2/context | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/build2/context b/build2/context index ed2b0ab..bdbdc80 100644 --- a/build2/context +++ b/build2/context @@ -114,21 +114,21 @@ namespace build2 rmdir_r (const dir_path&); // Return the src/out directory corresponding to the given out/src. The - // passed directory should be a sub-directory of out/src_root. + // passed directory should be a sub-directory of out/src_base. // dir_path src_out (const dir_path& out, scope&); dir_path src_out (const dir_path& out, - const dir_path& out_root, const dir_path& src_root); + const dir_path& out_base, const dir_path& src_base); dir_path out_src (const dir_path& src, scope&); dir_path out_src (const dir_path& src, - const dir_path& out_root, const dir_path& src_root); + const dir_path& out_base, const dir_path& src_base); // If possible and beneficial, translate an absolute, normalized path // into relative to the relative_base directory, which is normally |