aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bbot/worker/worker.cxx15
-rw-r--r--doc/manual.cli4
2 files changed, 13 insertions, 6 deletions
diff --git a/bbot/worker/worker.cxx b/bbot/worker/worker.cxx
index fc632ca..cf6751b 100644
--- a/bbot/worker/worker.cxx
+++ b/bbot/worker/worker.cxx
@@ -199,12 +199,13 @@ template <typename... A>
static result_status
run_bpkg (tracer& t,
string& log, const regexes& warn_detect,
+ const char* verbosity,
const string& cmd, A&&... a)
{
return run_cmd (t,
log, warn_detect,
"bpkg " + cmd,
- "bpkg", "-v", cmd, forward<A> (a)...);
+ "bpkg", verbosity, cmd, forward<A> (a)...);
}
template <typename V, typename... A>
@@ -511,8 +512,8 @@ build (size_t argc, const char* argv[])
//
r.status |= run_bpkg (
trace, r.log, wre,
+ "-V",
"create",
- "--build-option", "-V",
"-d", build_dir.string (),
"--wipe",
step_args (modules, step_id::bpkg_configure_create),
@@ -530,6 +531,7 @@ build (size_t argc, const char* argv[])
//
r.status |= run_bpkg (
trace, r.log, wre,
+ "-v",
"add",
step_args (config_args, step_id::bpkg_configure_add),
step_args (env_args, step_id::bpkg_configure_add),
@@ -558,6 +560,7 @@ build (size_t argc, const char* argv[])
r.status |= run_bpkg (
trace, r.log, wre,
+ "-v",
"fetch",
step_args (config_args, step_id::bpkg_configure_fetch),
step_args (env_args, step_id::bpkg_configure_fetch),
@@ -574,8 +577,8 @@ build (size_t argc, const char* argv[])
//
r.status |= run_bpkg (
trace, r.log, wre,
+ "-v",
"build",
- "--build-option", "-V",
"--configure-only",
"--yes",
step_args (config_args, step_id::bpkg_configure_build),
@@ -600,6 +603,7 @@ build (size_t argc, const char* argv[])
//
r.status |= run_bpkg (
trace, r.log, wre,
+ "-v",
"update",
step_args (config_args, step_id::bpkg_update_update),
step_args (env_args, step_id::bpkg_update_update),
@@ -654,6 +658,7 @@ build (size_t argc, const char* argv[])
//
r.status |= run_bpkg (
trace, r.log, wre,
+ "-v",
"test",
"-d", "..",
step_args (config_args, step_id::bpkg_test_test),
@@ -699,6 +704,7 @@ build (size_t argc, const char* argv[])
//
r.status |= run_bpkg (
trace, r.log, wre,
+ "-v",
"install",
step_args (config_args, step_id::bpkg_install_install),
step_args (env_args, step_id::bpkg_install_install),
@@ -814,7 +820,7 @@ build (size_t argc, const char* argv[])
r.status |= run_b (
trace, r.log, wre,
envvars,
- "-V",
+ "-v",
"configure(" +
subprj_src_dir.representation () + '@' +
subprj_out_dir.representation () + ")",
@@ -866,6 +872,7 @@ build (size_t argc, const char* argv[])
//
r.status |= run_bpkg (
trace, r.log, wre,
+ "-v",
"uninstall",
step_args (config_args, step_id::bpkg_uninstall_uninstall),
step_args (env_args, step_id::bpkg_uninstall_uninstall),
diff --git a/doc/manual.cli b/doc/manual.cli
index 2c4c292..4cae4c8 100644
--- a/doc/manual.cli
+++ b/doc/manual.cli
@@ -760,7 +760,7 @@ values as discussed in \l{#arch-controller Controller Logic}. The
\
# bpkg.configure.create
#
-bpkg -v create <config-args> <env-modules> <env-config-args>
+bpkg -V create <config-args> <env-modules> <env-config-args>
# bpkg.configure.add
#
@@ -797,7 +797,7 @@ bpkg -v test <package-name>
{
# b.test-installed.create
#
- b -v create <config-args> <env-modules> <env-config-args>
+ b -V create <config-args> <env-modules> <env-config-args>
# b.test-installed.configure
#