From 18fa18a07b97aa69826562738e498fbd2317e091 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Fri, 7 Apr 2017 16:17:54 -0700 Subject: Remove PackageSpec.display_name() --- toolsrc/src/BinaryParagraph.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'toolsrc/src/BinaryParagraph.cpp') diff --git a/toolsrc/src/BinaryParagraph.cpp b/toolsrc/src/BinaryParagraph.cpp index 42ef0a77a..35351f153 100644 --- a/toolsrc/src/BinaryParagraph.cpp +++ b/toolsrc/src/BinaryParagraph.cpp @@ -55,7 +55,7 @@ namespace vcpkg std::string BinaryParagraph::displayname() const { - return this->spec.display_name(); + return this->spec.to_string(); } std::string BinaryParagraph::dir() const -- cgit v1.2.3 From 2069028b06181dab3c51b2dceb170594153c1204 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Fri, 7 Apr 2017 17:45:17 -0700 Subject: Remove triplet operator<< overload --- toolsrc/src/BinaryParagraph.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'toolsrc/src/BinaryParagraph.cpp') diff --git a/toolsrc/src/BinaryParagraph.cpp b/toolsrc/src/BinaryParagraph.cpp index 35351f153..89f57e51b 100644 --- a/toolsrc/src/BinaryParagraph.cpp +++ b/toolsrc/src/BinaryParagraph.cpp @@ -85,7 +85,7 @@ namespace vcpkg os << "\n"; } - os << "Architecture: " << p.spec.target_triplet() << "\n"; + os << "Architecture: " << p.spec.target_triplet().to_string() << "\n"; os << "Multi-Arch: same\n"; if (!p.maintainer.empty()) os << "Maintainer: " << p.maintainer << "\n"; -- cgit v1.2.3 From 3e94a8db42804a6ac0cc71e5b74483ebd5958f83 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Mon, 10 Apr 2017 13:03:34 -0700 Subject: PackageSpec.target_triplet() -> ".triplet() --- 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 89f57e51b..8e8d6a95b 100644 --- a/toolsrc/src/BinaryParagraph.cpp +++ b/toolsrc/src/BinaryParagraph.cpp @@ -65,7 +65,7 @@ namespace vcpkg std::string BinaryParagraph::fullstem() const { - return Strings::format("%s_%s_%s", this->spec.name(), this->version, this->spec.target_triplet()); + return Strings::format("%s_%s_%s", this->spec.name(), this->version, this->spec.triplet()); } std::ostream& operator<<(std::ostream& os, const BinaryParagraph& p) @@ -85,7 +85,7 @@ namespace vcpkg os << "\n"; } - os << "Architecture: " << p.spec.target_triplet().to_string() << "\n"; + os << "Architecture: " << p.spec.triplet().to_string() << "\n"; os << "Multi-Arch: same\n"; if (!p.maintainer.empty()) os << "Maintainer: " << p.maintainer << "\n"; -- cgit v1.2.3 From 0f54ec446d63923a99524fd98657010816e06cb5 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Mon, 10 Apr 2017 13:06:44 -0700 Subject: [BinaryParagraph] target_triplet -> triplet --- toolsrc/src/BinaryParagraph.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'toolsrc/src/BinaryParagraph.cpp') diff --git a/toolsrc/src/BinaryParagraph.cpp b/toolsrc/src/BinaryParagraph.cpp index 8e8d6a95b..499ef54f7 100644 --- a/toolsrc/src/BinaryParagraph.cpp +++ b/toolsrc/src/BinaryParagraph.cpp @@ -29,9 +29,9 @@ namespace vcpkg { const std::string name = details::remove_required_field(&fields, BinaryParagraphRequiredField::PACKAGE); const std::string architecture = details::remove_required_field(&fields, BinaryParagraphRequiredField::ARCHITECTURE); - const Triplet target_triplet = Triplet::from_canonical_name(architecture); + const Triplet triplet = Triplet::from_canonical_name(architecture); - this->spec = PackageSpec::from_name_and_triplet(name, target_triplet).value_or_exit(VCPKG_LINE_INFO); + this->spec = PackageSpec::from_name_and_triplet(name, triplet).value_or_exit(VCPKG_LINE_INFO); this->version = details::remove_required_field(&fields, BinaryParagraphRequiredField::VERSION); this->description = details::remove_optional_field(&fields, BinaryParagraphOptionalField::DESCRIPTION); @@ -44,13 +44,13 @@ namespace vcpkg this->depends = parse_depends(deps); } - BinaryParagraph::BinaryParagraph(const SourceParagraph& spgh, const Triplet& target_triplet) + BinaryParagraph::BinaryParagraph(const SourceParagraph& spgh, const Triplet& triplet) { - this->spec = PackageSpec::from_name_and_triplet(spgh.name, target_triplet).value_or_exit(VCPKG_LINE_INFO); + this->spec = PackageSpec::from_name_and_triplet(spgh.name, triplet).value_or_exit(VCPKG_LINE_INFO); this->version = spgh.version; this->description = spgh.description; this->maintainer = spgh.maintainer; - this->depends = filter_dependencies(spgh.depends, target_triplet); + this->depends = filter_dependencies(spgh.depends, triplet); } std::string BinaryParagraph::displayname() const -- cgit v1.2.3