Merge pull request #1 from Microsoft/master

pull changes from upstream

1 files changed, 51 insertions, 3 deletions

diff --git a/toolsrc/include/SourceParagraph.h b/toolsrc/include/SourceParagraph.h
index 19f558170..a53158f3f 100644
--- a/toolsrc/include/SourceParagraph.h
+++ b/toolsrc/include/SourceParagraph.h
@@ -1,5 +1,9 @@
 #pragma once
 
+#include "vcpkg_System.h"
+#include "vcpkg_expected.h"
+
+#include <string>
 #include <unordered_map>
 #include <vector>
 
@@ -15,24 +19,68 @@ namespace vcpkg
 
     const std::string& to_string(const Dependency& dep);
 
+    struct ParseControlErrorInfo
+    {
+        std::string name;
+        std::string remaining_fields_as_string;
+        std::string valid_fields_as_string;
+        std::error_code error;
+    };
+
     /// <summary>
     /// Port metadata (CONTROL file)
     /// </summary>
     struct SourceParagraph
     {
-        SourceParagraph();
+        static ExpectedT<SourceParagraph, ParseControlErrorInfo> parse_control_file(
+            std::unordered_map<std::string, std::string> fields);
 
-        explicit SourceParagraph(std::unordered_map<std::string, std::string> fields);
+        SourceParagraph() = default;
 
         std::string name;
         std::string version;
         std::string description;
         std::string maintainer;
+        std::vector<std::string> supports;
         std::vector<Dependency> depends;
     };
 
+    void print_error_message(const ParseControlErrorInfo& info);
+    void print_error_message(std::vector<ParseControlErrorInfo> error_info_list);
+
     std::vector<std::string> filter_dependencies(const std::vector<Dependency>& deps, const Triplet& t);
 
     std::vector<Dependency> expand_qualified_dependencies(const std::vector<std::string>& depends);
-    std::vector<std::string> parse_depends(const std::string& depends_string);
+    std::vector<std::string> parse_comma_list(const std::string& str);
+
+    struct Supports
+    {
+        static ExpectedT<Supports, std::vector<std::string>> parse(const std::vector<std::string>& strs);
+
+        using Architecture = System::CPUArchitecture;
+
+        enum class Platform
+        {
+            WINDOWS,
+            UWP,
+        };
+        enum class Linkage
+        {
+            DYNAMIC,
+            STATIC,
+        };
+        enum class ToolsetVersion
+        {
+            V140,
+            V141,
+        };
+
+        bool supports(Architecture arch, Platform plat, Linkage crt, ToolsetVersion tools);
+
+    private:
+        std::vector<Architecture> architectures;
+        std::vector<Platform> platforms;
+        std::vector<Linkage> crt_linkages;
+        std::vector<ToolsetVersion> toolsets;
+    };
 }