diff options
| author | Sascha Roloff <sascha.roloff@huawei.com> | 2022-12-22 19:23:53 +0100 |
|---|---|---|
| committer | Klaus Aehlig <klaus.aehlig@huawei.com> | 2023-01-20 13:57:18 +0100 |
| commit | 61fdb803cdad8a326bde12f40260da692a541678 (patch) | |
| tree | 4d2fdec2330ac158ba7311bbb6636a1a4baf870c | |
| parent | 0778869e38b420430d854897dbf8022798d3b3d1 (diff) | |
| download | justbuild-61fdb803cdad8a326bde12f40260da692a541678.tar.gz | |
Cleanup local CAS dependency for repository config
| -rw-r--r-- | src/buildtool/common/TARGETS | 5 | ||||
| -rw-r--r-- | src/buildtool/common/repository_config.cpp | 1 | ||||
| -rw-r--r-- | src/buildtool/common/repository_config.hpp | 1 | ||||
| -rw-r--r-- | test/buildtool/common/TARGETS | 1 | ||||
| -rw-r--r-- | test/buildtool/common/repository_config.test.cpp | 1 |
5 files changed, 5 insertions, 4 deletions
diff --git a/src/buildtool/common/TARGETS b/src/buildtool/common/TARGETS index 8ec92746..815aa89f 100644 --- a/src/buildtool/common/TARGETS +++ b/src/buildtool/common/TARGETS @@ -95,15 +95,14 @@ , "hdrs": ["repository_config.hpp"] , "srcs": ["repository_config.cpp"] , "deps": - [ ["src/buildtool/execution_api/local", "local"] - , ["src/buildtool/file_system", "file_root"] + [ ["src/buildtool/file_system", "file_root"] , ["src/buildtool/file_system", "git_cas"] , ["src/buildtool/multithreading", "atomic_value"] ] , "stage": ["src", "buildtool", "common"] , "private-deps": [ ["src/utils/automata", "dfa_minimizer"] - , ["src/utils/cpp", "hash_combine"] + , ["src/buildtool/execution_api/local", "local"] ] } } diff --git a/src/buildtool/common/repository_config.cpp b/src/buildtool/common/repository_config.cpp index 04eefb6b..73546a08 100644 --- a/src/buildtool/common/repository_config.cpp +++ b/src/buildtool/common/repository_config.cpp @@ -14,6 +14,7 @@ #include "src/buildtool/common/repository_config.hpp" +#include "src/buildtool/execution_api/local/local_cas.hpp" #include "src/utils/automata/dfa_minimizer.hpp" auto RepositoryConfig::RepositoryInfo::BaseContentDescription() const diff --git a/src/buildtool/common/repository_config.hpp b/src/buildtool/common/repository_config.hpp index 6edf1f4b..d4152467 100644 --- a/src/buildtool/common/repository_config.hpp +++ b/src/buildtool/common/repository_config.hpp @@ -20,7 +20,6 @@ #include <string> #include <unordered_map> -#include "src/buildtool/execution_api/local/local_cas.hpp" #include "src/buildtool/file_system/file_root.hpp" #include "src/buildtool/file_system/git_cas.hpp" #include "src/buildtool/multithreading/atomic_value.hpp" diff --git a/test/buildtool/common/TARGETS b/test/buildtool/common/TARGETS index c03a1f77..3d1c9216 100644 --- a/test/buildtool/common/TARGETS +++ b/test/buildtool/common/TARGETS @@ -42,6 +42,7 @@ , ["test", "catch-main"] , ["src/buildtool/common", "config"] , ["test/utils", "local_hermeticity"] + , ["src/buildtool/execution_api/local", "local"] ] , "stage": ["test", "buildtool", "common"] } diff --git a/test/buildtool/common/repository_config.test.cpp b/test/buildtool/common/repository_config.test.cpp index 1bf06d89..13d0bab9 100644 --- a/test/buildtool/common/repository_config.test.cpp +++ b/test/buildtool/common/repository_config.test.cpp @@ -14,6 +14,7 @@ #include "catch2/catch.hpp" #include "src/buildtool/common/repository_config.hpp" +#include "src/buildtool/execution_api/local/local_cas.hpp" #include "test/utils/hermeticity/local.hpp" namespace { |