aboutsummaryrefslogtreecommitdiff
path: root/build2/b-options.cxx
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2019-03-07 09:06:37 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2019-03-07 09:06:37 +0200
commit1845141809aa91b03718066a6f46863885a6a887 (patch)
treea3f542ec7c1781e65aa16a9b0d5c31eae4c4d757 /build2/b-options.cxx
parente0002617846755fb5f199f40a677e16d6f69e5ec (diff)
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).
Diffstat (limited to 'build2/b-options.cxx')
-rw-r--r--build2/b-options.cxx17
1 files changed, 9 insertions, 8 deletions
diff --git a/build2/b-options.cxx b/build2/b-options.cxx
index d9a9866..8306176 100644
--- a/build2/b-options.cxx
+++ b/build2/b-options.cxx
@@ -618,7 +618,7 @@ namespace build2
match_only_ (),
no_column_ (),
no_line_ (),
- buildfile_ ("buildfile"),
+ buildfile_ (),
buildfile_specified_ (false),
config_guess_ (),
config_guess_specified_ (false),
@@ -835,13 +835,14 @@ namespace build2
os << std::endl
<< "\033[1m--buildfile\033[0m \033[4mpath\033[0m The alternative file to read build information from. The" << ::std::endl
- << " default is \033[1mbuildfile\033[0m. If \033[4mpath\033[0m is '\033[1m-\033[0m', then read from" << ::std::endl
- << " \033[1mSTDIN\033[0m. Note that this option only affects the files read" << ::std::endl
- << " as part of the buildspec processing. Specifically, it has" << ::std::endl
- << " no effect on the \033[1msource\033[0m and \033[1minclude\033[0m directives. As a" << ::std::endl
- << " result, this option is primarily intended for testing" << ::std::endl
- << " rather than changing the build file names in real" << ::std::endl
- << " projects." << ::std::endl;
+ << " default is \033[1mbuildfile\033[0m or \033[1mbuild2file\033[0m, depending on the" << ::std::endl
+ << " project's build file/directory naming scheme. If \033[4mpath\033[0m is" << ::std::endl
+ << " '\033[1m-\033[0m', then read from \033[1mSTDIN\033[0m. Note that this option only" << ::std::endl
+ << " affects the files read as part of the buildspec" << ::std::endl
+ << " processing. Specifically, it has no effect on the \033[1msource\033[0m" << ::std::endl
+ << " and \033[1minclude\033[0m directives. As a result, this option is" << ::std::endl
+ << " primarily intended for testing rather than changing the" << ::std::endl
+ << " build file names in real projects." << ::std::endl;
os << std::endl
<< "\033[1m--config-guess\033[0m \033[4mpath\033[0m The path to the \033[1mconfig.guess(1)\033[0m script that should be used" << ::std::endl