From 1b1d1434539c4c198caab4f3a45ade9e6827427b Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Sat, 23 Apr 2016 09:17:48 +0200 Subject: Revert back to using root scope in src_out()/out_src() Relaxing it to base was not wise since we can have "sideways" prerequisites (those from parallel directories such as brep's ../web/*). --- build2/context | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'build2/context') diff --git a/build2/context b/build2/context index bdbdc80..30d29d1 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_base. + // passed directory should be a sub-directory of out/src_root. // dir_path - src_out (const dir_path& out, scope&); + src_out (const dir_path& out, scope& root); dir_path src_out (const dir_path& out, - const dir_path& out_base, const dir_path& src_base); + const dir_path& out_root, const dir_path& src_root); dir_path - out_src (const dir_path& src, scope&); + out_src (const dir_path& src, scope& root); dir_path out_src (const dir_path& src, - const dir_path& out_base, const dir_path& src_base); + const dir_path& out_root, const dir_path& src_root); // If possible and beneficial, translate an absolute, normalized path // into relative to the relative_base directory, which is normally -- cgit v1.1