[vcpkg] Reduce dependencies and contents of vcpkgpaths.h (#12876)

* [vcpkg] Remove globally-constructed pre-defined Triplets from vcpkg.exe

The tool should be as triplet-agnostic as possible, which leaves little room for special, pre-defined names like this. However, tests do have use of them: moved into test assets.

* [vcpkg] Move predefined tools strings vcpkgpaths.h -> tools.h

* [vcpkg] Add forward declarations to vcpkgpaths.h to reduce header deps

* Merge from origin/master

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>

1 files changed, 8 insertions, 8 deletions

diff --git a/toolsrc/src/vcpkg-test/dependencies.cpp b/toolsrc/src/vcpkg-test/dependencies.cpp
index 1951a6128..ef39bd1ef 100644
--- a/toolsrc/src/vcpkg-test/dependencies.cpp
+++ b/toolsrc/src/vcpkg-test/dependencies.cpp
@@ -33,12 +33,12 @@ TEST_CASE ("filter depends", "[dependencies]")
     auto deps_ = parse_dependencies_list("liba (!uwp), libb, libc (uwp)");
     REQUIRE(deps_);
     auto& deps = *deps_.get();
-    auto v = filter_dependencies(deps, Triplet::X64_WINDOWS, x64_win_cmake_vars);
+    auto v = filter_dependencies(deps, Test::X64_WINDOWS, x64_win_cmake_vars);
     REQUIRE(v.size() == 2);
     REQUIRE(v.at(0).package_spec.name() == "liba");
     REQUIRE(v.at(1).package_spec.name() == "libb");
 
-    auto v2 = filter_dependencies(deps, Triplet::ARM_UWP, arm_uwp_cmake_vars);
+    auto v2 = filter_dependencies(deps, Test::ARM_UWP, arm_uwp_cmake_vars);
     REQUIRE(v.size() == 2);
     REQUIRE(v2.at(0).package_spec.name() == "libb");
     REQUIRE(v2.at(1).package_spec.name() == "libc");
@@ -101,7 +101,7 @@ TEST_CASE ("resolve_deps_as_top_level", "[dependencies]")
     var_provider.dep_info_vars[{"a", t_linux}].emplace("VCPKG_CMAKE_SYSTEM_NAME", "Linux");
     {
         auto deps = vcpkg::Dependencies::resolve_deps_as_top_level(
-            *spec_map.map.at("a").source_control_file, Triplet::X86_WINDOWS, {}, var_provider);
+            *spec_map.map.at("a").source_control_file, Test::X86_WINDOWS, {}, var_provider);
         REQUIRE(deps.size() == 1);
         REQUIRE(deps.at(0) == spec_b);
     }
@@ -114,7 +114,7 @@ TEST_CASE ("resolve_deps_as_top_level", "[dependencies]")
     {
         // without defaults
         auto deps = vcpkg::Dependencies::resolve_deps_as_top_level(
-            *spec_map.map.at("c").source_control_file, Triplet::X86_WINDOWS, {}, var_provider);
+            *spec_map.map.at("c").source_control_file, Test::X86_WINDOWS, {}, var_provider);
         REQUIRE(deps.size() == 1);
         REQUIRE(deps.at(0) == spec_b);
     }
@@ -122,21 +122,21 @@ TEST_CASE ("resolve_deps_as_top_level", "[dependencies]")
     {
         // with defaults of c (c1)
         auto deps = vcpkg::Dependencies::resolve_deps_as_top_level(
-            *spec_map.map.at("c").source_control_file, Triplet::X86_WINDOWS, {"default"}, var_provider);
+            *spec_map.map.at("c").source_control_file, Test::X86_WINDOWS, {"default"}, var_provider);
         REQUIRE(deps.size() == 1);
         REQUIRE(deps.at(0) == spec_b_with_b1);
     }
     {
         // with c1
         auto deps = vcpkg::Dependencies::resolve_deps_as_top_level(
-            *spec_map.map.at("c").source_control_file, Triplet::X86_WINDOWS, {"c1"}, var_provider);
+            *spec_map.map.at("c").source_control_file, Test::X86_WINDOWS, {"c1"}, var_provider);
         REQUIRE(deps.size() == 1);
         REQUIRE(deps.at(0) == spec_b_with_b1);
     }
     {
         // with c2 implying c1
         auto deps = vcpkg::Dependencies::resolve_deps_as_top_level(
-            *spec_map.map.at("c").source_control_file, Triplet::X86_WINDOWS, {"c2"}, var_provider);
+            *spec_map.map.at("c").source_control_file, Test::X86_WINDOWS, {"c2"}, var_provider);
         REQUIRE(deps.size() == 2);
         REQUIRE(deps.at(0) == spec_a);
         REQUIRE(deps.at(1) == spec_b_with_b1);
@@ -144,7 +144,7 @@ TEST_CASE ("resolve_deps_as_top_level", "[dependencies]")
     {
         // d -> c[core]
         auto deps = vcpkg::Dependencies::resolve_deps_as_top_level(
-            *spec_map.map.at("d").source_control_file, Triplet::X86_WINDOWS, {}, var_provider);
+            *spec_map.map.at("d").source_control_file, Test::X86_WINDOWS, {}, var_provider);
         REQUIRE(deps.size() == 1);
         REQUIRE(deps.at(0) == spec_c);
     }