targets: Fix deps structure

6 files changed, 45 insertions, 21 deletions

diff --git a/src/buildtool/common/TARGETS b/src/buildtool/common/TARGETS
index c8d9f878..f6b77e6b 100644
--- a/src/buildtool/common/TARGETS
+++ b/src/buildtool/common/TARGETS
@@ -59,14 +59,14 @@
   , "hdrs": ["artifact_factory.hpp"]
   , "deps":
     [ "common"
-    , "artifact_description"
     , "action_description"
     , ["src/buildtool/logging", "logging"]
     , ["src/buildtool/file_system", "object_type"]
     , ["src/utils/cpp", "json"]
     ]
   , "stage": ["src", "buildtool", "common"]
-  , "private-deps": [["src/utils/cpp", "type_safe_arithmetic"]]
+  , "private-deps":
+    [["src/utils/cpp", "type_safe_arithmetic"], "artifact_description"]
   }
 , "artifact_description":
   { "type": ["@", "rules", "CC", "library"]
@@ -105,13 +105,13 @@
   , "deps":
     [ ["src/buildtool/file_system", "file_root"]
     , ["src/buildtool/file_system", "git_cas"]
-    , ["src/buildtool/storage", "storage"]
     , ["src/buildtool/multithreading", "atomic_value"]
     ]
   , "stage": ["src", "buildtool", "common"]
   , "private-deps":
     [ ["src/utils/automata", "dfa_minimizer"]
     , ["src/buildtool/execution_api/local", "local"]
+    , ["src/buildtool/storage", "storage"]
     ]
   }
 }
diff --git a/src/buildtool/execution_api/execution_service/TARGETS b/src/buildtool/execution_api/execution_service/TARGETS
index 42de3e7b..7227c8e4 100644
--- a/src/buildtool/execution_api/execution_service/TARGETS
+++ b/src/buildtool/execution_api/execution_service/TARGETS
@@ -9,6 +9,7 @@
     [ ["src/buildtool/execution_api/local", "local"]
     , ["src/buildtool/logging", "logging"]
     , ["src/buildtool/common", "bazel_types"]
+    , ["src/buildtool/storage", "storage"]
     ]
   , "private-deps":
     [ ["@", "fmt", "", "fmt"]
@@ -27,11 +28,14 @@
   , "proto": [["@", "bazel_remote_apis", "", "remote_execution_proto"]]
   , "stage": ["src", "buildtool", "execution_api", "execution_service"]
   , "deps":
-    [ ["src/buildtool/execution_api/local", "local"]
-    , ["src/buildtool/logging", "logging"]
+    [ ["src/buildtool/logging", "logging"]
     , ["src/buildtool/common", "bazel_types"]
+    , ["src/buildtool/storage", "storage"]
+    ]
+  , "private-deps":
+    [ ["src/buildtool/storage", "storage"]
+    , ["src/buildtool/execution_api/local", "local"]
     ]
-  , "private-deps": [["src/buildtool/storage", "storage"]]
   }
 , "cas_server":
   { "type": ["@", "rules", "CC", "library"]
@@ -41,14 +45,15 @@
   , "proto": [["@", "bazel_remote_apis", "", "remote_execution_proto"]]
   , "stage": ["src", "buildtool", "execution_api", "execution_service"]
   , "deps":
-    [ ["src/buildtool/execution_api/local", "local"]
-    , ["src/buildtool/logging", "logging"]
+    [ ["src/buildtool/logging", "logging"]
     , ["src/buildtool/common", "bazel_types"]
+    , ["src/buildtool/storage", "storage"]
     ]
   , "private-deps":
     [ ["src/buildtool/compatibility", "compatibility"]
     , ["@", "fmt", "", "fmt"]
     , ["src/buildtool/storage", "storage"]
+    , ["src/buildtool/execution_api/local", "local"]
     ]
   }
 , "server_implementation":
@@ -80,8 +85,8 @@
   , "proto": [["@", "googleapis", "", "google_bytestream_proto"]]
   , "stage": ["src", "buildtool", "execution_api", "execution_service"]
   , "deps":
-    [ ["src/buildtool/execution_api/local", "local"]
-    , ["src/buildtool/logging", "logging"]
+    [ ["src/buildtool/logging", "logging"]
+    , ["src/buildtool/storage", "storage"]
     ]
   , "private-deps":
     [ ["src/buildtool/compatibility", "compatibility"]
@@ -89,6 +94,7 @@
     , ["src/utils/cpp", "tmp_dir"]
     , ["@", "fmt", "", "fmt"]
     , ["src/buildtool/storage", "storage"]
+    , ["src/buildtool/execution_api/local", "local"]
     ]
   }
 , "capabilities_server":
@@ -109,17 +115,18 @@
   , "name": ["operation_cache"]
   , "hdrs": ["operation_cache.hpp"]
   , "srcs": ["operation_cache.cpp"]
-  , "deps": [["src/buildtool/logging", "logging"]]
   , "stage": ["src", "buildtool", "execution_api", "execution_service"]
   , "proto": [["@", "googleapis", "", "google_longrunning_operations_proto"]]
+  , "private-deps": [["src/buildtool/logging", "logging"]]
   }
 , "operations_server":
   { "type": ["@", "rules", "CC", "library"]
   , "name": ["operations_server"]
   , "hdrs": ["operations_server.hpp"]
   , "srcs": ["operations_server.cpp"]
-  , "deps": [["src/buildtool/logging", "logging"], "operation_cache"]
+  , "deps": [["src/buildtool/logging", "logging"]]
   , "proto": [["@", "googleapis", "", "google_longrunning_operations_proto"]]
   , "stage": ["src", "buildtool", "execution_api", "execution_service"]
+  , "private-deps": ["operation_cache"]
   }
 }
