diff options
| author | Klaus Aehlig <klaus.aehlig@huawei.com> | 2022-06-09 12:17:08 +0200 |
|---|---|---|
| committer | Klaus Aehlig <klaus.aehlig@huawei.com> | 2022-06-09 12:39:32 +0200 |
| commit | c492671a82491df34fd125e7c87817d816b17a78 (patch) | |
| tree | b6c514eb73fab131dd07a6ecaad5389fe0d783a3 | |
| parent | 804caf98ca7eab906cd35528246d2631602a646e (diff) | |
| download | justbuild-c492671a82491df34fd125e7c87817d816b17a78.tar.gz | |
Change wording of -D to emphasize that it is an overlay
While there, also document the option (in more detail) in the man
page.
| -rw-r--r-- | share/man/just.1.org | 7 | ||||
| -rw-r--r-- | src/buildtool/common/cli.hpp | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/share/man/just.1.org b/share/man/just.1.org index 44f4e604..da7c0f29 100644 --- a/share/man/just.1.org +++ b/share/man/just.1.org @@ -235,6 +235,13 @@ well-defined graph file. See *just-graph-file(5)* for more details. Path to configuration file for multi-repository builds.\\ Supported by: analyse|build|describe|install|rebuild|traverse. + *-D*, *--defines* JSON\\ + Defines, via an in-line JSON object a configuratio to overlay + (in the sense of ~map_union~) to the configuration + obtained by the *--config* option. If *-D* is given several times, + only the latest *-D* option is taken.\\ + Supported by: analyse|build|describe|install|rebuild. + *--expression-file-name* TEXT\\ Name of the expressions file.\\ Supported by: analyse|build|describe|install|rebuild. diff --git a/src/buildtool/common/cli.hpp b/src/buildtool/common/cli.hpp index fdfb08b9..ab4a7ff1 100644 --- a/src/buildtool/common/cli.hpp +++ b/src/buildtool/common/cli.hpp @@ -140,8 +140,8 @@ static inline auto SetupAnalysisArguments( app->add_option( "-D,--defines", clargs->defines, - "Define configuration variables via an in-line JSON object.\n" - "Latest wins. Supersedes values provided via --config") + "Define an overlay configuration via an in-line JSON object." + "Latest wins.") ->type_name("JSON"); app->add_option( "-c,--config", clargs->config_file, "Path to configuration file.") |