From 1845141809aa91b03718066a6f46863885a6a887 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Thu, 7 Mar 2019 09:06:37 +0200 Subject: Add support for alternative build file/directory naming scheme Now the build/*.build, buildfile, and .buildignore filesystem entries in a project can alternatively (but consistently) be called build2/*.build2, build2file, and .build2ignore. See a note at the beginning of the Project Structure section in the manual for details (motivation, restrictions, etc). --- build2/target.hxx | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) (limited to 'build2/target.hxx') diff --git a/build2/target.hxx b/build2/target.hxx index d2d4b1c..c86a10b 100644 --- a/build2/target.hxx +++ b/build2/target.hxx @@ -1669,11 +1669,12 @@ namespace build2 search_implied (const scope&, const K&, tracer&); // Return true if the implied buildfile is plausible for the specified - // directory, that is, there is a buildfile in at least one of its - // subdirectories. Note that the directory must exist. + // subdirectory of a project with the specified root scope. That is, there + // is a buildfile in at least one of its subdirectories. Note that the + // directory must exist. // static bool - check_implied (const dir_path&); + check_implied (const scope& root, const dir_path&); private: static prerequisites_type @@ -1813,7 +1814,7 @@ namespace build2 // template const char* - target_extension_fix (const target_key&); + target_extension_fix (const target_key&, const scope*); template bool @@ -1834,16 +1835,6 @@ namespace build2 string&, optional&, const location&, bool); - // Always return NULL extension. - // - optional - target_extension_null (const target_key&, const scope&, const char*, bool); - - // Assert if called. - // - optional - target_extension_assert (const target_key&, const scope&, const char*, bool); - // Target print functions. // -- cgit v1.1