diff options
Diffstat (limited to 'src')
6 files changed, 21 insertions, 5 deletions
diff --git a/src/buildtool/progress_reporting/TARGETS b/src/buildtool/progress_reporting/TARGETS index 11dd87eb..2f64f5a6 100644 --- a/src/buildtool/progress_reporting/TARGETS +++ b/src/buildtool/progress_reporting/TARGETS @@ -32,7 +32,12 @@ , ["src/buildtool/logging", "logging"] ] , "private-deps": - [["@", "fmt", "", "fmt"], ["src/buildtool/logging", "log_level"]] + [ "task_tracker" + , ["@", "fmt", "", "fmt"] + , ["src/buildtool/build_engine/base_maps", "entity_name_data"] + , ["src/buildtool/build_engine/target_map", "configured_target"] + , ["src/buildtool/logging", "log_level"] + ] } , "base_progress_reporter": { "type": ["@", "rules", "CC", "library"] @@ -59,8 +64,8 @@ , ["src/buildtool/logging", "logging"] ] , "private-deps": - [ ["@", "fmt", "", "fmt"] - , ["@", "json", "", "json"] + [ "task_tracker" + , ["@", "fmt", "", "fmt"] , ["src/buildtool/logging", "log_level"] ] } diff --git a/src/buildtool/progress_reporting/base_progress_reporter.cpp b/src/buildtool/progress_reporting/base_progress_reporter.cpp index 4c92ec5d..90847d01 100644 --- a/src/buildtool/progress_reporting/base_progress_reporter.cpp +++ b/src/buildtool/progress_reporting/base_progress_reporter.cpp @@ -17,6 +17,7 @@ #include <chrono> #include <exception> #include <mutex> +#include <type_traits> #include <utility> #include "src/buildtool/logging/log_level.hpp" diff --git a/src/buildtool/progress_reporting/exports_progress_reporter.cpp b/src/buildtool/progress_reporting/exports_progress_reporter.cpp index 7b48eee6..8435c6f8 100644 --- a/src/buildtool/progress_reporting/exports_progress_reporter.cpp +++ b/src/buildtool/progress_reporting/exports_progress_reporter.cpp @@ -14,11 +14,12 @@ #include "src/buildtool/progress_reporting/exports_progress_reporter.hpp" +#include <functional> #include <string> #include "fmt/core.h" -#include "nlohmann/json.hpp" #include "src/buildtool/logging/log_level.hpp" +#include "src/buildtool/progress_reporting/task_tracker.hpp" auto ExportsProgressReporter::Reporter(gsl::not_null<Statistics*> const& stats, gsl::not_null<Progress*> const& progress, diff --git a/src/buildtool/progress_reporting/progress.hpp b/src/buildtool/progress_reporting/progress.hpp index 21bd439b..d3ca54dd 100644 --- a/src/buildtool/progress_reporting/progress.hpp +++ b/src/buildtool/progress_reporting/progress.hpp @@ -16,7 +16,7 @@ #define INCLUDED_SRC_BUILDTOOL_PROGRESS_REPORTING_PROGRESS_HPP #include <cstddef> -#include <cstdlib> +#include <functional> #include <string> #include <unordered_map> #include <utility> diff --git a/src/buildtool/progress_reporting/progress_reporter.cpp b/src/buildtool/progress_reporting/progress_reporter.cpp index 3dd76b1e..742afdcc 100644 --- a/src/buildtool/progress_reporting/progress_reporter.cpp +++ b/src/buildtool/progress_reporting/progress_reporter.cpp @@ -14,10 +14,17 @@ #include "src/buildtool/progress_reporting/progress_reporter.hpp" +#include <functional> #include <string> +#include <unordered_map> +#include <utility> +#include <vector> #include "fmt/core.h" +#include "src/buildtool/build_engine/base_maps/entity_name_data.hpp" +#include "src/buildtool/build_engine/target_map/configured_target.hpp" #include "src/buildtool/logging/log_level.hpp" +#include "src/buildtool/progress_reporting/task_tracker.hpp" auto ProgressReporter::Reporter(gsl::not_null<Statistics*> const& stats, gsl::not_null<Progress*> const& progress, diff --git a/src/buildtool/progress_reporting/task_tracker.hpp b/src/buildtool/progress_reporting/task_tracker.hpp index b02852d3..0145f1e0 100644 --- a/src/buildtool/progress_reporting/task_tracker.hpp +++ b/src/buildtool/progress_reporting/task_tracker.hpp @@ -17,9 +17,11 @@ #include <cstddef> #include <cstdint> +#include <functional> #include <mutex> #include <string> #include <unordered_map> +#include <utility> #include "src/buildtool/logging/log_level.hpp" #include "src/buildtool/logging/logger.hpp" |