diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2016-11-02 20:26:52 -0700 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2016-11-02 20:26:52 -0700 |
| commit | 4665b16ab3556235ddcbdac160df261ee87694e4 (patch) | |
| tree | 6bbe535285a808ff457ada4cccc28838a7868400 /toolsrc/include | |
| parent | 079a027b1e81becd4ba448362579f625dd7bcca4 (diff) | |
| download | vcpkg-4665b16ab3556235ddcbdac160df261ee87694e4.tar.gz vcpkg-4665b16ab3556235ddcbdac160df261ee87694e4.zip | |
Add checks for fields in CONTROL file. Resolves #228
Diffstat (limited to 'toolsrc/include')
| -rw-r--r-- | toolsrc/include/SourceParagraph.h | 5 | ||||
| -rw-r--r-- | toolsrc/include/vcpkglib_helpers.h | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/toolsrc/include/SourceParagraph.h b/toolsrc/include/SourceParagraph.h index 72dca8324..a8ad13668 100644 --- a/toolsrc/include/SourceParagraph.h +++ b/toolsrc/include/SourceParagraph.h @@ -7,14 +7,17 @@ namespace vcpkg { struct SourceParagraph { + static const std::vector<std::string>& get_list_of_valid_entries(); + SourceParagraph(); - explicit SourceParagraph(const std::unordered_map<std::string, std::string>& fields); + explicit SourceParagraph(std::unordered_map<std::string, std::string> fields); std::string name; std::string version; std::string description; std::string maintainer; std::vector<std::string> depends; + std::unordered_map<std::string, std::string> unparsed_fields; }; } diff --git a/toolsrc/include/vcpkglib_helpers.h b/toolsrc/include/vcpkglib_helpers.h index 72711d63b..05c9e17df 100644 --- a/toolsrc/include/vcpkglib_helpers.h +++ b/toolsrc/include/vcpkglib_helpers.h @@ -5,8 +5,10 @@ namespace vcpkg {namespace details { std::string optional_field(const std::unordered_map<std::string, std::string>& fields, const std::string& fieldname); + std::string remove_optional_field(std::unordered_map<std::string, std::string>* fields, const std::string& fieldname); std::string required_field(const std::unordered_map<std::string, std::string>& fields, const std::string& fieldname); + std::string remove_required_field(std::unordered_map<std::string, std::string>* fields, const std::string& fieldname); std::vector<std::string> parse_depends(const std::string& depends_string); }} |