diff --git a/src/buildtool/execution_api/local/TARGETS b/src/buildtool/execution_api/local/TARGETS
index 28377cc2..82b70189 100644
--- a/src/buildtool/execution_api/local/TARGETS
+++ b/src/buildtool/execution_api/local/TARGETS
@@ -7,14 +7,16 @@
     , ["@", "json", "", "json"]
     , ["@", "gsl-lite", "", "gsl-lite"]
     , ["src/buildtool/common", "common"]
-    , ["src/buildtool/execution_api/remote", "config"]
-    , ["src/buildtool/compatibility", "compatibility"]
     , ["src/buildtool/file_system", "file_system_manager"]
     , ["src/buildtool/file_system", "object_type"]
     , ["src/buildtool/logging", "log_level"]
     , ["src/buildtool/logging", "logging"]
     ]
   , "stage": ["src", "buildtool", "execution_api", "local"]
+  , "private-deps":
+    [ ["src/buildtool/execution_api/remote", "config"]
+    , ["src/buildtool/compatibility", "compatibility"]
+    ]
   }
 , "local":
   { "type": ["@", "rules", "CC", "library"]
@@ -22,8 +24,7 @@
   , "hdrs": ["local_api.hpp", "local_action.hpp", "local_response.hpp"]
   , "srcs": ["local_action.cpp"]
   , "deps":
-    [ "config"
-    , ["@", "fmt", "", "fmt"]
+    [ ["@", "fmt", "", "fmt"]
     , ["@", "gsl-lite", "", "gsl-lite"]
     , ["src/buildtool/storage", "storage"]
     , ["src/buildtool/execution_api/common", "common"]
@@ -32,8 +33,6 @@
     , ["src/buildtool/execution_api/bazel_msg", "blob_tree"]
     , ["src/buildtool/file_system", "file_system_manager"]
     , ["src/buildtool/compatibility", "compatibility"]
-    , ["src/buildtool/common", "common"]
-    , ["src/buildtool/common", "bazel_types"]
     , ["src/buildtool/execution_api/bazel_msg", "bazel_msg"]
     , ["src/buildtool/logging", "logging"]
     ]
@@ -41,6 +40,9 @@
   , "private-deps":
     [ ["src/buildtool/file_system", "object_type"]
     , ["src/buildtool/system", "system_command"]
+    , "config"
+    , ["src/buildtool/common", "common"]
+    , ["src/buildtool/common", "bazel_types"]
     ]
   }
 }
