diff options
| -rw-r--r-- | share/man/just.1.md | 2 | ||||
| -rw-r--r-- | src/buildtool/main/cli.cpp | 2 | ||||
| -rw-r--r-- | src/other_tools/just_mr/launch.cpp | 6 | ||||
| -rw-r--r-- | src/other_tools/just_mr/utils.hpp | 9 |
4 files changed, 14 insertions, 5 deletions
diff --git a/share/man/just.1.md b/share/man/just.1.md index 57bfa98a..13ba57ac 100644 --- a/share/man/just.1.md +++ b/share/man/just.1.md @@ -563,7 +563,7 @@ Remote serve options **`-R`**, **`--remote-serve-address`** *`NAME`*:*`PORT`* Address of the remote execution service. -Supported by: analyse|build|install-cas|install|rebuild|traverse. +Supported by: analyse|build|install|rebuild. Authentication options ---------------------- diff --git a/src/buildtool/main/cli.cpp b/src/buildtool/main/cli.cpp index 602f7ff5..19b965dd 100644 --- a/src/buildtool/main/cli.cpp +++ b/src/buildtool/main/cli.cpp @@ -88,7 +88,6 @@ auto SetupInstallCasCommandArguments( SetupCompatibilityArguments(app); SetupCacheArguments(app, &clargs->endpoint); SetupExecutionEndpointArguments(app, &clargs->endpoint); - SetupServeEndpointArguments(app, &clargs->serve); SetupCommonAuthArguments(app, &clargs->auth); SetupClientAuthArguments(app, &clargs->cauth); SetupFetchArguments(app, &clargs->fetch); @@ -105,7 +104,6 @@ auto SetupTraverseCommandArguments( SetupCacheArguments(app, &clargs->endpoint); SetupExecutionEndpointArguments(app, &clargs->endpoint); SetupExecutionPropertiesArguments(app, &clargs->endpoint); - SetupServeEndpointArguments(app, &clargs->serve); SetupCommonAuthArguments(app, &clargs->auth); SetupClientAuthArguments(app, &clargs->cauth); SetupGraphArguments(app, &clargs->graph); // instead of analysis diff --git a/src/other_tools/just_mr/launch.cpp b/src/other_tools/just_mr/launch.cpp index 99496306..f8f14659 100644 --- a/src/other_tools/just_mr/launch.cpp +++ b/src/other_tools/just_mr/launch.cpp @@ -50,6 +50,7 @@ auto CallJust(std::optional<std::filesystem::path> const& config_file, bool use_launcher{false}; bool supports_defines{false}; bool supports_remote{false}; + bool supports_serve{false}; bool supports_dispatch{false}; bool supports_cacert{false}; bool supports_client_auth{false}; @@ -88,6 +89,7 @@ auto CallJust(std::optional<std::filesystem::path> const& config_file, use_launcher = kKnownJustSubcommands.at(*subcommand).launch; supports_defines = kKnownJustSubcommands.at(*subcommand).defines; supports_remote = kKnownJustSubcommands.at(*subcommand).remote; + supports_serve = kKnownJustSubcommands.at(*subcommand).serve; supports_dispatch = kKnownJustSubcommands.at(*subcommand).dispatch; supports_cacert = kKnownJustSubcommands.at(*subcommand).cacert; supports_client_auth = @@ -169,8 +171,8 @@ auto CallJust(std::optional<std::filesystem::path> const& config_file, cmd.emplace_back("--endpoint-configuration"); cmd.emplace_back(*just_cmd_args.endpoint_configuration); } - if (supports_remote and common_args.remote_serve_address) { - cmd.emplace_back("--remote-serve-address"); + if (supports_serve and common_args.remote_serve_address) { + cmd.emplace_back("-R"); cmd.emplace_back(*common_args.remote_serve_address); } // forward mutual TLS arguments diff --git a/src/other_tools/just_mr/utils.hpp b/src/other_tools/just_mr/utils.hpp index c0c98c7a..fa7c82b7 100644 --- a/src/other_tools/just_mr/utils.hpp +++ b/src/other_tools/just_mr/utils.hpp @@ -50,6 +50,7 @@ struct JustSubCmdFlags { bool launch; // supports the local launcher arg bool defines; // supports defines arg bool remote; // supports remote exec args + bool serve; // supports a serve endpoint bool dispatch; // supports dispatching of the remote-execution endpoint bool cacert; // supports CA cert arg bool client_auth; // supports client auth args @@ -63,6 +64,7 @@ std::map<std::string, JustSubCmdFlags> const kKnownJustSubcommands{ .launch = false, .defines = false, .remote = false, + .serve = false, .dispatch = false, .cacert = false, .client_auth = false}}, @@ -72,6 +74,7 @@ std::map<std::string, JustSubCmdFlags> const kKnownJustSubcommands{ .launch = false, .defines = true, .remote = false, + .serve = false, .dispatch = false, .cacert = false, .client_auth = false}}, @@ -81,6 +84,7 @@ std::map<std::string, JustSubCmdFlags> const kKnownJustSubcommands{ .launch = false, .defines = true, .remote = true, + .serve = true, .dispatch = true, .cacert = false, .client_auth = false}}, @@ -90,6 +94,7 @@ std::map<std::string, JustSubCmdFlags> const kKnownJustSubcommands{ .launch = true, .defines = true, .remote = true, + .serve = true, .dispatch = true, .cacert = true, .client_auth = true}}, @@ -99,6 +104,7 @@ std::map<std::string, JustSubCmdFlags> const kKnownJustSubcommands{ .launch = true, .defines = true, .remote = true, + .serve = true, .dispatch = true, .cacert = true, .client_auth = true}}, @@ -108,6 +114,7 @@ std::map<std::string, JustSubCmdFlags> const kKnownJustSubcommands{ .launch = true, .defines = true, .remote = true, + .serve = true, .dispatch = true, .cacert = true, .client_auth = true}}, @@ -117,6 +124,7 @@ std::map<std::string, JustSubCmdFlags> const kKnownJustSubcommands{ .launch = false, .defines = false, .remote = true, + .serve = false, .dispatch = false, .cacert = true, .client_auth = true}}, @@ -126,6 +134,7 @@ std::map<std::string, JustSubCmdFlags> const kKnownJustSubcommands{ .launch = false, .defines = false, .remote = false, + .serve = false, .dispatch = false, .cacert = false, .client_auth = false}}}; |