[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, 5 insertions, 3 deletions

diff --git a/toolsrc/src/vcpkg-test/binarycaching.cpp b/toolsrc/src/vcpkg-test/binarycaching.cpp
index a8204f9c2..55532d14d 100644
--- a/toolsrc/src/vcpkg-test/binarycaching.cpp
+++ b/toolsrc/src/vcpkg-test/binarycaching.cpp
@@ -11,6 +11,8 @@
 
 #include <string>
 
+#include <vcpkg-test/util.h>
+
 using namespace vcpkg;
 
 TEST_CASE ("reformat_version semver-ish", "[reformat_version]")
@@ -65,7 +67,7 @@ Build-Depends: bzip
     REQUIRE(maybe_scf.has_value());
     SourceControlFileLocation scfl{std::move(*maybe_scf.get()), fs::path()};
 
-    Dependencies::InstallPlanAction ipa(PackageSpec{"zlib2", Triplet::X64_WINDOWS},
+    Dependencies::InstallPlanAction ipa(PackageSpec{"zlib2", Test::X64_WINDOWS},
                                         scfl,
                                         Dependencies::RequestType::USER_REQUESTED,
                                         {{"a", {}}, {"b", {}}});
@@ -177,7 +179,7 @@ Description: a spiffy compression library wrapper
     REQUIRE(maybe_scf.has_value());
     SourceControlFileLocation scfl{std::move(*maybe_scf.get()), fs::path()};
     plan.install_actions.push_back(Dependencies::InstallPlanAction());
-    plan.install_actions[0].spec = PackageSpec("zlib", Triplet::X64_ANDROID);
+    plan.install_actions[0].spec = PackageSpec("zlib", Test::X64_ANDROID);
     plan.install_actions[0].source_control_file_location = scfl;
     plan.install_actions[0].abi_info = Build::AbiInfo{};
     plan.install_actions[0].abi_info.get()->package_abi = "packageabi";
@@ -200,7 +202,7 @@ Description: a spiffy compression library wrapper
     REQUIRE(maybe_scf2.has_value());
     SourceControlFileLocation scfl2{std::move(*maybe_scf2.get()), fs::path()};
     plan.install_actions.push_back(Dependencies::InstallPlanAction());
-    plan.install_actions[1].spec = PackageSpec("zlib2", Triplet::X64_ANDROID);
+    plan.install_actions[1].spec = PackageSpec("zlib2", Test::X64_ANDROID);
     plan.install_actions[1].source_control_file_location = scfl2;
     plan.install_actions[1].abi_info = Build::AbiInfo{};
     plan.install_actions[1].abi_info.get()->package_abi = "packageabi2";