summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/buildtool/build_engine/analysed_target/TARGETS1
-rw-r--r--src/buildtool/build_engine/base_maps/TARGETS26
-rw-r--r--src/buildtool/build_engine/expression/TARGETS10
-rw-r--r--src/buildtool/build_engine/target_map/TARGETS43
-rw-r--r--src/buildtool/common/TARGETS34
-rw-r--r--src/buildtool/compatibility/TARGETS1
-rw-r--r--src/buildtool/crypto/TARGETS6
-rw-r--r--src/buildtool/execution_api/bazel_msg/TARGETS15
-rw-r--r--src/buildtool/execution_api/common/TARGETS3
-rw-r--r--src/buildtool/execution_api/local/TARGETS9
-rw-r--r--src/buildtool/execution_api/remote/TARGETS17
-rw-r--r--src/buildtool/execution_engine/dag/TARGETS2
-rw-r--r--src/buildtool/execution_engine/executor/TARGETS1
-rw-r--r--src/buildtool/file_system/TARGETS17
-rw-r--r--src/buildtool/graph_traverser/TARGETS3
-rw-r--r--src/buildtool/main/TARGETS35
-rw-r--r--src/buildtool/multithreading/TARGETS3
-rw-r--r--src/buildtool/progress_reporting/TARGETS3
-rw-r--r--test/buildtool/file_system/TARGETS1
19 files changed, 144 insertions, 86 deletions
diff --git a/src/buildtool/build_engine/analysed_target/TARGETS b/src/buildtool/build_engine/analysed_target/TARGETS
index 18b3041c..baa959c1 100644
--- a/src/buildtool/build_engine/analysed_target/TARGETS
+++ b/src/buildtool/build_engine/analysed_target/TARGETS
@@ -9,6 +9,7 @@
, ["src/buildtool/common", "artifact_description"]
, ["src/buildtool/common", "tree"]
, "graph_information"
+ , ["src/buildtool/build_engine/expression", "expression_ptr_interface"]
]
, "stage": ["src", "buildtool", "build_engine", "analysed_target"]
}
diff --git a/src/buildtool/build_engine/base_maps/TARGETS b/src/buildtool/build_engine/base_maps/TARGETS
index bf513067..7f8b5546 100644
--- a/src/buildtool/build_engine/base_maps/TARGETS
+++ b/src/buildtool/build_engine/base_maps/TARGETS
@@ -11,12 +11,13 @@
, "hdrs": ["directory_map.hpp"]
, "srcs": ["directory_map.cpp"]
, "deps":
- [ ["src/buildtool/common", "config"]
- , ["src/buildtool/multithreading", "async_map_consumer"]
- , ["src/utils/cpp", "path"]
+ [ ["src/buildtool/multithreading", "async_map_consumer"]
, "module_name"
+ , ["src/buildtool/file_system", "file_root"]
]
, "stage": ["src", "buildtool", "build_engine", "base_maps"]
+ , "private-deps":
+ [["src/buildtool/common", "config"], ["src/utils/cpp", "path"]]
}
, "json_file_map":
{ "type": ["@", "rules", "CC", "library"]
@@ -40,6 +41,7 @@
[ "json_file_map"
, ["@", "json", "", "json"]
, ["src/buildtool/multithreading", "async_map_consumer"]
+ , "module_name"
]
, "stage": ["src", "buildtool", "build_engine", "base_maps"]
}
@@ -66,6 +68,7 @@
, ["@", "gsl-lite", "", "gsl-lite"]
, ["src/buildtool/common", "config"]
, ["src/buildtool/build_engine/expression", "expression"]
+ , ["src/utils/cpp", "hash_combine"]
]
, "stage": ["src", "buildtool", "build_engine", "base_maps"]
}
@@ -82,9 +85,10 @@
, ["src/buildtool/build_engine/analysed_target", "target"]
, ["src/buildtool/build_engine/expression", "expression"]
, ["src/buildtool/multithreading", "async_map_consumer"]
- , ["src/utils/cpp", "json"]
+ , ["src/buildtool/multithreading", "task_system"]
]
, "stage": ["src", "buildtool", "build_engine", "base_maps"]
+ , "private-deps": [["src/utils/cpp", "json"]]
}
, "field_reader":
{ "type": ["@", "rules", "CC", "library"]
@@ -105,12 +109,12 @@
, "name": ["expression_function"]
, "hdrs": ["expression_function.hpp"]
, "deps":
- [ ["src/utils/cpp", "hash_combine"]
- , ["src/buildtool/build_engine/expression", "expression"]
+ [ ["src/buildtool/build_engine/expression", "expression"]
, ["src/buildtool/logging", "logging"]
, ["@", "gsl-lite", "", "gsl-lite"]
]
, "stage": ["src", "buildtool", "build_engine", "base_maps"]
+ , "private-deps": [["src/utils/cpp", "hash_combine"]]
}
, "expression_map":
{ "type": ["@", "rules", "CC", "library"]
@@ -121,14 +125,15 @@
[ "json_file_map"
, "entity_name"
, "expression_function"
- , "field_reader"
, ["@", "gsl-lite", "", "gsl-lite"]
, ["@", "fmt", "", "fmt"]
, ["@", "json", "", "json"]
- , ["src/buildtool/build_engine/expression", "expression"]
, ["src/buildtool/multithreading", "async_map_consumer"]
+ , "module_name"
]
, "stage": ["src", "buildtool", "build_engine", "base_maps"]
+ , "private-deps":
+ ["field_reader", ["src/buildtool/build_engine/expression", "expression"]]
}
, "user_rule":
{ "type": ["@", "rules", "CC", "library"]
@@ -153,14 +158,15 @@
[ "json_file_map"
, "entity_name"
, "user_rule"
- , "field_reader"
, "expression_map"
, ["@", "gsl-lite", "", "gsl-lite"]
, ["@", "fmt", "", "fmt"]
, ["@", "json", "", "json"]
- , ["src/buildtool/build_engine/expression", "expression"]
, ["src/buildtool/multithreading", "async_map_consumer"]
+ , "module_name"
]
, "stage": ["src", "buildtool", "build_engine", "base_maps"]
+ , "private-deps":
+ ["field_reader", ["src/buildtool/build_engine/expression", "expression"]]
}
}
diff --git a/src/buildtool/build_engine/expression/TARGETS b/src/buildtool/build_engine/expression/TARGETS
index 76a6058f..5aa59941 100644
--- a/src/buildtool/build_engine/expression/TARGETS
+++ b/src/buildtool/build_engine/expression/TARGETS
@@ -6,6 +6,7 @@
[ ["@", "fmt", "", "fmt"]
, ["src/buildtool/multithreading", "atomic_value"]
, ["src/utils/cpp", "hash_combine"]
+ , ["src/utils/cpp", "atomic"]
]
, "stage": ["src", "buildtool", "build_engine", "expression"]
}
@@ -25,7 +26,6 @@
, "name": ["expression"]
, "hdrs":
[ "configuration.hpp"
- , "expression_ptr.hpp"
, "expression.hpp"
, "evaluator.hpp"
, "target_result.hpp"
@@ -44,16 +44,18 @@
, ["src/buildtool/build_engine/base_maps", "entity_name_data"]
, ["src/buildtool/common", "artifact_description"]
, ["src/buildtool/crypto", "hash_function"]
- , ["src/buildtool/logging", "logging"]
, ["src/buildtool/multithreading", "atomic_value"]
- , ["src/utils/cpp", "type_safe_arithmetic"]
, ["src/utils/cpp", "json"]
, ["src/utils/cpp", "hash_combine"]
, ["src/utils/cpp", "hex_string"]
, ["src/utils/cpp", "concepts"]
- , ["src/utils/cpp", "path"]
, ["@", "gsl-lite", "", "gsl-lite"]
]
, "stage": ["src", "buildtool", "build_engine", "expression"]
+ , "private-deps":
+ [ ["src/buildtool/logging", "logging"]
+ , ["src/utils/cpp", "type_safe_arithmetic"]
+ , ["src/utils/cpp", "path"]
+ ]
}
}
diff --git a/src/buildtool/build_engine/target_map/TARGETS b/src/buildtool/build_engine/target_map/TARGETS
index 2b201fbf..f7bd8cb3 100644
--- a/src/buildtool/build_engine/target_map/TARGETS
+++ b/src/buildtool/build_engine/target_map/TARGETS
@@ -24,6 +24,10 @@
, ["src/buildtool/multithreading", "task_system"]
, ["src/buildtool/progress_reporting", "progress"]
, ["@", "gsl-lite", "", "gsl-lite"]
+ , ["src/utils/cpp", "hash_combine"]
+ , ["src/buildtool/logging", "logging"]
+ , ["src/buildtool/common", "common"]
+ , ["src/buildtool/build_engine/base_maps", "entity_name"]
]
, "stage": ["src", "buildtool", "build_engine", "target_map"]
}
@@ -36,33 +40,43 @@
, "deps":
[ "configured_target"
, "result_map"
- , "target_cache"
- , ["src/buildtool/common", "common"]
, ["src/buildtool/build_engine/analysed_target", "target"]
- , ["src/buildtool/build_engine/base_maps", "entity_name"]
- , ["src/buildtool/build_engine/base_maps", "field_reader"]
, ["src/buildtool/build_engine/base_maps", "rule_map"]
, ["src/buildtool/build_engine/base_maps", "source_map"]
, ["src/buildtool/build_engine/base_maps", "targets_file_map"]
+ , ["src/buildtool/multithreading", "async_map_consumer"]
+ , ["@", "fmt", "", "fmt"]
+ , ["@", "gsl-lite", "", "gsl-lite"]
+ , ["@", "json", "", "json"]
+ ]
+ , "stage": ["src", "buildtool", "build_engine", "target_map"]
+ , "private-deps":
+ [ "target_cache"
+ , ["src/buildtool/common", "common"]
+ , ["src/buildtool/build_engine/base_maps", "entity_name"]
+ , ["src/buildtool/build_engine/base_maps", "field_reader"]
, ["src/buildtool/build_engine/expression", "expression"]
, ["src/buildtool/execution_api/local", "local"]
, ["src/buildtool/logging", "logging"]
- , ["src/buildtool/multithreading", "async_map_consumer"]
, ["src/utils/cpp", "hash_combine"]
, ["src/utils/cpp", "path"]
- , ["@", "fmt", "", "fmt"]
, ["src/utils/cpp", "vector"]
- , ["@", "gsl-lite", "", "gsl-lite"]
- , ["@", "json", "", "json"]
]
- , "stage": ["src", "buildtool", "build_engine", "target_map"]
}
, "target_map_testable_internals":
{ "type": ["@", "rules", "CC", "library"]
, "tainted": ["test"]
, "name": ["target_map_testable_internals"]
, "hdrs": ["utils.hpp"]
- , "deps": ["target_map"]
+ , "deps":
+ [ "target_map"
+ , ["src/buildtool/build_engine/expression", "expression_ptr_interface"]
+ , "configured_target"
+ , ["src/buildtool/build_engine/base_maps", "entity_name"]
+ , ["src/buildtool/build_engine/base_maps", "field_reader"]
+ , ["src/buildtool/build_engine/expression", "expression"]
+ , ["src/buildtool/build_engine/analysed_target", "target"]
+ ]
, "stage": ["src", "buildtool", "build_engine", "target_map"]
}
, "target_cache":
@@ -74,10 +88,15 @@
[ ["src/buildtool/build_engine/analysed_target", "target"]
, ["src/buildtool/build_engine/base_maps", "entity_name"]
, ["src/buildtool/execution_api/local", "local"]
- , ["src/buildtool/execution_api/remote", "config"]
- , ["src/buildtool/file_system", "file_root"]
, ["src/buildtool/logging", "logging"]
+ , ["src/buildtool/common", "common"]
+ , ["src/buildtool/execution_api/common", "common"]
+ , ["src/buildtool/file_system", "file_system_manager"]
]
, "stage": ["src", "buildtool", "build_engine", "target_map"]
+ , "private-deps":
+ [ ["src/buildtool/execution_api/remote", "config"]
+ , ["src/buildtool/file_system", "file_root"]
+ ]
}
}
diff --git a/src/buildtool/common/TARGETS b/src/buildtool/common/TARGETS
index 22a8ffd1..8ec92746 100644
--- a/src/buildtool/common/TARGETS
+++ b/src/buildtool/common/TARGETS
@@ -35,13 +35,15 @@
, ["src/buildtool/crypto", "hash_function"]
, ["src/buildtool/file_system", "object_type"]
, ["src/buildtool/compatibility", "compatibility"]
- , ["src/buildtool/logging", "logging"]
- , ["src/buildtool/execution_api/remote", "config"]
- , ["src/utils/cpp", "type_safe_arithmetic"]
, ["src/utils/cpp", "hash_combine"]
, ["@", "json", "", "json"]
]
, "stage": ["src", "buildtool", "common"]
+ , "private-deps":
+ [ ["src/buildtool/logging", "logging"]
+ , ["src/buildtool/execution_api/remote", "config"]
+ , ["src/utils/cpp", "type_safe_arithmetic"]
+ ]
}
, "artifact_factory":
{ "type": ["@", "rules", "CC", "library"]
@@ -52,9 +54,11 @@
, "artifact_description"
, "action_description"
, ["src/buildtool/logging", "logging"]
- , ["src/utils/cpp", "type_safe_arithmetic"]
+ , ["src/buildtool/file_system", "object_type"]
+ , ["src/utils/cpp", "json"]
]
, "stage": ["src", "buildtool", "common"]
+ , "private-deps": [["src/utils/cpp", "type_safe_arithmetic"]]
}
, "artifact_description":
{ "type": ["@", "rules", "CC", "library"]
@@ -72,26 +76,18 @@
{ "type": ["@", "rules", "CC", "library"]
, "name": ["action_description"]
, "hdrs": ["action_description.hpp"]
- , "deps":
- [ "common"
- , "artifact_description"
- , ["src/buildtool/logging", "logging"]
- , ["@", "json", "", "json"]
- ]
+ , "deps": ["common", "artifact_description", ["@", "json", "", "json"]]
, "stage": ["src", "buildtool", "common"]
+ , "private-deps": [["src/buildtool/logging", "logging"]]
}
, "tree":
{ "type": ["@", "rules", "CC", "library"]
, "name": ["tree"]
, "hdrs": ["tree.hpp"]
, "deps":
- [ "common"
- , "action_description"
- , "artifact_description"
- , ["src/buildtool/logging", "logging"]
- , ["@", "json", "", "json"]
- ]
+ ["action_description", "artifact_description", ["@", "json", "", "json"]]
, "stage": ["src", "buildtool", "common"]
+ , "private-deps": ["common", ["src/buildtool/logging", "logging"]]
}
, "config":
{ "type": ["@", "rules", "CC", "library"]
@@ -103,9 +99,11 @@
, ["src/buildtool/file_system", "file_root"]
, ["src/buildtool/file_system", "git_cas"]
, ["src/buildtool/multithreading", "atomic_value"]
- , ["src/utils/automata", "dfa_minimizer"]
- , ["src/utils/cpp", "hash_combine"]
]
, "stage": ["src", "buildtool", "common"]
+ , "private-deps":
+ [ ["src/utils/automata", "dfa_minimizer"]
+ , ["src/utils/cpp", "hash_combine"]
+ ]
}
}
diff --git a/src/buildtool/compatibility/TARGETS b/src/buildtool/compatibility/TARGETS
index 5ef01708..93eedce0 100644
--- a/src/buildtool/compatibility/TARGETS
+++ b/src/buildtool/compatibility/TARGETS
@@ -5,6 +5,7 @@
, "deps":
[ ["src/buildtool/crypto", "hash_function"]
, ["@", "gsl-lite", "", "gsl-lite"]
+ , ["src/buildtool/logging", "logging"]
]
, "stage": ["src", "buildtool", "compatibility"]
}
diff --git a/src/buildtool/crypto/TARGETS b/src/buildtool/crypto/TARGETS
index db72b11d..4f73badf 100644
--- a/src/buildtool/crypto/TARGETS
+++ b/src/buildtool/crypto/TARGETS
@@ -5,10 +5,8 @@
, "srcs": ["hasher.cpp", "hash_impl_sha1.cpp", "hash_impl_sha256.cpp"]
, "stage": ["src", "buildtool", "crypto"]
, "deps":
- [ ["src/buildtool/logging", "logging"]
- , ["src/utils/cpp", "hex_string"]
- , ["@", "ssl", "", "crypto"]
- ]
+ [["src/buildtool/logging", "logging"], ["src/utils/cpp", "hex_string"]]
+ , "private-deps": [["@", "ssl", "", "crypto"]]
}
, "hash_function":
{ "type": ["@", "rules", "CC", "library"]
diff --git a/src/buildtool/execution_api/bazel_msg/TARGETS b/src/buildtool/execution_api/bazel_msg/TARGETS
index 8812d401..64cbddd3 100644
--- a/src/buildtool/execution_api/bazel_msg/TARGETS
+++ b/src/buildtool/execution_api/bazel_msg/TARGETS
@@ -4,12 +4,15 @@
, "hdrs": ["bazel_blob.hpp", "bazel_blob_container.hpp", "bazel_common.hpp"]
, "deps":
[ ["src/buildtool/common", "common"]
- , ["src/buildtool/crypto", "hash_function"]
, ["src/buildtool/file_system", "file_system_manager"]
- , ["src/buildtool/file_system", "git_cas"]
, ["src/utils/cpp", "concepts"]
+ , ["src/buildtool/common", "bazel_types"]
]
, "stage": ["src", "buildtool", "execution_api", "bazel_msg"]
+ , "private-deps":
+ [ ["src/buildtool/crypto", "hash_function"]
+ , ["src/buildtool/file_system", "git_cas"]
+ ]
}
, "bazel_msg_factory":
{ "type": ["@", "rules", "CC", "library"]
@@ -19,11 +22,15 @@
, "deps":
[ "bazel_msg"
, ["src/buildtool/common", "common"]
- , ["src/buildtool/file_system", "file_system_manager"]
, ["src/buildtool/file_system", "git_cas"]
, ["src/buildtool/execution_engine/dag", "dag"]
- , ["src/buildtool/compatibility", "compatibility"]
+ , ["src/buildtool/common", "bazel_types"]
+ ]
+ , "private-deps":
+ [ ["src/buildtool/compatibility", "compatibility"]
+ , ["src/utils/cpp", "hex_string"]
, ["@", "gsl-lite", "", "gsl-lite"]
+ , ["src/buildtool/file_system", "file_system_manager"]
]
, "stage": ["src", "buildtool", "execution_api", "bazel_msg"]
}
diff --git a/src/buildtool/execution_api/common/TARGETS b/src/buildtool/execution_api/common/TARGETS
index 47ec0fc0..61a18115 100644
--- a/src/buildtool/execution_api/common/TARGETS
+++ b/src/buildtool/execution_api/common/TARGETS
@@ -11,11 +11,12 @@
[ ["@", "gsl-lite", "", "gsl-lite"]
, ["src/buildtool/common", "common"]
, ["src/buildtool/crypto", "hash_function"]
- , ["src/buildtool/file_system", "object_type"]
, ["src/buildtool/execution_api/bazel_msg", "bazel_msg"]
, ["src/buildtool/execution_api/bazel_msg", "bazel_msg_factory"]
, ["src/utils/cpp", "hex_string"]
+ , ["src/buildtool/logging", "logging"]
]
, "stage": ["src", "buildtool", "execution_api", "common"]
+ , "private-deps": [["src/buildtool/file_system", "object_type"]]
}
}
diff --git a/src/buildtool/execution_api/local/TARGETS b/src/buildtool/execution_api/local/TARGETS
index 4af36d70..7b839530 100644
--- a/src/buildtool/execution_api/local/TARGETS
+++ b/src/buildtool/execution_api/local/TARGETS
@@ -28,11 +28,16 @@
, ["src/buildtool/execution_api/common", "common"]
, ["src/buildtool/execution_api/bazel_msg", "bazel_msg_factory"]
, ["src/buildtool/file_system", "file_system_manager"]
- , ["src/buildtool/file_system", "object_type"]
, ["src/buildtool/compatibility", "compatibility"]
- , ["src/buildtool/system", "system_command"]
, ["src/buildtool/logging", "logging"]
+ , ["src/buildtool/common", "common"]
+ , ["src/buildtool/common", "bazel_types"]
+ , ["src/buildtool/execution_api/bazel_msg", "bazel_msg"]
]
, "stage": ["src", "buildtool", "execution_api", "local"]
+ , "private-deps":
+ [ ["src/buildtool/file_system", "object_type"]
+ , ["src/buildtool/system", "system_command"]
+ ]
}
}
diff --git a/src/buildtool/execution_api/remote/TARGETS b/src/buildtool/execution_api/remote/TARGETS
index 50a28550..8e15dcfd 100644
--- a/src/buildtool/execution_api/remote/TARGETS
+++ b/src/buildtool/execution_api/remote/TARGETS
@@ -21,21 +21,25 @@
]
, "deps":
[ "config"
- , ["src/buildtool/common", "common"]
, ["src/buildtool/logging", "logging"]
- , ["src/buildtool/file_system", "file_system_manager"]
- , ["src/buildtool/file_system", "object_type"]
- , ["src/buildtool/compatibility", "compatibility"]
, ["src/buildtool/execution_api/common", "common"]
- , ["src/buildtool/execution_api/bazel_msg", "bazel_msg_factory"]
, ["@", "grpc", "", "grpc++"]
, ["@", "gsl-lite", "", "gsl-lite"]
+ , ["src/buildtool/common", "bazel_types"]
+ , ["src/buildtool/execution_api/bazel_msg", "bazel_msg"]
]
, "proto":
[ ["@", "bazel_remote_apis", "", "remote_execution_proto"]
, ["@", "googleapis", "", "google_bytestream_proto"]
]
, "stage": ["src", "buildtool", "execution_api", "remote"]
+ , "private-deps":
+ [ ["src/buildtool/common", "common"]
+ , ["src/buildtool/file_system", "file_system_manager"]
+ , ["src/buildtool/file_system", "object_type"]
+ , ["src/buildtool/compatibility", "compatibility"]
+ , ["src/buildtool/execution_api/bazel_msg", "bazel_msg_factory"]
+ ]
}
, "bazel":
{ "type": ["@", "rules", "CC", "library"]
@@ -44,12 +48,13 @@
, "srcs": ["bazel/bazel_api.cpp"]
, "deps":
[ "config"
- , "bazel_network"
, ["src/buildtool/execution_api/common", "common"]
, ["src/buildtool/execution_api/bazel_msg", "bazel_msg"]
, ["@", "gsl-lite", "", "gsl-lite"]
+ , ["src/buildtool/common", "common"]
]
, "stage": ["src", "buildtool", "execution_api", "remote"]
+ , "private-deps": ["bazel_network"]
}
, "config":
{ "type": ["@", "rules", "CC", "library"]
diff --git a/src/buildtool/execution_engine/dag/TARGETS b/src/buildtool/execution_engine/dag/TARGETS
index 50b0f813..ae60499d 100644
--- a/src/buildtool/execution_engine/dag/TARGETS
+++ b/src/buildtool/execution_engine/dag/TARGETS
@@ -9,9 +9,9 @@
, ["src/buildtool/common", "action_description"]
, ["src/buildtool/common", "artifact_description"]
, ["src/buildtool/file_system", "object_type"]
- , ["src/buildtool/logging", "logging"]
, ["@", "gsl-lite", "", "gsl-lite"]
]
, "stage": ["src", "buildtool", "execution_engine", "dag"]
+ , "private-deps": [["src/buildtool/logging", "logging"]]
}
}
diff --git a/src/buildtool/execution_engine/executor/TARGETS b/src/buildtool/execution_engine/executor/TARGETS
index 87ccdf70..45f8a31c 100644
--- a/src/buildtool/execution_engine/executor/TARGETS
+++ b/src/buildtool/execution_engine/executor/TARGETS
@@ -13,6 +13,7 @@
, ["src/buildtool/progress_reporting", "progress"]
, ["src/utils/cpp", "hex_string"]
, ["@", "gsl-lite", "", "gsl-lite"]
+ , ["src/buildtool/common", "common"]
]
, "stage": ["src", "buildtool", "execution_engine", "executor"]
}
diff --git a/src/buildtool/file_system/TARGETS b/src/buildtool/file_system/TARGETS
index 830a7947..20a1aab9 100644
--- a/src/buildtool/file_system/TARGETS
+++ b/src/buildtool/file_system/TARGETS
@@ -29,15 +29,14 @@
, "name": ["git_cas"]
, "hdrs": ["git_cas.hpp"]
, "srcs": ["git_cas.cpp"]
- , "deps":
- [ "object_type"
- , "file_system_manager"
+ , "deps": ["object_type", ["@", "gsl-lite", "", "gsl-lite"]]
+ , "stage": ["src", "buildtool", "file_system"]
+ , "private-deps":
+ [ "file_system_manager"
, ["src/buildtool/logging", "logging"]
, ["src/utils/cpp", "hex_string"]
- , ["@", "gsl-lite", "", "gsl-lite"]
, ["", "libgit2"]
]
- , "stage": ["src", "buildtool", "file_system"]
}
, "git_tree":
{ "type": ["@", "rules", "CC", "library"]
@@ -47,13 +46,16 @@
, "deps":
[ "git_cas"
, "object_type"
- , "file_system_manager"
- , ["src/buildtool/logging", "logging"]
, ["src/buildtool/multithreading", "atomic_value"]
, ["src/utils/cpp", "hex_string"]
, ["@", "gsl-lite", "", "gsl-lite"]
]
, "stage": ["src", "buildtool", "file_system"]
+ , "private-deps":
+ [ ["", "libgit2"]
+ , "file_system_manager"
+ , ["src/buildtool/logging", "logging"]
+ ]
}
, "file_root":
{ "type": ["@", "rules", "CC", "library"]
@@ -66,6 +68,7 @@
, ["src/buildtool/compatibility", "compatibility"]
, ["@", "gsl-lite", "", "gsl-lite"]
, ["@", "json", "", "json"]
+ , ["src/utils/cpp", "concepts"]
]
, "stage": ["src", "buildtool", "file_system"]
}
diff --git a/src/buildtool/graph_traverser/TARGETS b/src/buildtool/graph_traverser/TARGETS
index 6775ffd0..91c50702 100644
--- a/src/buildtool/graph_traverser/TARGETS
+++ b/src/buildtool/graph_traverser/TARGETS
@@ -16,6 +16,9 @@
, ["src/buildtool/file_system", "jsonfs"]
, ["src/utils/cpp", "json"]
, ["@", "fmt", "", "fmt"]
+ , ["src/buildtool/common", "common"]
+ , ["src/buildtool/execution_api/bazel_msg", "bazel_msg"]
+ , ["src/buildtool/logging", "logging"]
]
, "stage": ["src", "buildtool", "graph_traverser"]
}
diff --git a/src/buildtool/main/TARGETS b/src/buildtool/main/TARGETS
index cd26fbc3..079d3f40 100644
--- a/src/buildtool/main/TARGETS
+++ b/src/buildtool/main/TARGETS
@@ -12,6 +12,7 @@
, ["src/buildtool/progress_reporting", "base_progress_reporter"]
, ["src/buildtool/build_engine/target_map", "result_map"]
, ["src/buildtool/build_engine/target_map", "target_cache"]
+ , ["src/buildtool/build_engine/target_map", "target_map"]
, ["src/buildtool/multithreading", "task_system"]
, ["src/utils/cpp", "concepts"]
, ["src/utils/cpp", "json"]
@@ -35,15 +36,17 @@
, "srcs": ["describe.cpp"]
, "deps":
[ ["src/buildtool/build_engine/base_maps", "entity_name"]
- , ["src/buildtool/build_engine/base_maps", "rule_map"]
+ , ["src/buildtool/build_engine/target_map", "configured_target"]
+ , ["@", "json", "", "json"]
+ ]
+ , "stage": ["src", "buildtool", "main"]
+ , "private-deps":
+ [ ["src/buildtool/build_engine/base_maps", "rule_map"]
, ["src/buildtool/build_engine/base_maps", "targets_file_map"]
, ["src/buildtool/build_engine/target_map", "target_map"]
- , ["src/buildtool/build_engine/target_map", "configured_target"]
, ["src/buildtool/logging", "logging"]
- , ["@", "json", "", "json"]
, "common"
]
- , "stage": ["src", "buildtool", "main"]
}
, "common":
{ "type": ["@", "rules", "CC", "library"]
@@ -59,14 +62,16 @@
, "deps":
[ ["src/buildtool/common", "cli"]
, ["src/buildtool/common", "common"]
- , ["src/buildtool/compatibility", "compatibility"]
- , ["src/buildtool/crypto", "hash_function"]
, ["src/buildtool/execution_api/common", "common"]
- , ["src/buildtool/execution_api/remote", "config"]
- , ["src/buildtool/logging", "logging"]
, ["@", "gsl-lite", "", "gsl-lite"]
]
, "stage": ["src", "buildtool", "main"]
+ , "private-deps":
+ [ ["src/buildtool/compatibility", "compatibility"]
+ , ["src/buildtool/crypto", "hash_function"]
+ , ["src/buildtool/execution_api/remote", "config"]
+ , ["src/buildtool/logging", "logging"]
+ ]
}
, "analyse":
{ "type": ["@", "rules", "CC", "library"]
@@ -75,18 +80,20 @@
, "srcs": ["analyse.cpp"]
, "deps":
[ ["src/buildtool/common", "cli"]
- , ["src/buildtool/multithreading", "async_map_consumer"]
- , ["src/buildtool/multithreading", "task_system"]
, ["src/buildtool/build_engine/target_map", "configured_target"]
+ , ["src/buildtool/build_engine/target_map", "result_map"]
+ , ["src/buildtool/build_engine/analysed_target", "target"]
+ ]
+ , "stage": ["src", "buildtool", "main"]
+ , "private-deps":
+ [ ["src/buildtool/multithreading", "async_map_consumer"]
+ , ["src/buildtool/multithreading", "task_system"]
, ["src/buildtool/build_engine/base_maps", "directory_map"]
, ["src/buildtool/build_engine/base_maps", "rule_map"]
, ["src/buildtool/build_engine/base_maps", "source_map"]
, ["src/buildtool/build_engine/base_maps", "targets_file_map"]
, ["src/buildtool/build_engine/target_map", "target_map"]
- , ["src/buildtool/build_engine/target_map", "result_map"]
- , ["src/buildtool/build_engine/analysed_target", "target"]
]
- , "stage": ["src", "buildtool", "main"]
}
, "version":
{ "type": ["@", "rules", "CC", "library"]
@@ -125,7 +132,7 @@
}
]
}
- , "deps": [["@", "json", "", "json"], ["src/utils/cpp", "json"]]
+ , "private-deps": [["@", "json", "", "json"], ["src/utils/cpp", "json"]]
, "stage": ["src", "buildtool", "main"]
}
}
diff --git a/src/buildtool/multithreading/TARGETS b/src/buildtool/multithreading/TARGETS
index c1545f0f..79b40a2e 100644
--- a/src/buildtool/multithreading/TARGETS
+++ b/src/buildtool/multithreading/TARGETS
@@ -17,8 +17,9 @@
, "name": ["task_system"]
, "hdrs": ["task_system.hpp"]
, "srcs": ["task_system.cpp"]
- , "deps": ["notification_queue", "task", ["@", "gsl-lite", "", "gsl-lite"]]
+ , "deps": ["notification_queue", ["@", "gsl-lite", "", "gsl-lite"]]
, "stage": ["src", "buildtool", "multithreading"]
+ , "private-deps": ["task"]
}
, "async_map_node":
{ "type": ["@", "rules", "CC", "library"]
diff --git a/src/buildtool/progress_reporting/TARGETS b/src/buildtool/progress_reporting/TARGETS
index c58be2d3..803507fd 100644
--- a/src/buildtool/progress_reporting/TARGETS
+++ b/src/buildtool/progress_reporting/TARGETS
@@ -17,9 +17,8 @@
, "stage": ["src", "buildtool", "progress_reporting"]
, "deps":
[ ["src/buildtool/graph_traverser", "graph_traverser"]
- , ["src/buildtool/common", "common"]
, ["@", "gsl-lite", "", "gsl-lite"]
- , "progress"
]
+ , "private-deps": [["src/buildtool/common", "common"], "progress"]
}
}
diff --git a/test/buildtool/file_system/TARGETS b/test/buildtool/file_system/TARGETS
index 37b3c7d8..c4fdfd73 100644
--- a/test/buildtool/file_system/TARGETS
+++ b/test/buildtool/file_system/TARGETS
@@ -20,6 +20,7 @@
, ["test", "catch-main"]
, ["test/utils", "container_matchers"]
, ["src/buildtool/file_system", "git_tree"]
+ , ["src/buildtool/file_system", "file_system_manager"]
]
, "stage": ["test", "buildtool", "file_system"]
}