From f56645c3fd9a1561c430e90ce00836489b372ef8 Mon Sep 17 00:00:00 2001
From: Victor Romero <romerosanchezv@gmail.com>
Date: Fri, 17 Jan 2020 14:21:19 -0800
Subject: =?UTF-8?q?Community=20Triplets=20=F0=9F=A4=9D=20(#7976)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Move untested triplets to Community Triplets

* Document community triplets

* Load community triplets by default and alert when using one

* [triplets] Merge documentation of community triplets

* Bump version
---
 toolsrc/include/vcpkg/vcpkgpaths.h | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'toolsrc/include')

diff --git a/toolsrc/include/vcpkg/vcpkgpaths.h b/toolsrc/include/vcpkg/vcpkgpaths.h
index 8107b8201..52d77d283 100644
--- a/toolsrc/include/vcpkg/vcpkgpaths.h
+++ b/toolsrc/include/vcpkg/vcpkgpaths.h
@@ -47,6 +47,14 @@ namespace vcpkg
 
     struct VcpkgPaths
     {
+        struct TripletFile
+        {
+            std::string name;
+            fs::path location;
+
+            TripletFile(const std::string& name, const fs::path& location) : name(name), location(location){}
+        };
+
         static Expected<VcpkgPaths> create(const fs::path& vcpkg_root_dir,
                                            const Optional<fs::path>& vcpkg_scripts_root_dir,
                                            const std::string& default_vs_path,
@@ -57,7 +65,8 @@ namespace vcpkg
         fs::path listfile_path(const BinaryParagraph& pgh) const;
 
         bool is_valid_triplet(const Triplet& t) const;
-        const std::vector<std::string>& get_available_triplets() const;
+        const std::vector<std::string> get_available_triplets_names() const;
+        const std::vector<TripletFile>& get_available_triplets() const;
         const fs::path get_triplet_file_path(const Triplet& triplet) const;
 
         fs::path root;
@@ -67,6 +76,7 @@ namespace vcpkg
         fs::path ports;
         fs::path installed;
         fs::path triplets;
+        fs::path community_triplets;
         fs::path scripts;
 
         fs::path tools;
@@ -92,7 +102,7 @@ namespace vcpkg
         Files::Filesystem& get_filesystem() const;
 
     private:
-        Lazy<std::vector<std::string>> available_triplets;
+        Lazy<std::vector<TripletFile>> available_triplets;
         Lazy<std::vector<Toolset>> toolsets;
         Lazy<std::vector<Toolset>> toolsets_vs2013;
 
-- 
cgit v1.2.3