aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2017-03-02 11:23:15 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2017-03-02 14:03:55 +0200
commit705e806eb94b743ba962080c4b397d9b32af4a50 (patch)
tree2fa0feb6d67f8ff96680a8b3c782140b7748ea03
parentb37f1aa6398065be806e6605a023189685669885 (diff)
Options cleanup
-rw-r--r--build2/b-options.cxx12
-rw-r--r--build2/b.cli10
2 files changed, 14 insertions, 8 deletions
diff --git a/build2/b-options.cxx b/build2/b-options.cxx
index 1118eb4..d89adcf 100644
--- a/build2/b-options.cxx
+++ b/build2/b-options.cxx
@@ -695,8 +695,9 @@ namespace build2
<< " includes both the number of active threads inside the" << ::std::endl
<< " build system as well as the number of external commands" << ::std::endl
<< " (compilers, linkers, etc) started but not yet finished. If" << ::std::endl
- << " this option is not specified, then the number of available" << ::std::endl
- << " hardware threads is used." << ::std::endl;
+ << " this option is not specified or specified with the 0\033[0m" << ::std::endl
+ << " value, then the number of available hardware threads is" << ::std::endl
+ << " used." << ::std::endl;
os << std::endl
<< "\033[1m--max-jobs\033[0m|\033[1m-J\033[0m \033[4mnum\033[0m Maximum number of jobs (threads) to create. The default is" << ::std::endl
@@ -706,8 +707,11 @@ namespace build2
os << std::endl
<< "\033[1m--serial-stop\033[0m|\033[1m-s\033[0m Run serially and stop at the first error. This mode is" << ::std::endl
- << " useful to investigate build failured that are caused by" << ::std::endl
- << " build system errors rather than compilation errors." << ::std::endl;
+ << " useful to investigate build failures that are caused by" << ::std::endl
+ << " build system errors rather than compilation errors. Note" << ::std::endl
+ << " that if you don't want to keep going but still want" << ::std::endl
+ << " parallel execution, add --jobs|-j\033[0m (for example -j 0\033[0m for" << ::std::endl
+ << " default concurrency)." << ::std::endl;
os << std::endl
<< "\033[1m--no-column\033[0m Don't print column numbers in diagnostics." << ::std::endl;
diff --git a/build2/b.cli b/build2/b.cli
index d711109..0d61c00 100644
--- a/build2/b.cli
+++ b/build2/b.cli
@@ -247,8 +247,8 @@ namespace build2
"Number of active jobs to perform in parallel. This includes both the
number of active threads inside the build system as well as the number
of external commands (compilers, linkers, etc) started but not yet
- finished. If this option is not specified, then the number of available
- hardware threads is used."
+ finished. If this option is not specified or specified with the \c{0}
+ value, then the number of available hardware threads is used."
}
size_t --max-jobs|-J
@@ -262,8 +262,10 @@ namespace build2
bool --serial-stop|-s
{
"Run serially and stop at the first error. This mode is useful to
- investigate build failured that are caused by build system errors
- rather than compilation errors."
+ investigate build failures that are caused by build system errors
+ rather than compilation errors. Note that if you don't want to keep
+ going but still want parallel execution, add \c{--jobs|-j} (for example
+ \c{-j 0} for default concurrency)."
}
bool --no-column