diff options
| author | Paul Cristian Sarbu <paul.cristian.sarbu@huawei.com> | 2024-03-14 16:21:55 +0100 |
|---|---|---|
| committer | Paul Cristian Sarbu <paul.cristian.sarbu@huawei.com> | 2024-03-15 13:12:48 +0100 |
| commit | d0f2ba0ab15e63aa3511218a837eb6f057632ace (patch) | |
| tree | 999aabe895ceee4dc692745b759b6279abb3885c /src/buildtool/execution_api/local | |
| parent | 208e2af5b78167777f64864c209f0af6ad4d1ef7 (diff) | |
| download | justbuild-d0f2ba0ab15e63aa3511218a837eb6f057632ace.tar.gz | |
Clean up more includes and targets
Some of the more specific issues addressed:
- missing log_level target/include
- header-only libs wrongly marking deps as private
- missing/misplaced gsl includes
Diffstat (limited to 'src/buildtool/execution_api/local')
5 files changed, 13 insertions, 5 deletions
diff --git a/src/buildtool/execution_api/local/TARGETS b/src/buildtool/execution_api/local/TARGETS index f4cfde76..6467512f 100644 --- a/src/buildtool/execution_api/local/TARGETS +++ b/src/buildtool/execution_api/local/TARGETS @@ -11,12 +11,10 @@ , ["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/execution_api/remote", "config"] , ["src/buildtool/compatibility", "compatibility"] ] + , "stage": ["src", "buildtool", "execution_api", "local"] } , "local": { "type": ["@", "rules", "CC", "library"] @@ -36,6 +34,7 @@ , ["src/buildtool/file_system", "file_system_manager"] , ["src/buildtool/compatibility", "compatibility"] , ["src/buildtool/execution_api/bazel_msg", "bazel_msg"] + , ["src/buildtool/logging", "log_level"] , ["src/buildtool/logging", "logging"] , ["src/buildtool/execution_api/execution_service", "cas_utils"] ] diff --git a/src/buildtool/execution_api/local/local_action.cpp b/src/buildtool/execution_api/local/local_action.cpp index d9900a61..1fecb9f5 100644 --- a/src/buildtool/execution_api/local/local_action.cpp +++ b/src/buildtool/execution_api/local/local_action.cpp @@ -17,7 +17,6 @@ #include <algorithm> #include <filesystem> -#include "gsl/gsl" #include "src/buildtool/common/bazel_types.hpp" #include "src/buildtool/compatibility/native_support.hpp" #include "src/buildtool/execution_api/local/config.hpp" @@ -25,6 +24,7 @@ #include "src/buildtool/execution_api/utils/outputscheck.hpp" #include "src/buildtool/file_system/file_system_manager.hpp" #include "src/buildtool/file_system/object_type.hpp" +#include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/storage/config.hpp" #include "src/buildtool/system/system_command.hpp" diff --git a/src/buildtool/execution_api/local/local_action.hpp b/src/buildtool/execution_api/local/local_action.hpp index c4d9ecd1..46f414cc 100644 --- a/src/buildtool/execution_api/local/local_action.hpp +++ b/src/buildtool/execution_api/local/local_action.hpp @@ -21,9 +21,11 @@ #include <string> #include <vector> +#include "gsl/gsl" #include "src/buildtool/execution_api/bazel_msg/bazel_msg_factory.hpp" #include "src/buildtool/execution_api/common/execution_action.hpp" #include "src/buildtool/execution_api/common/execution_response.hpp" +#include "src/buildtool/logging/logger.hpp" #include "src/buildtool/storage/storage.hpp" class LocalApi; diff --git a/src/buildtool/execution_api/local/local_api.hpp b/src/buildtool/execution_api/local/local_api.hpp index bdf0e790..e3751175 100644 --- a/src/buildtool/execution_api/local/local_api.hpp +++ b/src/buildtool/execution_api/local/local_api.hpp @@ -38,6 +38,7 @@ #include "src/buildtool/execution_api/git/git_api.hpp" #include "src/buildtool/execution_api/local/local_action.hpp" #include "src/buildtool/file_system/file_system_manager.hpp" +#include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/logging/logger.hpp" #include "src/buildtool/storage/storage.hpp" diff --git a/src/buildtool/execution_api/local/local_response.hpp b/src/buildtool/execution_api/local/local_response.hpp index 8e6cb04f..5c69c491 100644 --- a/src/buildtool/execution_api/local/local_response.hpp +++ b/src/buildtool/execution_api/local/local_response.hpp @@ -15,9 +15,15 @@ #ifndef INCLUDED_SRC_BUILDTOOL_EXECUTION_API_LOCAL_LOCAL_RESPONSE_HPP #define INCLUDED_SRC_BUILDTOOL_EXECUTION_API_LOCAL_LOCAL_RESPONSE_HPP +#include <string> +#include <utility> + +#include "gsl/gsl" #include "src/buildtool/execution_api/common/execution_response.hpp" #include "src/buildtool/execution_api/local/local_action.hpp" #include "src/buildtool/file_system/file_system_manager.hpp" +#include "src/buildtool/logging/log_level.hpp" +#include "src/buildtool/logging/logger.hpp" #include "src/buildtool/storage/storage.hpp" /// \brief Response of a LocalAction. |