From 7eed858cac7e8ff78626bdc5d63a7f36ca8f8010 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Wed, 4 Mar 2015 16:33:51 +0200 Subject: Move roots and bases to appropriate scopes --- build/context | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) (limited to 'build/context') diff --git a/build/context b/build/context index c177603..7c7421d 100644 --- a/build/context +++ b/build/context @@ -12,26 +12,28 @@ namespace build { + class scope; + extern path work; extern path home; - extern path src_root; - extern path out_root; - - extern path src_base; - extern path out_base; - // Return the src/out directory corresponding to the given out/src. The // passed directory should be a sub-directory of out/src_root. // path - src_out (const path&); + src_out (const path& out, scope&); + + path + src_out (const path& out, const path& out_root, const path& src_root); + + path + out_src (const path& src, scope&); path - out_src (const path&); + out_src (const path& src, const path& out_root, const path& src_root); - // If possible, translate an absolute, normalized path into relative to - // the work directory. + // If possible and beneficial, translate an absolute, normalized path + // into relative to the work directory. // path relative_work (const path&); -- cgit v1.1