diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/buildtool/common/cli.hpp | 21 | ||||
| -rw-r--r-- | src/buildtool/main/main.cpp | 3 |
2 files changed, 12 insertions, 12 deletions
diff --git a/src/buildtool/common/cli.hpp b/src/buildtool/common/cli.hpp index e677924c..4e1d86da 100644 --- a/src/buildtool/common/cli.hpp +++ b/src/buildtool/common/cli.hpp @@ -56,16 +56,16 @@ struct DiagnosticArguments { std::optional<std::string> dump_nodes{std::nullopt}; }; -/// \brief Arguments required for specifying cache/build endpoint. +/// \brief Arguments required for specifying build endpoint. struct EndpointArguments { std::optional<std::filesystem::path> local_root{}; std::optional<std::string> remote_execution_address; + std::vector<std::string> platform_properties; }; /// \brief Arguments required for building. struct BuildArguments { std::optional<std::vector<std::string>> local_launcher{std::nullopt}; - std::vector<std::string> platform_properties; std::chrono::milliseconds timeout{kDefaultTimeout}; std::size_t build_jobs{}; std::optional<std::string> dump_artifacts{std::nullopt}; @@ -254,6 +254,14 @@ static inline auto SetupEndpointArguments( clargs->remote_execution_address, "Address of the remote execution service.") ->type_name("NAME:PORT"); + app->add_option( + "--remote-execution-property", + clargs->platform_properties, + "Property for remote execution as key-value pair. Specifying this " + "option multiple times will accumulate pairs (latest wins).") + ->type_name("KEY:VAL") + ->allow_extra_args(false) + ->expected(1, 1); } static inline auto SetupBuildArguments( @@ -271,15 +279,6 @@ static inline auto SetupBuildArguments( ->type_name("JSON") ->default_val(nlohmann::json{"env", "--"}.dump()); - app->add_option( - "--remote-execution-property", - clargs->platform_properties, - "Property for remote execution as key-value pair. Specifying this " - "option multiple times will accumulate pairs (latest wins).") - ->type_name("KEY:VAL") - ->allow_extra_args(false) - ->expected(1, 1); - app->add_option_function<unsigned int>( "--action-timeout", [clargs](auto const& seconds) { diff --git a/src/buildtool/main/main.cpp b/src/buildtool/main/main.cpp index 6d7be359..1c84d585 100644 --- a/src/buildtool/main/main.cpp +++ b/src/buildtool/main/main.cpp @@ -80,6 +80,7 @@ auto SetupAnalyseCommandArguments( gsl::not_null<CommandLineArguments*> const& clargs) { SetupCommonArguments(app, &clargs->common); SetupAnalysisArguments(app, &clargs->analysis); + SetupEndpointArguments(app, &clargs->endpoint); SetupDiagnosticArguments(app, &clargs->diagnose); SetupCompatibilityArguments(app); } @@ -229,7 +230,7 @@ void SetupExecutionConfig(EndpointArguments const& eargs, Logger::Log(LogLevel::Error, "failed to configure local execution."); std::exit(kExitFailure); } - for (auto const& property : bargs.platform_properties) { + for (auto const& property : eargs.platform_properties) { if (not RemoteConfig::AddPlatformProperty(property)) { Logger::Log(LogLevel::Error, "addding platform property '{}' failed.", |