From 39714825086c40c43345379c95f181a1957d6080 Mon Sep 17 00:00:00 2001 From: Klaus Aehlig Date: Fri, 6 May 2022 14:31:02 +0200 Subject: Move path normalisation to a separate library ... as it will be required outside the target map. --- src/buildtool/build_engine/target_map/utils.cpp | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) (limited to 'src/buildtool/build_engine/target_map/utils.cpp') diff --git a/src/buildtool/build_engine/target_map/utils.cpp b/src/buildtool/build_engine/target_map/utils.cpp index bff5d1b8..2368f03e 100644 --- a/src/buildtool/build_engine/target_map/utils.cpp +++ b/src/buildtool/build_engine/target_map/utils.cpp @@ -4,6 +4,8 @@ #include #include +#include "src/utils/cpp/path.hpp" + auto BuildMaps::Target::Utils::obtainTargetByName( const SubExprEvaluator& eval, const ExpressionPtr& expr, @@ -73,28 +75,19 @@ auto BuildMaps::Target::Utils::keys_expr(const ExpressionPtr& map) return ExpressionPtr{result}; } -auto BuildMaps::Target::Utils::normal(std::filesystem::path const& p) - -> std::filesystem::path { - auto n = p.lexically_normal(); - if (not n.has_filename()) { - return n.parent_path(); - } - return n; -} - auto BuildMaps::Target::Utils::tree_conflict(const ExpressionPtr& map) -> std::optional { std::vector trees{}; for (auto const& [path, artifact] : map->Map()) { if (artifact->Artifact().IsTree()) { - trees.emplace_back(normal(std::filesystem::path{path})); + trees.emplace_back(ToNormalPath(std::filesystem::path{path})); } } if (trees.empty()) { return std::nullopt; } for (auto const& [path, artifact] : map->Map()) { - auto p = normal(std::filesystem::path{path}); + auto p = ToNormalPath(std::filesystem::path{path}); for (auto const& treepath : trees) { if (not artifact->Artifact().IsTree()) { if (std::mismatch(treepath.begin(), treepath.end(), p.begin()) -- cgit v1.2.3