diff options
Diffstat (limited to 'src')
36 files changed, 117 insertions, 23 deletions
diff --git a/src/other_tools/git_operations/TARGETS b/src/other_tools/git_operations/TARGETS index 8a135ecf..dba6fc18 100644 --- a/src/other_tools/git_operations/TARGETS +++ b/src/other_tools/git_operations/TARGETS @@ -15,7 +15,8 @@ [["src/buildtool/multithreading", "async_map_consumer"], "git_ops_types"] , "stage": ["src", "other_tools", "git_operations"] , "private-deps": - [ ["src/buildtool/file_system", "file_system_manager"] + [ ["@", "fmt", "", "fmt"] + , ["src/buildtool/file_system", "file_system_manager"] , "git_repo_remote" , ["src/buildtool/logging", "logging"] ] diff --git a/src/other_tools/git_operations/git_operations.cpp b/src/other_tools/git_operations/git_operations.cpp index f0f80a8d..74f1d323 100644 --- a/src/other_tools/git_operations/git_operations.cpp +++ b/src/other_tools/git_operations/git_operations.cpp @@ -14,8 +14,10 @@ #include "src/other_tools/git_operations/git_operations.hpp" +#include <memory> #include <vector> +#include "fmt/core.h" #include "src/buildtool/file_system/file_system_manager.hpp" #include "src/buildtool/logging/logger.hpp" #include "src/other_tools/git_operations/git_repo_remote.hpp" diff --git a/src/other_tools/git_operations/git_ops_types.hpp b/src/other_tools/git_operations/git_ops_types.hpp index 6befeee3..2c4b5ff0 100644 --- a/src/other_tools/git_operations/git_ops_types.hpp +++ b/src/other_tools/git_operations/git_ops_types.hpp @@ -15,6 +15,10 @@ #ifndef INCLUDED_SRC_OTHER_TOOLS_GIT_OPERATIONS_GIT_OPS_TYPES_HPP #define INCLUDED_SRC_OTHER_TOOLS_GIT_OPERATIONS_GIT_OPS_TYPES_HPP +#include <filesystem> +#include <optional> +#include <string> + #include "src/buildtool/file_system/git_cas.hpp" #include "src/utils/cpp/path.hpp" diff --git a/src/other_tools/git_operations/git_repo_remote.hpp b/src/other_tools/git_operations/git_repo_remote.hpp index ac4f59aa..ce818de6 100644 --- a/src/other_tools/git_operations/git_repo_remote.hpp +++ b/src/other_tools/git_operations/git_repo_remote.hpp @@ -15,6 +15,12 @@ #ifndef INCLUDED_SRC_OTHER_TOOLS_GIT_OPERATIONS_GIT_REPO_REMOTE_HPP #define INCLUDED_SRC_OTHER_TOOLS_GIT_OPERATIONS_GIT_REPO_REMOTE_HPP +#include <filesystem> +#include <memory> +#include <optional> +#include <string> +#include <vector> + #include "src/buildtool/file_system/git_repo.hpp" extern "C" { diff --git a/src/other_tools/just_mr/TARGETS b/src/other_tools/just_mr/TARGETS index 27afd58a..a164d09c 100644 --- a/src/other_tools/just_mr/TARGETS +++ b/src/other_tools/just_mr/TARGETS @@ -105,7 +105,8 @@ , "deps": [["src/buildtool/build_engine/expression", "expression"], "cli"] , "stage": ["src", "other_tools", "just_mr"] , "private-deps": - [ ["@", "json", "", "json"] + [ ["@", "fmt", "", "fmt"] + , ["@", "json", "", "json"] , ["src/buildtool/logging", "logging"] , ["src/buildtool/multithreading", "task_system"] , "exit_codes" @@ -129,7 +130,8 @@ , "deps": [["src/buildtool/build_engine/expression", "expression"], "cli"] , "stage": ["src", "other_tools", "just_mr"] , "private-deps": - [ ["@", "json", "", "json"] + [ ["@", "fmt", "", "fmt"] + , ["@", "json", "", "json"] , ["src/buildtool/logging", "logging"] , ["src/buildtool/multithreading", "task_system"] , ["src/buildtool/storage", "fs_utils"] diff --git a/src/other_tools/just_mr/fetch.cpp b/src/other_tools/just_mr/fetch.cpp index 77773f69..56c5fdec 100644 --- a/src/other_tools/just_mr/fetch.cpp +++ b/src/other_tools/just_mr/fetch.cpp @@ -16,6 +16,7 @@ #include <filesystem> +#include "fmt/core.h" #include "nlohmann/json.hpp" #include "src/buildtool/execution_api/common/execution_api.hpp" #include "src/buildtool/execution_api/local/local_api.hpp" diff --git a/src/other_tools/just_mr/fetch.hpp b/src/other_tools/just_mr/fetch.hpp index e9f07acf..79e4c212 100644 --- a/src/other_tools/just_mr/fetch.hpp +++ b/src/other_tools/just_mr/fetch.hpp @@ -15,6 +15,8 @@ #ifndef INCLUDED_SRC_OTHER_TOOLS_JUST_MR_FETCH_HPP #define INCLUDED_SRC_OTHER_TOOLS_JUST_MR_FETCH_HPP +#include <memory> + #include "src/buildtool/build_engine/expression/configuration.hpp" #include "src/other_tools/just_mr/cli.hpp" diff --git a/src/other_tools/just_mr/launch.hpp b/src/other_tools/just_mr/launch.hpp index 36f08a42..51f0a38e 100644 --- a/src/other_tools/just_mr/launch.hpp +++ b/src/other_tools/just_mr/launch.hpp @@ -16,6 +16,7 @@ #define INCLUDED_SRC_OTHER_TOOLS_JUST_MR_LAUNCH_HPP #include <filesystem> +#include <optional> #include "src/other_tools/just_mr/cli.hpp" diff --git a/src/other_tools/just_mr/main.cpp b/src/other_tools/just_mr/main.cpp index 23ea1280..bee5243b 100644 --- a/src/other_tools/just_mr/main.cpp +++ b/src/other_tools/just_mr/main.cpp @@ -12,6 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include <exception> #include <filesystem> #include <utility> diff --git a/src/other_tools/just_mr/mirrors.hpp b/src/other_tools/just_mr/mirrors.hpp index 286a9f0c..5801e323 100644 --- a/src/other_tools/just_mr/mirrors.hpp +++ b/src/other_tools/just_mr/mirrors.hpp @@ -15,6 +15,7 @@ #ifndef INCLUDED_SRC_OTHER_TOOLS_JUST_MR_MIRRORS_HPP #define INCLUDED_SRC_OTHER_TOOLS_JUST_MR_MIRRORS_HPP +#include <exception> #include <memory> #include <string> #include <vector> diff --git a/src/other_tools/just_mr/setup.hpp b/src/other_tools/just_mr/setup.hpp index b11c6497..eea9a24a 100644 --- a/src/other_tools/just_mr/setup.hpp +++ b/src/other_tools/just_mr/setup.hpp @@ -16,6 +16,8 @@ #define INCLUDED_SRC_OTHER_TOOLS_JUST_MR_SETUP_HPP #include <filesystem> +#include <memory> +#include <optional> #include "src/buildtool/build_engine/expression/configuration.hpp" #include "src/other_tools/just_mr/cli.hpp" diff --git a/src/other_tools/just_mr/update.cpp b/src/other_tools/just_mr/update.cpp index babfee5a..013ff808 100644 --- a/src/other_tools/just_mr/update.cpp +++ b/src/other_tools/just_mr/update.cpp @@ -16,6 +16,7 @@ #include <filesystem> +#include "fmt/core.h" #include "nlohmann/json.hpp" #include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/logging/logger.hpp" diff --git a/src/other_tools/just_mr/update.hpp b/src/other_tools/just_mr/update.hpp index 4e9d5985..5535c57c 100644 --- a/src/other_tools/just_mr/update.hpp +++ b/src/other_tools/just_mr/update.hpp @@ -15,6 +15,8 @@ #ifndef INCLUDED_SRC_OTHER_TOOLS_JUST_MR_UPDATE_HPP #define INCLUDED_SRC_OTHER_TOOLS_JUST_MR_UPDATE_HPP +#include <memory> + #include "src/buildtool/build_engine/expression/configuration.hpp" #include "src/other_tools/just_mr/cli.hpp" diff --git a/src/other_tools/ops_maps/TARGETS b/src/other_tools/ops_maps/TARGETS index 95febb30..d7af943d 100644 --- a/src/other_tools/ops_maps/TARGETS +++ b/src/other_tools/ops_maps/TARGETS @@ -18,14 +18,16 @@ , "srcs": ["import_to_git_map.cpp"] , "deps": [ "critical_git_op_map" + , ["@", "gsl", "", "gsl"] , ["src/other_tools/git_operations", "git_repo_remote"] - , ["@", "fmt", "", "fmt"] , ["src/utils/cpp", "path"] , ["src/utils/cpp", "path_hash"] ] , "stage": ["src", "other_tools", "ops_maps"] , "private-deps": - [ ["src/buildtool/storage", "fs_utils"] + [ ["@", "fmt", "", "fmt"] + , ["src/buildtool/multithreading", "task_system"] + , ["src/buildtool/storage", "fs_utils"] , ["src/buildtool/storage", "storage"] , ["src/buildtool/execution_api/common", "common"] , ["src/buildtool/execution_api/local", "config"] @@ -63,11 +65,11 @@ , ["src/buildtool/multithreading", "async_map_consumer"] , ["src/other_tools/just_mr", "mirrors"] , ["src/utils/cpp", "hash_combine"] - , ["@", "json", "", "json"] ] , "stage": ["src", "other_tools", "ops_maps"] , "private-deps": - [ ["src/other_tools/utils", "content"] + [ ["@", "fmt", "", "fmt"] + , ["src/other_tools/utils", "content"] , ["src/buildtool/execution_api/local", "local"] , ["src/buildtool/file_system", "file_storage"] , ["src/buildtool/serve_api/remote", "serve_api"] @@ -82,12 +84,17 @@ , "hdrs": ["archive_fetch_map.hpp"] , "srcs": ["archive_fetch_map.cpp"] , "deps": - ["content_cas_map", ["src/buildtool/execution_api/common", "common"]] + [ ["@", "gsl", "", "gsl"] + , "content_cas_map" + , ["src/buildtool/execution_api/common", "common"] + ] , "stage": ["src", "other_tools", "ops_maps"] , "private-deps": - [ ["src/other_tools/just_mr", "utils"] + [ ["@", "fmt", "", "fmt"] + , ["src/other_tools/just_mr", "utils"] , ["src/buildtool/execution_api/local", "local"] , ["src/buildtool/file_system", "file_storage"] + , ["src/buildtool/file_system", "file_system_manager"] , ["src/other_tools/just_mr/progress_reporting", "statistics"] , ["src/other_tools/just_mr/progress_reporting", "progress"] ] @@ -98,7 +105,7 @@ , "hdrs": ["git_tree_fetch_map.hpp"] , "srcs": ["git_tree_fetch_map.cpp"] , "deps": - [ ["@", "json", "", "json"] + [ ["@", "gsl", "", "gsl"] , ["src/buildtool/execution_api/common", "common"] , ["src/other_tools/ops_maps", "critical_git_op_map"] , ["src/other_tools/ops_maps", "import_to_git_map"] diff --git a/src/other_tools/ops_maps/archive_fetch_map.cpp b/src/other_tools/ops_maps/archive_fetch_map.cpp index 67b99e9a..c91cdcf9 100644 --- a/src/other_tools/ops_maps/archive_fetch_map.cpp +++ b/src/other_tools/ops_maps/archive_fetch_map.cpp @@ -14,7 +14,11 @@ #include "src/other_tools/ops_maps/archive_fetch_map.hpp" +#include <string> + +#include "fmt/core.h" #include "src/buildtool/file_system/file_storage.hpp" +#include "src/buildtool/file_system/file_system_manager.hpp" #include "src/buildtool/storage/storage.hpp" #include "src/other_tools/just_mr/progress_reporting/progress.hpp" #include "src/other_tools/just_mr/progress_reporting/statistics.hpp" diff --git a/src/other_tools/ops_maps/archive_fetch_map.hpp b/src/other_tools/ops_maps/archive_fetch_map.hpp index a74b2428..656f2100 100644 --- a/src/other_tools/ops_maps/archive_fetch_map.hpp +++ b/src/other_tools/ops_maps/archive_fetch_map.hpp @@ -15,6 +15,9 @@ #ifndef INCLUDED_SRC_OTHER_TOOLS_OPS_MAPS_ARCHIVE_FETCH_MAP_HPP #define INCLUDED_SRC_OTHER_TOOLS_OPS_MAPS_ARCHIVE_FETCH_MAP_HPP +#include <filesystem> + +#include "gsl/gsl" #include "src/buildtool/execution_api/common/execution_api.hpp" #include "src/other_tools/ops_maps/content_cas_map.hpp" diff --git a/src/other_tools/ops_maps/content_cas_map.cpp b/src/other_tools/ops_maps/content_cas_map.cpp index 864d4bf0..4a486836 100644 --- a/src/other_tools/ops_maps/content_cas_map.cpp +++ b/src/other_tools/ops_maps/content_cas_map.cpp @@ -14,6 +14,7 @@ #include "src/other_tools/ops_maps/content_cas_map.hpp" +#include "fmt/core.h" #include "src/buildtool/file_system/file_storage.hpp" #include "src/buildtool/serve_api/remote/serve_api.hpp" #include "src/buildtool/storage/fs_utils.hpp" diff --git a/src/other_tools/ops_maps/content_cas_map.hpp b/src/other_tools/ops_maps/content_cas_map.hpp index 599c9550..d32cfbd2 100644 --- a/src/other_tools/ops_maps/content_cas_map.hpp +++ b/src/other_tools/ops_maps/content_cas_map.hpp @@ -19,7 +19,6 @@ #include <string> #include <vector> -#include "nlohmann/json.hpp" #include "src/buildtool/common/user_structs.hpp" #include "src/buildtool/execution_api/common/execution_api.hpp" #include "src/buildtool/file_system/symlinks_map/pragma_special.hpp" diff --git a/src/other_tools/ops_maps/critical_git_op_map.hpp b/src/other_tools/ops_maps/critical_git_op_map.hpp index 58c2d3a1..fc4cf758 100644 --- a/src/other_tools/ops_maps/critical_git_op_map.hpp +++ b/src/other_tools/ops_maps/critical_git_op_map.hpp @@ -16,8 +16,11 @@ #define INCLUDED_SRC_OTHER_TOOLS_OPS_MAPS_CRITICAL_GIT_OP_MAP_HPP #include <filesystem> +#include <memory> #include <mutex> +#include <optional> #include <string> +#include <unordered_map> #include "src/buildtool/multithreading/async_map_consumer.hpp" #include "src/other_tools/git_operations/git_operations.hpp" diff --git a/src/other_tools/ops_maps/git_tree_fetch_map.hpp b/src/other_tools/ops_maps/git_tree_fetch_map.hpp index 85906e8c..e5cab5fa 100644 --- a/src/other_tools/ops_maps/git_tree_fetch_map.hpp +++ b/src/other_tools/ops_maps/git_tree_fetch_map.hpp @@ -15,11 +15,11 @@ #ifndef INCLUDED_SRC_OTHER_TOOLS_OPS_MAPS_GIT_TREE_FETCH_MAP_HPP #define INCLUDED_SRC_OTHER_TOOLS_OPS_MAPS_GIT_TREE_FETCH_MAP_HPP +#include <map> #include <string> -#include <utility> #include <vector> -#include "nlohmann/json.hpp" +#include "gsl/gsl" #include "src/buildtool/execution_api/common/execution_api.hpp" #include "src/other_tools/ops_maps/critical_git_op_map.hpp" #include "src/other_tools/ops_maps/import_to_git_map.hpp" diff --git a/src/other_tools/ops_maps/git_update_map.hpp b/src/other_tools/ops_maps/git_update_map.hpp index abd0aee9..1978069a 100644 --- a/src/other_tools/ops_maps/git_update_map.hpp +++ b/src/other_tools/ops_maps/git_update_map.hpp @@ -15,6 +15,10 @@ #ifndef INCLUDED_SRC_OTHER_TOOLS_OPS_MAPS_GIT_UPDATE_MAP_HPP #define INCLUDED_SRC_OTHER_TOOLS_OPS_MAPS_GIT_UPDATE_MAP_HPP +#include <string> +#include <utility> +#include <vector> + #include "src/buildtool/multithreading/async_map_consumer.hpp" #include "src/other_tools/git_operations/git_repo_remote.hpp" #include "src/utils/cpp/hash_combine.hpp" diff --git a/src/other_tools/ops_maps/import_to_git_map.cpp b/src/other_tools/ops_maps/import_to_git_map.cpp index 28365866..ec3e1c1d 100644 --- a/src/other_tools/ops_maps/import_to_git_map.cpp +++ b/src/other_tools/ops_maps/import_to_git_map.cpp @@ -17,6 +17,7 @@ #include "fmt/core.h" #include "src/buildtool/execution_api/common/execution_common.hpp" #include "src/buildtool/execution_api/local/config.hpp" +#include "src/buildtool/multithreading/task_system.hpp" #include "src/buildtool/storage/config.hpp" #include "src/buildtool/storage/fs_utils.hpp" diff --git a/src/other_tools/ops_maps/import_to_git_map.hpp b/src/other_tools/ops_maps/import_to_git_map.hpp index 487bae7c..50f80150 100644 --- a/src/other_tools/ops_maps/import_to_git_map.hpp +++ b/src/other_tools/ops_maps/import_to_git_map.hpp @@ -17,7 +17,9 @@ #include <filesystem> #include <string> +#include <utility> +#include "gsl/gsl" #include "src/other_tools/git_operations/git_repo_remote.hpp" #include "src/other_tools/ops_maps/critical_git_op_map.hpp" #include "src/utils/cpp/path.hpp" diff --git a/src/other_tools/repo_map/TARGETS b/src/other_tools/repo_map/TARGETS index 166e0696..5872c802 100644 --- a/src/other_tools/repo_map/TARGETS +++ b/src/other_tools/repo_map/TARGETS @@ -4,7 +4,8 @@ , "hdrs": ["repos_to_setup_map.hpp"] , "srcs": ["repos_to_setup_map.cpp"] , "deps": - [ ["src/other_tools/root_maps", "commit_git_map"] + [ ["@", "gsl", "", "gsl"] + , ["src/other_tools/root_maps", "commit_git_map"] , ["src/other_tools/root_maps", "content_git_map"] , ["src/other_tools/root_maps", "distdir_git_map"] , ["src/other_tools/root_maps", "fpath_git_map"] @@ -13,10 +14,12 @@ ] , "stage": ["src", "other_tools", "repo_map"] , "private-deps": - [ ["src/other_tools/just_mr/progress_reporting", "progress"] + [ ["@", "fmt", "", "fmt"] + , ["src/other_tools/just_mr/progress_reporting", "progress"] , ["src/other_tools/just_mr/progress_reporting", "statistics"] , ["src/buildtool/file_system", "file_root"] , ["src/buildtool/file_system/symlinks_map", "pragma_special"] + , ["src/buildtool/multithreading", "task_system"] , ["src/other_tools/ops_maps", "content_cas_map"] , ["src/other_tools/ops_maps", "git_tree_fetch_map"] ] diff --git a/src/other_tools/repo_map/repos_to_setup_map.cpp b/src/other_tools/repo_map/repos_to_setup_map.cpp index 3f9390b2..3af2db3f 100644 --- a/src/other_tools/repo_map/repos_to_setup_map.cpp +++ b/src/other_tools/repo_map/repos_to_setup_map.cpp @@ -14,8 +14,10 @@ #include "src/other_tools/repo_map/repos_to_setup_map.hpp" +#include "fmt/core.h" #include "src/buildtool/file_system/file_root.hpp" #include "src/buildtool/file_system/symlinks_map/pragma_special.hpp" +#include "src/buildtool/multithreading/task_system.hpp" #include "src/other_tools/just_mr/progress_reporting/progress.hpp" #include "src/other_tools/just_mr/progress_reporting/statistics.hpp" #include "src/other_tools/ops_maps/content_cas_map.hpp" diff --git a/src/other_tools/repo_map/repos_to_setup_map.hpp b/src/other_tools/repo_map/repos_to_setup_map.hpp index 1fbf9687..ecd1bb6d 100644 --- a/src/other_tools/repo_map/repos_to_setup_map.hpp +++ b/src/other_tools/repo_map/repos_to_setup_map.hpp @@ -15,6 +15,11 @@ #ifndef INCLUDED_SRC_OTHER_TOOLS_REPO_MAP_REPOS_TO_SETUP_MAP_HPP #define INCLUDED_SRC_OTHER_TOOLS_REPO_MAP_REPOS_TO_SETUP_MAP_HPP +#include <memory> +#include <optional> +#include <string> + +#include "gsl/gsl" #include "src/buildtool/build_engine/expression/configuration.hpp" #include "src/other_tools/root_maps/commit_git_map.hpp" #include "src/other_tools/root_maps/content_git_map.hpp" diff --git a/src/other_tools/root_maps/TARGETS b/src/other_tools/root_maps/TARGETS index 6a5955e2..7eab68a5 100644 --- a/src/other_tools/root_maps/TARGETS +++ b/src/other_tools/root_maps/TARGETS @@ -4,13 +4,15 @@ , "hdrs": ["distdir_git_map.hpp"] , "srcs": ["distdir_git_map.cpp"] , "deps": - [ ["@", "json", "", "json"] + [ ["@", "gsl", "", "gsl"] + , ["@", "json", "", "json"] , ["src/other_tools/ops_maps", "import_to_git_map"] , ["src/other_tools/ops_maps", "content_cas_map"] ] , "stage": ["src", "other_tools", "root_maps"] , "private-deps": - [ ["src/other_tools/ops_maps", "critical_git_op_map"] + [ ["@", "fmt", "", "fmt"] + , ["src/other_tools/ops_maps", "critical_git_op_map"] , ["src/buildtool/execution_api/common", "common"] , ["src/buildtool/execution_api/local", "config"] , ["src/buildtool/execution_api/local", "local"] @@ -37,15 +39,18 @@ , ["src/other_tools/ops_maps", "critical_git_op_map"] , ["src/other_tools/ops_maps", "import_to_git_map"] , ["src/utils/cpp", "hash_combine"] + , ["@", "gsl", "", "gsl"] , ["@", "json", "", "json"] ] , "stage": ["src", "other_tools", "root_maps"] , "private-deps": - [ ["src/other_tools/git_operations", "git_repo_remote"] + [ ["@", "fmt", "", "fmt"] + , ["src/other_tools/git_operations", "git_repo_remote"] , ["src/utils/cpp", "tmp_dir"] , ["src/other_tools/just_mr/progress_reporting", "progress"] , ["src/other_tools/just_mr/progress_reporting", "statistics"] , ["src/buildtool/file_system", "file_root"] + , ["src/buildtool/multithreading", "task_system"] , ["src/buildtool/storage", "config"] , ["src/buildtool/storage", "fs_utils"] , ["src/other_tools/utils", "curl_url_handle"] @@ -57,8 +62,9 @@ , "hdrs": ["fpath_git_map.hpp"] , "srcs": ["fpath_git_map.cpp"] , "deps": - [ ["src/other_tools/ops_maps", "import_to_git_map"] + [ ["@", "gsl", "", "gsl"] , ["@", "json", "", "json"] + , ["src/other_tools/ops_maps", "import_to_git_map"] , ["src/utils/cpp", "path_hash"] , ["src/utils/cpp", "hash_combine"] , ["src/other_tools/just_mr", "utils"] @@ -67,7 +73,9 @@ ] , "stage": ["src", "other_tools", "root_maps"] , "private-deps": - [ ["src/buildtool/execution_api/local", "config"] + [ ["@", "fmt", "", "fmt"] + , ["src/buildtool/execution_api/local", "config"] + , ["src/buildtool/multithreading", "task_system"] , ["src/buildtool/storage", "config"] , ["src/utils/cpp", "tmp_dir"] , ["src/buildtool/file_system", "file_root"] @@ -83,7 +91,9 @@ , "hdrs": ["content_git_map.hpp"] , "srcs": ["content_git_map.cpp"] , "deps": - [ ["src/buildtool/serve_api/remote", "serve_api"] + [ ["@", "gsl", "", "gsl"] + , ["@", "json", "", "json"] + , ["src/buildtool/serve_api/remote", "serve_api"] , ["src/buildtool/execution_api/common", "common"] , ["src/buildtool/common", "user_structs"] , ["src/other_tools/just_mr", "mirrors"] @@ -93,10 +103,12 @@ ] , "stage": ["src", "other_tools", "root_maps"] , "private-deps": - [ ["src/utils/archive", "archive_ops"] + [ ["@", "fmt", "", "fmt"] + , ["src/utils/archive", "archive_ops"] , ["src/buildtool/execution_api/local", "local"] , ["src/buildtool/file_system", "file_storage"] , ["src/buildtool/file_system/symlinks_map", "pragma_special"] + , ["src/buildtool/multithreading", "task_system"] , ["src/buildtool/storage", "storage"] , ["src/buildtool/storage", "config"] , ["src/buildtool/storage", "fs_utils"] @@ -114,7 +126,8 @@ , "hdrs": ["tree_id_git_map.hpp"] , "srcs": ["tree_id_git_map.cpp"] , "deps": - [ ["@", "json", "", "json"] + [ ["@", "gsl", "", "gsl"] + , ["@", "json", "", "json"] , ["src/other_tools/ops_maps", "git_tree_fetch_map"] , ["src/utils/cpp", "hash_combine"] ] diff --git a/src/other_tools/root_maps/commit_git_map.cpp b/src/other_tools/root_maps/commit_git_map.cpp index e07a8967..5e65217a 100644 --- a/src/other_tools/root_maps/commit_git_map.cpp +++ b/src/other_tools/root_maps/commit_git_map.cpp @@ -16,7 +16,9 @@ #include <algorithm> +#include "fmt/core.h" #include "src/buildtool/file_system/file_root.hpp" +#include "src/buildtool/multithreading/task_system.hpp" #include "src/buildtool/storage/config.hpp" #include "src/buildtool/storage/fs_utils.hpp" #include "src/other_tools/git_operations/git_repo_remote.hpp" diff --git a/src/other_tools/root_maps/commit_git_map.hpp b/src/other_tools/root_maps/commit_git_map.hpp index 4bf4100b..077ed74b 100644 --- a/src/other_tools/root_maps/commit_git_map.hpp +++ b/src/other_tools/root_maps/commit_git_map.hpp @@ -19,6 +19,7 @@ #include <utility> #include <vector> +#include "gsl/gsl" #include "nlohmann/json.hpp" #include "src/buildtool/common/user_structs.hpp" #include "src/buildtool/execution_api/common/execution_api.hpp" diff --git a/src/other_tools/root_maps/content_git_map.cpp b/src/other_tools/root_maps/content_git_map.cpp index 924f678b..9441bcaf 100644 --- a/src/other_tools/root_maps/content_git_map.cpp +++ b/src/other_tools/root_maps/content_git_map.cpp @@ -14,9 +14,11 @@ #include "src/other_tools/root_maps/content_git_map.hpp" +#include "fmt/core.h" #include "src/buildtool/file_system/file_root.hpp" #include "src/buildtool/file_system/file_storage.hpp" #include "src/buildtool/file_system/symlinks_map/pragma_special.hpp" +#include "src/buildtool/multithreading/task_system.hpp" #include "src/buildtool/storage/config.hpp" #include "src/buildtool/storage/fs_utils.hpp" #include "src/buildtool/storage/storage.hpp" diff --git a/src/other_tools/root_maps/content_git_map.hpp b/src/other_tools/root_maps/content_git_map.hpp index 4dc3180e..edf1fe9b 100644 --- a/src/other_tools/root_maps/content_git_map.hpp +++ b/src/other_tools/root_maps/content_git_map.hpp @@ -17,6 +17,8 @@ #include <utility> +#include "gsl/gsl" +#include "nlohmann/json.hpp" #include "src/buildtool/common/user_structs.hpp" #include "src/buildtool/execution_api/common/execution_api.hpp" #include "src/buildtool/file_system/symlinks_map/resolve_symlinks_map.hpp" diff --git a/src/other_tools/root_maps/distdir_git_map.cpp b/src/other_tools/root_maps/distdir_git_map.cpp index 8f7bd98f..677e3057 100644 --- a/src/other_tools/root_maps/distdir_git_map.cpp +++ b/src/other_tools/root_maps/distdir_git_map.cpp @@ -16,6 +16,7 @@ #include <algorithm> +#include "fmt/core.h" #include "src/buildtool/execution_api/common/execution_common.hpp" #include "src/buildtool/file_system/file_root.hpp" #include "src/buildtool/file_system/file_storage.hpp" diff --git a/src/other_tools/root_maps/distdir_git_map.hpp b/src/other_tools/root_maps/distdir_git_map.hpp index 4c282157..c2f03e08 100644 --- a/src/other_tools/root_maps/distdir_git_map.hpp +++ b/src/other_tools/root_maps/distdir_git_map.hpp @@ -15,8 +15,12 @@ #ifndef INCLUDED_SRC_OTHER_TOOLS_ROOT_MAPS_DISTDIR_GIT_MAP_HPP #define INCLUDED_SRC_OTHER_TOOLS_ROOT_MAPS_DISTDIR_GIT_MAP_HPP +#include <memory> +#include <string> +#include <unordered_map> #include <utility> +#include "gsl/gsl" #include "nlohmann/json.hpp" #include "src/other_tools/ops_maps/content_cas_map.hpp" #include "src/other_tools/ops_maps/import_to_git_map.hpp" diff --git a/src/other_tools/root_maps/fpath_git_map.cpp b/src/other_tools/root_maps/fpath_git_map.cpp index 9f545856..f8199547 100644 --- a/src/other_tools/root_maps/fpath_git_map.cpp +++ b/src/other_tools/root_maps/fpath_git_map.cpp @@ -14,9 +14,11 @@ #include "src/other_tools/root_maps/fpath_git_map.hpp" +#include "fmt/core.h" #include "src/buildtool/execution_api/local/config.hpp" #include "src/buildtool/file_system/file_root.hpp" #include "src/buildtool/file_system/git_repo.hpp" +#include "src/buildtool/multithreading/task_system.hpp" #include "src/buildtool/storage/config.hpp" #include "src/buildtool/storage/fs_utils.hpp" #include "src/other_tools/git_operations/git_repo_remote.hpp" diff --git a/src/other_tools/root_maps/fpath_git_map.hpp b/src/other_tools/root_maps/fpath_git_map.hpp index 139921b7..556ff61a 100644 --- a/src/other_tools/root_maps/fpath_git_map.hpp +++ b/src/other_tools/root_maps/fpath_git_map.hpp @@ -15,6 +15,11 @@ #ifndef INCLUDED_SRC_OTHER_TOOLS_ROOT_MAPS_FPATH_GIT_MAP_HPP #define INCLUDED_SRC_OTHER_TOOLS_ROOT_MAPS_FPATH_GIT_MAP_HPP +#include <filesystem> +#include <optional> +#include <string> + +#include "gsl/gsl" #include "nlohmann/json.hpp" #include "src/buildtool/file_system/symlinks_map/pragma_special.hpp" #include "src/buildtool/file_system/symlinks_map/resolve_symlinks_map.hpp" diff --git a/src/other_tools/root_maps/tree_id_git_map.hpp b/src/other_tools/root_maps/tree_id_git_map.hpp index 78dcc982..da4d9328 100644 --- a/src/other_tools/root_maps/tree_id_git_map.hpp +++ b/src/other_tools/root_maps/tree_id_git_map.hpp @@ -19,6 +19,8 @@ #include <utility> #include <vector> +#include "gsl/gsl" +#include "nlohmann/json.hpp" #include "src/other_tools/ops_maps/git_tree_fetch_map.hpp" #include "src/utils/cpp/hash_combine.hpp" |