From c9149af8acfe9f016aff783f453e930809a16b95 Mon Sep 17 00:00:00 2001 From: Paul Cristian Sarbu Date: Wed, 6 Dec 2023 16:22:56 +0100 Subject: install-cas cli: Remove remote execution properties and dispatch file... ...options from the generated help messages, as these are not used for the install-cas subcommand. This also updates the man page accordingly, where the dispatch file was marked as supported, as well as update any test affected by these changes. --- src/buildtool/common/cli.hpp | 7 ++++++- src/buildtool/main/cli.cpp | 11 +++++++---- 2 files changed, 13 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/buildtool/common/cli.hpp b/src/buildtool/common/cli.hpp index 9c2bc7e2..e6189880 100644 --- a/src/buildtool/common/cli.hpp +++ b/src/buildtool/common/cli.hpp @@ -389,13 +389,18 @@ static inline auto SetupCacheArguments( ->type_name("PATH"); } -static inline auto SetupEndpointArguments( +static inline auto SetupExecutionEndpointArguments( gsl::not_null const& app, gsl::not_null const& clargs) { app->add_option("-r,--remote-execution-address", clargs->remote_execution_address, "Address of the remote-execution service.") ->type_name("NAME:PORT"); +} + +static inline auto SetupExecutionPropertiesArguments( + gsl::not_null const& app, + gsl::not_null const& clargs) { app->add_option("--endpoint-configuration", clargs->remote_execution_dispatch_file, "File with dispatch instructions to use different " diff --git a/src/buildtool/main/cli.cpp b/src/buildtool/main/cli.cpp index 494c01d0..e8bc0ffd 100644 --- a/src/buildtool/main/cli.cpp +++ b/src/buildtool/main/cli.cpp @@ -37,7 +37,8 @@ auto SetupAnalyseCommandArguments( SetupLogArguments(app, &clargs->log); SetupAnalysisArguments(app, &clargs->analysis); SetupCacheArguments(app, &clargs->endpoint); - SetupEndpointArguments(app, &clargs->endpoint); + SetupExecutionEndpointArguments(app, &clargs->endpoint); + SetupExecutionPropertiesArguments(app, &clargs->endpoint); SetupServeEndpointArguments(app, &clargs->serve); SetupDiagnosticArguments(app, &clargs->diagnose); SetupCompatibilityArguments(app); @@ -51,7 +52,8 @@ auto SetupBuildCommandArguments( SetupLogArguments(app, &clargs->log); SetupAnalysisArguments(app, &clargs->analysis); SetupCacheArguments(app, &clargs->endpoint); - SetupEndpointArguments(app, &clargs->endpoint); + SetupExecutionEndpointArguments(app, &clargs->endpoint); + SetupExecutionPropertiesArguments(app, &clargs->endpoint); SetupServeEndpointArguments(app, &clargs->serve); SetupCommonAuthArguments(app, &clargs->auth); SetupClientAuthArguments(app, &clargs->cauth); @@ -83,7 +85,7 @@ auto SetupInstallCasCommandArguments( gsl::not_null const& clargs) { SetupCompatibilityArguments(app); SetupCacheArguments(app, &clargs->endpoint); - SetupEndpointArguments(app, &clargs->endpoint); + SetupExecutionEndpointArguments(app, &clargs->endpoint); SetupServeEndpointArguments(app, &clargs->serve); SetupCommonAuthArguments(app, &clargs->auth); SetupClientAuthArguments(app, &clargs->cauth); @@ -98,7 +100,8 @@ auto SetupTraverseCommandArguments( SetupCommonArguments(app, &clargs->common); SetupLogArguments(app, &clargs->log); SetupCacheArguments(app, &clargs->endpoint); - SetupEndpointArguments(app, &clargs->endpoint); + SetupExecutionEndpointArguments(app, &clargs->endpoint); + SetupExecutionPropertiesArguments(app, &clargs->endpoint); SetupServeEndpointArguments(app, &clargs->serve); SetupCommonAuthArguments(app, &clargs->auth); SetupClientAuthArguments(app, &clargs->cauth); -- cgit v1.2.3