From e56d87c689ba4d8ac22b0b5840486790891e838c Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Fri, 7 Apr 2017 16:01:09 -0700 Subject: Remove to_printf_args(PackageSpec) --- toolsrc/include/PackageSpec.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'toolsrc/include') diff --git a/toolsrc/include/PackageSpec.h b/toolsrc/include/PackageSpec.h index 57fbefc0a..79068e638 100644 --- a/toolsrc/include/PackageSpec.h +++ b/toolsrc/include/PackageSpec.h @@ -26,8 +26,6 @@ namespace vcpkg Triplet m_target_triplet; }; - std::string to_printf_arg(const PackageSpec& spec); - bool operator==(const PackageSpec& left, const PackageSpec& right); std::ostream& operator<<(std::ostream& os, const PackageSpec& spec); -- cgit v1.2.3 From 285bbe0d8a1a14afc217b06790e1c99e1200a14b Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Fri, 7 Apr 2017 16:13:08 -0700 Subject: Add to_printf_arg() for classes with to_string() --- toolsrc/include/vcpkg_Strings.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'toolsrc/include') diff --git a/toolsrc/include/vcpkg_Strings.h b/toolsrc/include/vcpkg_Strings.h index 03b16975e..7b031608c 100644 --- a/toolsrc/include/vcpkg_Strings.h +++ b/toolsrc/include/vcpkg_Strings.h @@ -5,6 +5,12 @@ namespace vcpkg::Strings::details { + template + auto to_printf_arg(const T& t) -> decltype(t.to_string()) + { + return t.to_string(); + } + inline const char* to_printf_arg(const std::string& s) { return s.c_str(); -- cgit v1.2.3 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/include/PackageSpec.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'toolsrc/include') diff --git a/toolsrc/include/PackageSpec.h b/toolsrc/include/PackageSpec.h index 79068e638..b7b3b8e34 100644 --- a/toolsrc/include/PackageSpec.h +++ b/toolsrc/include/PackageSpec.h @@ -15,8 +15,6 @@ namespace vcpkg const Triplet& target_triplet() const; - std::string display_name() const; - std::string dir() const; std::string to_string() const; -- cgit v1.2.3 From 41c9026875b3d05ee46ca83287aa6fca5b347165 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Fri, 7 Apr 2017 16:20:24 -0700 Subject: Remove PackageSpec& operator<< overload --- toolsrc/include/PackageSpec.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'toolsrc/include') diff --git a/toolsrc/include/PackageSpec.h b/toolsrc/include/PackageSpec.h index b7b3b8e34..7c39eeaa4 100644 --- a/toolsrc/include/PackageSpec.h +++ b/toolsrc/include/PackageSpec.h @@ -25,8 +25,6 @@ namespace vcpkg }; bool operator==(const PackageSpec& left, const PackageSpec& right); - - std::ostream& operator<<(std::ostream& os, const PackageSpec& spec); } //namespace vcpkg namespace std -- cgit v1.2.3 From 13482879f82b15294ebdeb04b3084584a3b468a1 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Fri, 7 Apr 2017 17:44:24 -0700 Subject: Triplet.to_string() --- toolsrc/include/triplet.h | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'toolsrc/include') diff --git a/toolsrc/include/triplet.h b/toolsrc/include/triplet.h index 8cf2413b0..d0570e789 100644 --- a/toolsrc/include/triplet.h +++ b/toolsrc/include/triplet.h @@ -15,10 +15,9 @@ namespace vcpkg static const Triplet ARM_UWP; const std::string& canonical_name() const; - std::string architecture() const; - std::string system() const; + const std::string& to_string() const; private: std::string m_canonical_name; @@ -28,10 +27,6 @@ namespace vcpkg bool operator!=(const Triplet& left, const Triplet& right); - std::string to_string(const Triplet& spec); - - std::string to_printf_arg(const Triplet& spec); - std::ostream& operator<<(std::ostream& os, const Triplet& spec); } -- 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/include/triplet.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'toolsrc/include') diff --git a/toolsrc/include/triplet.h b/toolsrc/include/triplet.h index d0570e789..ea6808e05 100644 --- a/toolsrc/include/triplet.h +++ b/toolsrc/include/triplet.h @@ -26,8 +26,6 @@ namespace vcpkg bool operator==(const Triplet& left, const Triplet& right); bool operator!=(const Triplet& left, const Triplet& right); - - std::ostream& operator<<(std::ostream& os, const Triplet& spec); } namespace std -- cgit v1.2.3 From 599c22f2affc863ab4acebbc465c563c6fe11d8b Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Fri, 7 Apr 2017 17:56:26 -0700 Subject: VersionT: replace to_printf_arg() with .to_string() --- toolsrc/include/VersionT.cpp | 1 + toolsrc/include/VersionT.h | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'toolsrc/include') diff --git a/toolsrc/include/VersionT.cpp b/toolsrc/include/VersionT.cpp index c51052b98..6ea5d3810 100644 --- a/toolsrc/include/VersionT.cpp +++ b/toolsrc/include/VersionT.cpp @@ -6,6 +6,7 @@ namespace vcpkg { VersionT::VersionT() : value("0.0.0") {} VersionT::VersionT(const std::string& value) : value(value) {} + std::string VersionT::to_string() const { return value; } bool operator==(const VersionT& left, const VersionT& right) { return left.value == right.value; } bool operator!=(const VersionT& left, const VersionT& right) { return left.value != right.value; } std::string to_printf_arg(const VersionT& version) { return version.value; } diff --git a/toolsrc/include/VersionT.h b/toolsrc/include/VersionT.h index aa2635855..36d050e08 100644 --- a/toolsrc/include/VersionT.h +++ b/toolsrc/include/VersionT.h @@ -8,12 +8,13 @@ namespace vcpkg VersionT(); VersionT(const std::string& value); + std::string to_string() const; + std::string value; }; bool operator ==(const VersionT& left, const VersionT& right); bool operator !=(const VersionT& left, const VersionT& right); - std::string to_printf_arg(const VersionT& version); struct VersionDiff { -- cgit v1.2.3 From 410aa5b43a5fa995d8684590b119bbb04353a139 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Mon, 10 Apr 2017 13:00:33 -0700 Subject: default_target_triplet -> default_triplet --- toolsrc/include/PackageSpec.h | 2 +- toolsrc/include/vcpkg_Commands.h | 12 ++++++------ toolsrc/include/vcpkg_Input.h | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'toolsrc/include') diff --git a/toolsrc/include/PackageSpec.h b/toolsrc/include/PackageSpec.h index 7c39eeaa4..110f74b51 100644 --- a/toolsrc/include/PackageSpec.h +++ b/toolsrc/include/PackageSpec.h @@ -7,7 +7,7 @@ namespace vcpkg { struct PackageSpec { - static Expected from_string(const std::string& spec_as_string, const Triplet& default_target_triplet); + static Expected from_string(const std::string& spec_as_string, const Triplet& default_triplet); static Expected from_name_and_triplet(const std::string& name, const Triplet& target_triplet); diff --git a/toolsrc/include/vcpkg_Commands.h b/toolsrc/include/vcpkg_Commands.h index db15a10fd..cc6437bf9 100644 --- a/toolsrc/include/vcpkg_Commands.h +++ b/toolsrc/include/vcpkg_Commands.h @@ -8,7 +8,7 @@ namespace vcpkg::Commands { - using CommandTypeA = void(*)(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_target_triplet); + using CommandTypeA = void(*)(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_triplet); using CommandTypeB = void(*)(const VcpkgCmdArguments& args, const VcpkgPaths& paths); using CommandTypeC = void(*)(const VcpkgCmdArguments& args); @@ -33,28 +33,28 @@ namespace vcpkg::Commands BuildResult build_package(const SourceParagraph& source_paragraph, const PackageSpec& spec, const VcpkgPaths& paths, const fs::path& port_dir, const StatusParagraphs& status_db); void perform_and_exit(const PackageSpec& spec, const fs::path& port_dir, const std::unordered_set& options, const VcpkgPaths& paths); - void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_target_triplet); + void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_triplet); } namespace BuildExternal { - void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_target_triplet); + void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_triplet); } namespace Install { void install_package(const VcpkgPaths& paths, const BinaryParagraph& binary_paragraph, StatusParagraphs* status_db); - void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_target_triplet); + void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_triplet); } namespace CI { - void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_target_triplet); + void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_triplet); } namespace Remove { - void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_target_triplet); + void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_triplet); } namespace Update diff --git a/toolsrc/include/vcpkg_Input.h b/toolsrc/include/vcpkg_Input.h index fd549f278..97fb09e3d 100644 --- a/toolsrc/include/vcpkg_Input.h +++ b/toolsrc/include/vcpkg_Input.h @@ -7,7 +7,7 @@ namespace vcpkg::Input { PackageSpec check_and_get_package_spec( const std::string& package_spec_as_string, - const Triplet& default_target_triplet, + const Triplet& default_triplet, CStringView example_text); void check_triplet(const Triplet& t, const VcpkgPaths& paths); -- cgit v1.2.3 From 84e1a9d3e5b16f6e7e249dabc1bdf3bb27ab0da9 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Mon, 10 Apr 2017 13:01:43 -0700 Subject: VcpkgCmdArguments.target_triplet -> ".triplet --- toolsrc/include/VcpkgCmdArguments.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'toolsrc/include') diff --git a/toolsrc/include/VcpkgCmdArguments.h b/toolsrc/include/VcpkgCmdArguments.h index 4a0809fff..3a915205e 100644 --- a/toolsrc/include/VcpkgCmdArguments.h +++ b/toolsrc/include/VcpkgCmdArguments.h @@ -13,7 +13,7 @@ namespace vcpkg static VcpkgCmdArguments create_from_arg_sequence(const std::string* arg_begin, const std::string* arg_end); std::unique_ptr vcpkg_root_dir; - std::unique_ptr target_triplet; + std::unique_ptr triplet; OptBoolT debug = OptBoolT::UNSPECIFIED; OptBoolT sendmetrics = OptBoolT::UNSPECIFIED; OptBoolT printmetrics = OptBoolT::UNSPECIFIED; -- 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/include/PackageSpec.h | 4 ++-- toolsrc/include/StatusParagraphs.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'toolsrc/include') diff --git a/toolsrc/include/PackageSpec.h b/toolsrc/include/PackageSpec.h index 110f74b51..fa6b2c5f5 100644 --- a/toolsrc/include/PackageSpec.h +++ b/toolsrc/include/PackageSpec.h @@ -13,7 +13,7 @@ namespace vcpkg const std::string& name() const; - const Triplet& target_triplet() const; + const Triplet& triplet() const; std::string dir() const; @@ -36,7 +36,7 @@ namespace std { size_t hash = 17; hash = hash * 31 + std::hash()(value.name()); - hash = hash * 31 + std::hash()(value.target_triplet()); + hash = hash * 31 + std::hash()(value.triplet()); return hash; } }; diff --git a/toolsrc/include/StatusParagraphs.h b/toolsrc/include/StatusParagraphs.h index 82d2a0d1f..9c7f443d0 100644 --- a/toolsrc/include/StatusParagraphs.h +++ b/toolsrc/include/StatusParagraphs.h @@ -16,14 +16,14 @@ namespace vcpkg const_iterator find(const PackageSpec& spec) const { - return find(spec.name(), spec.target_triplet()); + return find(spec.name(), spec.triplet()); } const_iterator find(const std::string& name, const Triplet& target_triplet) const; iterator find(const std::string& name, const Triplet& target_triplet); const_iterator find_installed(const PackageSpec& spec) const { - return find_installed(spec.name(), spec.target_triplet()); + return find_installed(spec.name(), spec.triplet()); } const_iterator find_installed(const std::string& name, const Triplet& target_triplet) const; -- cgit v1.2.3 From 6699737c6d1b9e33c4448080c006317333b1e969 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Mon, 10 Apr 2017 13:04:34 -0700 Subject: [PackageSpec] target_triplet -> triplet --- toolsrc/include/PackageSpec.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'toolsrc/include') diff --git a/toolsrc/include/PackageSpec.h b/toolsrc/include/PackageSpec.h index fa6b2c5f5..4c3b47365 100644 --- a/toolsrc/include/PackageSpec.h +++ b/toolsrc/include/PackageSpec.h @@ -9,7 +9,7 @@ namespace vcpkg { static Expected from_string(const std::string& spec_as_string, const Triplet& default_triplet); - static Expected from_name_and_triplet(const std::string& name, const Triplet& target_triplet); + static Expected from_name_and_triplet(const std::string& name, const Triplet& triplet); const std::string& name() const; @@ -21,7 +21,7 @@ namespace vcpkg private: std::string m_name; - Triplet m_target_triplet; + Triplet m_triplet; }; bool operator==(const PackageSpec& left, const PackageSpec& right); -- 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/include/BinaryParagraph.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'toolsrc/include') diff --git a/toolsrc/include/BinaryParagraph.h b/toolsrc/include/BinaryParagraph.h index d92ae7e6d..e29e0f51b 100644 --- a/toolsrc/include/BinaryParagraph.h +++ b/toolsrc/include/BinaryParagraph.h @@ -10,7 +10,7 @@ namespace vcpkg { BinaryParagraph(); explicit BinaryParagraph(std::unordered_map fields); - BinaryParagraph(const SourceParagraph& spgh, const Triplet& target_triplet); + BinaryParagraph(const SourceParagraph& spgh, const Triplet& triplet); std::string displayname() const; -- cgit v1.2.3 From cb679871e061cf2af460e53b57a56441b0eed575 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Mon, 10 Apr 2017 13:08:47 -0700 Subject: [StatusParagraph] target_triplet -> triplet --- toolsrc/include/StatusParagraphs.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'toolsrc/include') diff --git a/toolsrc/include/StatusParagraphs.h b/toolsrc/include/StatusParagraphs.h index 9c7f443d0..c5ece9616 100644 --- a/toolsrc/include/StatusParagraphs.h +++ b/toolsrc/include/StatusParagraphs.h @@ -18,14 +18,14 @@ namespace vcpkg { return find(spec.name(), spec.triplet()); } - const_iterator find(const std::string& name, const Triplet& target_triplet) const; - iterator find(const std::string& name, const Triplet& target_triplet); + const_iterator find(const std::string& name, const Triplet& triplet) const; + iterator find(const std::string& name, const Triplet& triplet); const_iterator find_installed(const PackageSpec& spec) const { return find_installed(spec.name(), spec.triplet()); } - const_iterator find_installed(const std::string& name, const Triplet& target_triplet) const; + const_iterator find_installed(const std::string& name, const Triplet& triplet) const; iterator insert(std::unique_ptr); -- cgit v1.2.3 From d9ba36c7ebaf8a417ec7e0bce9338524ab2337b4 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Mon, 10 Apr 2017 13:13:07 -0700 Subject: Remaining target_triplet -> triplet --- toolsrc/include/vcpkg_Commands.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'toolsrc/include') diff --git a/toolsrc/include/vcpkg_Commands.h b/toolsrc/include/vcpkg_Commands.h index cc6437bf9..bb25812ac 100644 --- a/toolsrc/include/vcpkg_Commands.h +++ b/toolsrc/include/vcpkg_Commands.h @@ -29,7 +29,7 @@ namespace vcpkg::Commands std::string create_error_message(const BuildResult build_result, const PackageSpec& spec); std::string create_user_troubleshooting_message(const PackageSpec& spec); - std::wstring make_build_env_cmd(const Triplet& target_triplet, const Toolset& toolset); + std::wstring make_build_env_cmd(const Triplet& triplet, const Toolset& toolset); BuildResult build_package(const SourceParagraph& source_paragraph, const PackageSpec& spec, const VcpkgPaths& paths, const fs::path& port_dir, const StatusParagraphs& status_db); void perform_and_exit(const PackageSpec& spec, const fs::path& port_dir, const std::unordered_set& options, const VcpkgPaths& paths); -- cgit v1.2.3