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/main/main.cpp | |
| 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/main/main.cpp')
| -rw-r--r-- | src/buildtool/main/main.cpp | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/src/buildtool/main/main.cpp b/src/buildtool/main/main.cpp index 65f5278d..c8a74a5b 100644 --- a/src/buildtool/main/main.cpp +++ b/src/buildtool/main/main.cpp @@ -17,32 +17,50 @@ #include <filesystem> #include <fstream> #include <iostream> +#include <optional> #include <string> #include <unordered_map> #include <unordered_set> +#include <utility> +#include "gsl/gsl" +#include "nlohmann/json.hpp" #include "src/buildtool/build_engine/base_maps/entity_name.hpp" #include "src/buildtool/build_engine/expression/evaluator.hpp" #include "src/buildtool/build_engine/expression/expression.hpp" #include "src/buildtool/build_engine/target_map/target_map.hpp" #include "src/buildtool/common/artifact_description.hpp" #include "src/buildtool/common/repository_config.hpp" +#include "src/buildtool/common/statistics.hpp" #include "src/buildtool/compatibility/compatibility.hpp" #include "src/buildtool/execution_api/execution_service/file_chunker.hpp" #include "src/buildtool/execution_api/local/config.hpp" #include "src/buildtool/file_system/file_root.hpp" +#include "src/buildtool/logging/log_config.hpp" +#include "src/buildtool/logging/log_level.hpp" +#include "src/buildtool/logging/log_sink_cmdline.hpp" +#include "src/buildtool/logging/log_sink_file.hpp" +#include "src/buildtool/logging/logger.hpp" #include "src/buildtool/main/analyse.hpp" +#include "src/buildtool/main/build_utils.hpp" #include "src/buildtool/main/cli.hpp" #include "src/buildtool/main/constants.hpp" #include "src/buildtool/main/describe.hpp" #include "src/buildtool/main/diagnose.hpp" #include "src/buildtool/main/exit_codes.hpp" #include "src/buildtool/main/install_cas.hpp" +#include "src/buildtool/main/version.hpp" +#include "src/buildtool/multithreading/async_map_consumer.hpp" +#include "src/buildtool/multithreading/task_system.hpp" +#include "src/buildtool/progress_reporting/progress.hpp" #include "src/buildtool/storage/config.hpp" #include "src/buildtool/storage/garbage_collector.hpp" #include "src/buildtool/storage/storage.hpp" #include "src/buildtool/storage/target_cache.hpp" +#include "src/utils/cpp/concepts.hpp" +#include "src/utils/cpp/json.hpp" #ifndef BOOTSTRAP_BUILD_TOOL +#include "fmt/core.h" #include "src/buildtool/auth/authentication.hpp" #include "src/buildtool/common/remote/retry_parameters.hpp" #include "src/buildtool/execution_api/execution_service/operation_cache.hpp" @@ -55,17 +73,6 @@ #include "src/buildtool/serve_api/serve_service/serve_server_implementation.hpp" #include "src/buildtool/storage/garbage_collector.hpp" #endif // BOOTSTRAP_BUILD_TOOL -#include "src/buildtool/common/statistics.hpp" -#include "src/buildtool/logging/log_config.hpp" -#include "src/buildtool/logging/log_sink_cmdline.hpp" -#include "src/buildtool/logging/log_sink_file.hpp" -#include "src/buildtool/main/build_utils.hpp" -#include "src/buildtool/main/version.hpp" -#include "src/buildtool/multithreading/async_map_consumer.hpp" -#include "src/buildtool/multithreading/task_system.hpp" -#include "src/buildtool/progress_reporting/progress.hpp" -#include "src/utils/cpp/concepts.hpp" -#include "src/utils/cpp/json.hpp" namespace { |