[vcpkg] Move find_available_package, find_available_port_file into vcpkg_paths.

`vcpkg_paths` is responsible for binding the concrete filesystem representation to the abstract `package_spec`.

2 files changed, 6 insertions, 4 deletions

diff --git a/toolsrc/include/vcpkg.h b/toolsrc/include/vcpkg.h
index 264d61fa9..a4a0682cf 100644
--- a/toolsrc/include/vcpkg.h
+++ b/toolsrc/include/vcpkg.h
@@ -18,10 +18,6 @@ namespace vcpkg
     std::vector<std::unordered_map<std::string, std::string>> parse_paragraphs(const std::string& str);
     std::string shorten_description(const std::string& desc);
 
-    fs::path find_available_package(const vcpkg_paths& paths, const package_spec& spec);
-    fs::path find_available_port_file(const vcpkg_paths& paths, const package_spec& spec);
-    fs::path control_file_for_package(const fs::path& package_path);
-
     StatusParagraphs database_load_check(const vcpkg_paths& paths);
 
     std::vector<std::string> get_unmet_package_dependencies(const vcpkg_paths& paths, const package_spec& spec, const StatusParagraphs& status_db);
diff --git a/toolsrc/include/vcpkg_paths.h b/toolsrc/include/vcpkg_paths.h
index 58ab45bc5..b0064c60d 100644
--- a/toolsrc/include/vcpkg_paths.h
+++ b/toolsrc/include/vcpkg_paths.h
@@ -1,13 +1,19 @@
 #pragma once
 #include <filesystem>
 #include "expected.h"
+#include "package_spec.h"
 
 namespace vcpkg
 {
+    namespace fs = std::tr2::sys;
+
     struct vcpkg_paths
     {
         static expected<vcpkg_paths> create(const std::tr2::sys::path& vcpkg_root_dir);
 
+        fs::path find_available_package(const package_spec& spec) const;
+        fs::path find_available_port_file(const package_spec& spec) const;
+
         std::tr2::sys::path root;
         std::tr2::sys::path packages;
         std::tr2::sys::path buildtrees;