From a098ecad0316b627a1fd56bfe39119f92702aa5c Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Mon, 26 Sep 2016 21:12:04 -0700 Subject: vcpkglib_helpers: Return output instead of accepting it as arg --- toolsrc/src/BinaryParagraph.cpp | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) (limited to 'toolsrc/src/BinaryParagraph.cpp') diff --git a/toolsrc/src/BinaryParagraph.cpp b/toolsrc/src/BinaryParagraph.cpp index 274bd879e..da20c725c 100644 --- a/toolsrc/src/BinaryParagraph.cpp +++ b/toolsrc/src/BinaryParagraph.cpp @@ -8,25 +8,24 @@ namespace vcpkg { BinaryParagraph::BinaryParagraph() = default; - BinaryParagraph::BinaryParagraph(const std::unordered_map& fields) + BinaryParagraph::BinaryParagraph(const std::unordered_map& fields) : + name(required_field(fields, "Package")), + version(required_field(fields, "Version")), + description(optional_field(fields, "Description")), + maintainer(optional_field(fields, "Maintainer")) { - details::required_field(fields, name, "Package"); - required_field(fields, version, "Version"); - required_field(fields, target_triplet.value, "Architecture"); + target_triplet.value = required_field(fields, "Architecture"); { - std::string multi_arch; - required_field(fields, multi_arch, "Multi-Arch"); + std::string multi_arch = required_field(fields, "Multi-Arch"); Checks::check_throw(multi_arch == "same", "Multi-Arch must be 'same' but was %s", multi_arch); } - optional_field(fields, description, "Description"); - std::string deps; - optional_field(fields, deps, "Depends"); + + std::string deps = optional_field(fields, "Depends"); if (!deps.empty()) { - depends.clear(); - parse_depends(deps, depends); + this->depends.clear(); + this->depends = parse_depends(deps); } - optional_field(fields, maintainer, "Maintainer"); } BinaryParagraph::BinaryParagraph(const SourceParagraph& spgh, const triplet& target_triplet) -- cgit v1.2.3 From 330b411cd2f4aa25632b2ae5ea2fef396fb13d12 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Mon, 3 Oct 2016 17:20:52 -0700 Subject: [triplet] Force using the factory that does sanity checks --- toolsrc/src/BinaryParagraph.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'toolsrc/src/BinaryParagraph.cpp') diff --git a/toolsrc/src/BinaryParagraph.cpp b/toolsrc/src/BinaryParagraph.cpp index da20c725c..6d32ff137 100644 --- a/toolsrc/src/BinaryParagraph.cpp +++ b/toolsrc/src/BinaryParagraph.cpp @@ -12,9 +12,9 @@ namespace vcpkg name(required_field(fields, "Package")), version(required_field(fields, "Version")), description(optional_field(fields, "Description")), - maintainer(optional_field(fields, "Maintainer")) + maintainer(optional_field(fields, "Maintainer")), + target_triplet(triplet::from_canonical_name(required_field(fields, "Architecture"))) { - target_triplet.value = required_field(fields, "Architecture"); { std::string multi_arch = required_field(fields, "Multi-Arch"); Checks::check_throw(multi_arch == "same", "Multi-Arch must be 'same' but was %s", multi_arch); -- cgit v1.2.3 From 429e2eca4ab74127b144743b136f0407c0ae4492 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Tue, 4 Oct 2016 15:16:07 -0700 Subject: BinaryParagraph now contains a package_spec instead of name+triplet --- toolsrc/src/BinaryParagraph.cpp | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'toolsrc/src/BinaryParagraph.cpp') diff --git a/toolsrc/src/BinaryParagraph.cpp b/toolsrc/src/BinaryParagraph.cpp index 6d32ff137..48d04f686 100644 --- a/toolsrc/src/BinaryParagraph.cpp +++ b/toolsrc/src/BinaryParagraph.cpp @@ -9,12 +9,14 @@ namespace vcpkg BinaryParagraph::BinaryParagraph() = default; BinaryParagraph::BinaryParagraph(const std::unordered_map& fields) : - name(required_field(fields, "Package")), version(required_field(fields, "Version")), description(optional_field(fields, "Description")), - maintainer(optional_field(fields, "Maintainer")), - target_triplet(triplet::from_canonical_name(required_field(fields, "Architecture"))) + maintainer(optional_field(fields, "Maintainer")) { + const std::string name = required_field(fields, "Package"); + const triplet target_triplet = triplet::from_canonical_name(required_field(fields, "Architecture")); + this->spec = package_spec::from_name_and_triplet(name, target_triplet).get_or_throw(); + { std::string multi_arch = required_field(fields, "Multi-Arch"); Checks::check_throw(multi_arch == "same", "Multi-Arch must be 'same' but was %s", multi_arch); @@ -30,32 +32,31 @@ namespace vcpkg BinaryParagraph::BinaryParagraph(const SourceParagraph& spgh, const triplet& target_triplet) { - this->name = spgh.name; + this->spec = package_spec::from_name_and_triplet(spgh.name, target_triplet).get_or_throw(); this->version = spgh.version; this->description = spgh.description; this->maintainer = spgh.maintainer; this->depends = spgh.depends; - this->target_triplet = target_triplet; } std::string BinaryParagraph::displayname() const { - return Strings::format("%s:%s", this->name, this->target_triplet); + return Strings::format("%s:%s", this->spec.name(), this->spec.target_triplet()); } std::string BinaryParagraph::dir() const { - return Strings::format("%s_%s", this->name, this->target_triplet); + return this->spec.dir(); } std::string BinaryParagraph::fullstem() const { - return Strings::format("%s_%s_%s", this->name, this->version, this->target_triplet); + return Strings::format("%s_%s_%s", this->spec.name(), this->version, this->spec.target_triplet()); } std::ostream& operator<<(std::ostream& os, const BinaryParagraph& p) { - os << "Package: " << p.name << "\n"; + os << "Package: " << p.spec.name() << "\n"; os << "Version: " << p.version << "\n"; if (!p.depends.empty()) { @@ -70,7 +71,7 @@ namespace vcpkg os << "\n"; } - os << "Architecture: " << p.target_triplet << "\n"; + os << "Architecture: " << p.spec.target_triplet() << "\n"; os << "Multi-Arch: same\n"; if (!p.maintainer.empty()) os << "Maintainer: " << p.maintainer << "\n"; -- cgit v1.2.3