The-Homebrew-Cloud/cemu-vcpkg
2
0
Fork 0
mirror of https://github.com/cemu-project/vcpkg.git synced 2025-02-24 11:37:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

[PackageSpec] target_triplet -> triplet

Browse Source
This commit is contained in:
Alexander Karatarakis 2017-04-10 13:04:34 -07:00
parent 3e94a8db42
commit 6699737c6d
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
toolsrc/include/PackageSpec.h
View File

@ -9,7 +9,7 @@ namespace vcpkg
{ {
static Expected<PackageSpec> from_string(const std::string& spec_as_string, const Triplet& default_triplet); static Expected<PackageSpec> from_string(const std::string& spec_as_string, const Triplet& default_triplet);
static Expected<PackageSpec> from_name_and_triplet(const std::string& name, const Triplet& target_triplet); static Expected<PackageSpec> from_name_and_triplet(const std::string& name, const Triplet& triplet);
const std::string& name() const; const std::string& name() const;
@ -21,7 +21,7 @@ namespace vcpkg
private: private:
std::string m_name; std::string m_name;
Triplet m_target_triplet; Triplet m_triplet;
}; };
bool operator==(const PackageSpec& left, const PackageSpec& right); bool operator==(const PackageSpec& left, const PackageSpec& right);

12
toolsrc/src/PackageSpec.cpp
View File

@ -23,11 +23,11 @@ namespace vcpkg
} }
const std::string name = spec_as_string.substr(0, pos); const std::string name = spec_as_string.substr(0, pos);
const Triplet target_triplet = Triplet::from_canonical_name(spec_as_string.substr(pos + 1)); const Triplet triplet = Triplet::from_canonical_name(spec_as_string.substr(pos + 1));
return from_name_and_triplet(name, target_triplet); return from_name_and_triplet(name, triplet);
} }
Expected<PackageSpec> PackageSpec::from_name_and_triplet(const std::string& name, const Triplet& target_triplet) Expected<PackageSpec> PackageSpec::from_name_and_triplet(const std::string& name, const Triplet& triplet)
{ {
if (std::find_if_not(name.cbegin(), name.cend(), is_valid_package_spec_char) != name.end()) if (std::find_if_not(name.cbegin(), name.cend(), is_valid_package_spec_char) != name.end())
{ {
@ -36,7 +36,7 @@ namespace vcpkg
PackageSpec p; PackageSpec p;
p.m_name = name; p.m_name = name;
p.m_target_triplet = target_triplet; p.m_triplet = triplet;
return p; return p;
} }
@ -47,12 +47,12 @@ namespace vcpkg
const Triplet& PackageSpec::triplet() const const Triplet& PackageSpec::triplet() const
{ {
return this->m_target_triplet; return this->m_triplet;
} }
std::string PackageSpec::dir() const std::string PackageSpec::dir() const
{ {
return Strings::format("%s_%s", this->m_name, this->m_target_triplet); return Strings::format("%s_%s", this->m_name, this->m_triplet);
} }
std::string PackageSpec::to_string() const std::string PackageSpec::to_string() const