summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/other_tools/root_maps/TARGETS51
-rw-r--r--src/other_tools/root_maps/commit_git_map.cpp1
-rw-r--r--src/other_tools/root_maps/commit_git_map.hpp1
-rw-r--r--src/other_tools/root_maps/content_git_map.cpp1
-rw-r--r--src/other_tools/root_maps/content_git_map.hpp1
5 files changed, 27 insertions, 28 deletions
diff --git a/src/other_tools/root_maps/TARGETS b/src/other_tools/root_maps/TARGETS
index f9d5ed8d..5e7a40b7 100644
--- a/src/other_tools/root_maps/TARGETS
+++ b/src/other_tools/root_maps/TARGETS
@@ -37,28 +37,28 @@
, "hdrs": ["commit_git_map.hpp"]
, "srcs": ["commit_git_map.cpp"]
, "deps":
- [ ["src/buildtool/serve_api/remote", "serve_api"]
- , ["src/buildtool/execution_api/common", "common"]
+ [ ["@", "gsl", "", "gsl"]
+ , ["@", "json", "", "json"]
, ["src/buildtool/common", "user_structs"]
+ , ["src/buildtool/execution_api/common", "common"]
+ , ["src/buildtool/serve_api/remote", "serve_api"]
, ["src/other_tools/just_mr", "mirrors"]
, ["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":
[ ["@", "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/git_operations", "git_repo_remote"]
+ , ["src/other_tools/just_mr/progress_reporting", "progress"]
+ , ["src/other_tools/just_mr/progress_reporting", "statistics"]
, ["src/other_tools/utils", "curl_url_handle"]
+ , ["src/utils/cpp", "tmp_dir"]
]
}
, "fpath_git_map":
@@ -69,25 +69,24 @@
, "deps":
[ ["@", "gsl", "", "gsl"]
, ["@", "json", "", "json"]
+ , ["src/buildtool/file_system/symlinks_map", "pragma_special"]
+ , ["src/buildtool/file_system/symlinks_map", "resolve_symlinks_map"]
+ , ["src/other_tools/just_mr", "utils"]
, ["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"]
- , ["src/buildtool/file_system/symlinks_map", "resolve_symlinks_map"]
- , ["src/buildtool/file_system/symlinks_map", "pragma_special"]
+ , ["src/utils/cpp", "path_hash"]
]
, "stage": ["src", "other_tools", "root_maps"]
, "private-deps":
[ ["@", "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"]
, ["src/buildtool/file_system", "git_repo"]
- , ["src/other_tools/git_operations", "git_repo_remote"]
- , ["src/buildtool/file_system/symlinks_map", "pragma_special"]
+ , ["src/buildtool/multithreading", "task_system"]
+ , ["src/buildtool/storage", "config"]
, ["src/buildtool/storage", "fs_utils"]
+ , ["src/other_tools/git_operations", "git_repo_remote"]
+ , ["src/utils/cpp", "tmp_dir"]
]
}
, "content_git_map":
@@ -98,31 +97,31 @@
, "deps":
[ ["@", "gsl", "", "gsl"]
, ["@", "json", "", "json"]
- , ["src/buildtool/serve_api/remote", "serve_api"]
- , ["src/buildtool/execution_api/common", "common"]
, ["src/buildtool/common", "user_structs"]
+ , ["src/buildtool/execution_api/common", "common"]
+ , ["src/buildtool/file_system/symlinks_map", "resolve_symlinks_map"]
, ["src/other_tools/just_mr", "mirrors"]
, ["src/other_tools/ops_maps", "content_cas_map"]
, ["src/other_tools/ops_maps", "import_to_git_map"]
- , ["src/buildtool/file_system/symlinks_map", "resolve_symlinks_map"]
]
, "stage": ["src", "other_tools", "root_maps"]
, "private-deps":
[ ["@", "fmt", "", "fmt"]
- , ["src/utils/archive", "archive_ops"]
, ["src/buildtool/execution_api/local", "local"]
+ , ["src/buildtool/file_system", "file_root"]
, ["src/buildtool/file_system", "file_storage"]
+ , ["src/buildtool/file_system", "git_repo"]
, ["src/buildtool/file_system/symlinks_map", "pragma_special"]
, ["src/buildtool/multithreading", "task_system"]
+ , ["src/buildtool/serve_api/remote", "serve_api"]
, ["src/buildtool/storage", "storage"]
, ["src/buildtool/storage", "config"]
, ["src/buildtool/storage", "fs_utils"]
+ , ["src/other_tools/git_operations", "git_repo_remote"]
, ["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", "git_repo"]
- , ["src/other_tools/git_operations", "git_repo_remote"]
, ["src/other_tools/utils", "content"]
+ , ["src/utils/archive", "archive_ops"]
]
}
, "tree_id_git_map":
@@ -138,9 +137,9 @@
]
, "stage": ["src", "other_tools", "root_maps"]
, "private-deps":
- [ ["src/buildtool/storage", "config"]
+ [ ["@", "fmt", "", "fmt"]
, ["src/buildtool/file_system", "file_root"]
- , ["@", "fmt", "", "fmt"]
+ , ["src/buildtool/storage", "config"]
]
}
}
diff --git a/src/other_tools/root_maps/commit_git_map.cpp b/src/other_tools/root_maps/commit_git_map.cpp
index 5e65217a..7855c3f2 100644
--- a/src/other_tools/root_maps/commit_git_map.cpp
+++ b/src/other_tools/root_maps/commit_git_map.cpp
@@ -19,6 +19,7 @@
#include "fmt/core.h"
#include "src/buildtool/file_system/file_root.hpp"
#include "src/buildtool/multithreading/task_system.hpp"
+#include "src/buildtool/serve_api/remote/serve_api.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 077ed74b..348e5e11 100644
--- a/src/other_tools/root_maps/commit_git_map.hpp
+++ b/src/other_tools/root_maps/commit_git_map.hpp
@@ -23,7 +23,6 @@
#include "nlohmann/json.hpp"
#include "src/buildtool/common/user_structs.hpp"
#include "src/buildtool/execution_api/common/execution_api.hpp"
-#include "src/buildtool/serve_api/remote/serve_api.hpp"
#include "src/other_tools/just_mr/mirrors.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/root_maps/content_git_map.cpp b/src/other_tools/root_maps/content_git_map.cpp
index a2ff8f26..6f4a08bc 100644
--- a/src/other_tools/root_maps/content_git_map.cpp
+++ b/src/other_tools/root_maps/content_git_map.cpp
@@ -19,6 +19,7 @@
#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/serve_api/remote/serve_api.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 edf1fe9b..2b894d27 100644
--- a/src/other_tools/root_maps/content_git_map.hpp
+++ b/src/other_tools/root_maps/content_git_map.hpp
@@ -22,7 +22,6 @@
#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"
-#include "src/buildtool/serve_api/remote/serve_api.hpp"
#include "src/other_tools/just_mr/mirrors.hpp"
#include "src/other_tools/ops_maps/content_cas_map.hpp"
#include "src/other_tools/ops_maps/import_to_git_map.hpp"