diff --git a/src/vcpkg-test/dependinfo-graphs.cpp b/src/vcpkg-test/dependinfo-graphs.cpp index 3356d4af96..056cca468a 100644 --- a/src/vcpkg-test/dependinfo-graphs.cpp +++ b/src/vcpkg-test/dependinfo-graphs.cpp @@ -7,7 +7,7 @@ using namespace vcpkg; namespace { const auto DOT_TEMPLATE = - "digraph G{{ rankdir=LR; edge [minlen=3]; overlap=false;{}empty [label=\"{} singletons...\"]; }}"; + "digraph G{{ rankdir=LR; node [fontname=Sans]; edge [minlen=3]; overlap=false;\n{}\"{} singletons...\";\n}}"; const auto DGML_TEMPLATE = " a;", 0)); + CHECK(create_dot_as_string(single_node_dependencies()) == + fmt::format(DOT_TEMPLATE, "\"a\";\n\"a\" -> \"a\";\n", 0)); } SECTION ("4 nodes") { CHECK(create_dot_as_string(four_nodes_dependencies()) == - fmt::format(DOT_TEMPLATE, "a;a -> b;a -> c;a -> d;b;b -> c;c;c -> d;", 1)); + fmt::format(DOT_TEMPLATE, + "\"a\";\n\"a\" -> \"b\";\n\"a\" -> \"c\";\n\"a\" -> \"d\";\n\"b\";\n\"b\" -> " + "\"c\";\n\"c\";\n\"c\" -> \"d\";\n\"d\";\n", + 1)); } } diff --git a/src/vcpkg/commands.depend-info.cpp b/src/vcpkg/commands.depend-info.cpp index 445ada2a8f..bbf7dcabb3 100644 --- a/src/vcpkg/commands.depend-info.cpp +++ b/src/vcpkg/commands.depend-info.cpp @@ -165,26 +165,24 @@ namespace vcpkg { int empty_node_count = 0; - std::string s = "digraph G{ rankdir=LR; edge [minlen=3]; overlap=false;"; + std::string s = "digraph G{ rankdir=LR; node [fontname=Sans]; edge [minlen=3]; overlap=false;\n"; for (const auto& package : depend_info) { + fmt::format_to(std::back_inserter(s), "\"{}\";\n", package.package); if (package.dependencies.empty()) { empty_node_count++; continue; } - const std::string name = Strings::replace_all(std::string{package.package}, "-", "_"); - fmt::format_to(std::back_inserter(s), "{};", name); for (const auto& d : package.dependencies) { - const std::string dependency_name = Strings::replace_all(std::string{d}, "-", "_"); - fmt::format_to(std::back_inserter(s), "{} -> {};", name, dependency_name); + fmt::format_to(std::back_inserter(s), "\"{}\" -> \"{}\";\n", package.package, d); } } - fmt::format_to(std::back_inserter(s), "empty [label=\"{} singletons...\"]; }}", empty_node_count); + fmt::format_to(std::back_inserter(s), "\"{} singletons...\";\n}}", empty_node_count); return s; }