diff options
| author | Maksim Denisov <denisov.maksim@huawei.com> | 2024-09-10 18:51:20 +0200 |
|---|---|---|
| committer | Maksim Denisov <denisov.maksim@huawei.com> | 2024-09-13 14:41:00 +0200 |
| commit | f60d39620b29aeaf1addeb244bdd6e15ddf4894c (patch) | |
| tree | 2617d65884c975b3fc63dd48e58242ec36138246 /src/other_tools | |
| parent | ed8f24fb246142ffaa88707ae86b53c34df82986 (diff) | |
| download | justbuild-f60d39620b29aeaf1addeb244bdd6e15ddf4894c.tar.gz | |
Rename Compatibility class to ProtocolTraits
...and move it to the common stage.
Diffstat (limited to 'src/other_tools')
| -rw-r--r-- | src/other_tools/just_mr/TARGETS | 2 | ||||
| -rw-r--r-- | src/other_tools/just_mr/main.cpp | 4 | ||||
| -rw-r--r-- | src/other_tools/ops_maps/TARGETS | 2 | ||||
| -rw-r--r-- | src/other_tools/ops_maps/git_tree_fetch_map.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/other_tools/just_mr/TARGETS b/src/other_tools/just_mr/TARGETS index ca433364..2587909a 100644 --- a/src/other_tools/just_mr/TARGETS +++ b/src/other_tools/just_mr/TARGETS @@ -9,7 +9,7 @@ , ["@", "json", "", "json"] , ["src/buildtool/build_engine/expression", "expression"] , ["src/buildtool/common", "retry_cli"] - , ["src/buildtool/compatibility", "compatibility"] + , ["src/buildtool/common", "protocol_traits"] , ["src/buildtool/file_system", "git_context"] , ["src/buildtool/logging", "logging"] , ["src/buildtool/logging", "log_level"] diff --git a/src/other_tools/just_mr/main.cpp b/src/other_tools/just_mr/main.cpp index 24bf8ffd..43b615ce 100644 --- a/src/other_tools/just_mr/main.cpp +++ b/src/other_tools/just_mr/main.cpp @@ -26,8 +26,8 @@ #include "gsl/gsl" #include "nlohmann/json.hpp" #include "src/buildtool/build_engine/expression/configuration.hpp" +#include "src/buildtool/common/protocol_traits.hpp" #include "src/buildtool/common/retry_cli.hpp" -#include "src/buildtool/compatibility/compatibility.hpp" #include "src/buildtool/crypto/hash_function.hpp" #include "src/buildtool/file_system/git_context.hpp" #include "src/buildtool/logging/log_config.hpp" @@ -319,7 +319,7 @@ auto main(int argc, char* argv[]) -> int { // Setup LocalStorageConfig to store the local_build_root properly // and make the cas and git cache roots available auto storage_config = CreateStorageConfig( - arguments.common, Compatibility::IsCompatible()); + arguments.common, ProtocolTraits::Instance().IsCompatible()); if (not storage_config) { Logger::Log(LogLevel::Error, "Failed to configure local build root."); diff --git a/src/other_tools/ops_maps/TARGETS b/src/other_tools/ops_maps/TARGETS index 9fa5dce7..5cd2d46f 100644 --- a/src/other_tools/ops_maps/TARGETS +++ b/src/other_tools/ops_maps/TARGETS @@ -124,7 +124,7 @@ [ ["src/other_tools/ops_maps", "critical_git_op_map"] , ["src/buildtool/common", "config"] , ["src/buildtool/common", "common"] - , ["src/buildtool/compatibility", "compatibility"] + , ["src/buildtool/common", "protocol_traits"] , ["src/buildtool/file_system", "file_system_manager"] , ["src/buildtool/multithreading", "task_system"] , ["src/buildtool/system", "system_command"] diff --git a/src/other_tools/ops_maps/git_tree_fetch_map.cpp b/src/other_tools/ops_maps/git_tree_fetch_map.cpp index 7e6da1dd..1bfc25ad 100644 --- a/src/other_tools/ops_maps/git_tree_fetch_map.cpp +++ b/src/other_tools/ops_maps/git_tree_fetch_map.cpp @@ -20,8 +20,8 @@ #include "fmt/core.h" #include "src/buildtool/common/artifact_digest.hpp" +#include "src/buildtool/common/protocol_traits.hpp" #include "src/buildtool/common/repository_config.hpp" -#include "src/buildtool/compatibility/compatibility.hpp" #include "src/buildtool/execution_api/common/execution_common.hpp" #include "src/buildtool/execution_api/git/git_api.hpp" #include "src/buildtool/file_system/file_system_manager.hpp" |