diff --git a/src/buildtool/file_system/TARGETS b/src/buildtool/file_system/TARGETS
index 04ce95e1..866660db 100644
--- a/src/buildtool/file_system/TARGETS
+++ b/src/buildtool/file_system/TARGETS
@@ -21,10 +21,12 @@
   , "hdrs": ["object_cas.hpp"]
   , "deps":
     [ "file_storage"
-    , ["src/buildtool/execution_api/common", "common"]
     , ["src/buildtool/file_system", "file_system_manager"]
+    , ["src/buildtool/common", "common"]
+    , ["src/buildtool/logging", "logging"]
     ]
   , "stage": ["src", "buildtool", "file_system"]
+  , "private-deps": [["src/buildtool/execution_api/common", "common"]]
   }
 , "file_system_manager":
   { "type": ["@", "rules", "CC", "library"]
diff --git a/src/buildtool/main/TARGETS b/src/buildtool/main/TARGETS
index d729f499..a99eb7b9 100644
--- a/src/buildtool/main/TARGETS
+++ b/src/buildtool/main/TARGETS
@@ -21,6 +21,7 @@
       , "server_implementation"
       ]
     , ["src/buildtool/execution_api/execution_service", "operation_cache"]
+    , ["src/buildtool/execution_api/local", "config"]
     , "common"
     , "version"
     , "analyse"
diff --git a/src/buildtool/storage/TARGETS b/src/buildtool/storage/TARGETS
index 59d93660..04e66707 100644
--- a/src/buildtool/storage/TARGETS
+++ b/src/buildtool/storage/TARGETS
@@ -4,12 +4,17 @@
   , "hdrs": ["config.hpp"]
   , "deps":
     [ ["src/buildtool/common", "common"]
-    , ["src/buildtool/file_system", "file_storage"]
     , ["src/buildtool/execution_api/remote", "config"]
     , ["@", "gsl-lite", "", "gsl-lite"]
     , ["@", "json", "", "json"]
+    , ["src/buildtool/compatibility", "compatibility"]
+    , ["src/buildtool/file_system", "object_type"]
+    , ["src/buildtool/file_system", "file_system_manager"]
+    , ["src/buildtool/logging", "logging"]
+    , ["src/buildtool/logging", "log_level"]
     ]
   , "stage": ["src", "buildtool", "storage"]
+  , "private-deps": [["src/buildtool/file_system", "file_storage"]]
   }
 , "storage":
   { "type": ["@", "rules", "CC", "library"]
@@ -34,14 +39,21 @@
     , ["src/buildtool/file_system", "file_storage"]
     , ["src/buildtool/file_system", "object_cas"]
     , ["src/buildtool/execution_api/common", "common"]
-    , ["src/buildtool/execution_api/remote", "config"]
     , ["src/buildtool/build_engine/analysed_target", "target"]
     , ["src/buildtool/build_engine/base_maps", "entity_name_data"]
     , ["src/buildtool/build_engine/expression", "expression"]
     , ["src/utils/cpp", "file_locking"]
     , ["@", "gsl-lite", "", "gsl-lite"]
     , ["@", "json", "", "json"]
+    , ["src/buildtool/file_system", "object_type"]
+    , ["src/buildtool/file_system", "file_system_manager"]
+    , ["src/buildtool/execution_api/bazel_msg", "bazel_msg_factory"]
+    , ["src/buildtool/logging", "logging"]
+    , ["src/buildtool/common", "bazel_types"]
+    , ["src/buildtool/file_system", "git_repo"]
+    , ["src/buildtool/common", "artifact_description"]
     ]
   , "stage": ["src", "buildtool", "storage"]
+  , "private-deps": [["src/buildtool/execution_api/remote", "config"]]
   }
 }