From d1141e6054ffde134d1a3d80d484d2d2b959e408 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Mon, 3 Apr 2017 14:45:00 -0700 Subject: package_spec -> PackageSpec --- toolsrc/include/BinaryParagraph.h | 4 +-- toolsrc/include/PackageSpec.h | 58 ++++++++++++++++++++++++++++++++++++ toolsrc/include/Paragraphs.h | 2 +- toolsrc/include/PostBuildLint.h | 4 +-- toolsrc/include/StatusParagraphs.h | 2 +- toolsrc/include/package_spec.h | 58 ------------------------------------ toolsrc/include/vcpkg_Commands.h | 10 +++---- toolsrc/include/vcpkg_Dependencies.h | 14 ++++----- toolsrc/include/vcpkg_Input.h | 4 +-- toolsrc/include/vcpkg_paths.h | 8 ++--- 10 files changed, 82 insertions(+), 82 deletions(-) create mode 100644 toolsrc/include/PackageSpec.h delete mode 100644 toolsrc/include/package_spec.h (limited to 'toolsrc/include') diff --git a/toolsrc/include/BinaryParagraph.h b/toolsrc/include/BinaryParagraph.h index 3d9cfb9fb..f0f7b092b 100644 --- a/toolsrc/include/BinaryParagraph.h +++ b/toolsrc/include/BinaryParagraph.h @@ -2,7 +2,7 @@ #include #include "SourceParagraph.h" -#include "package_spec.h" +#include "PackageSpec.h" namespace vcpkg { @@ -18,7 +18,7 @@ namespace vcpkg std::string dir() const; - package_spec spec; + PackageSpec spec; std::string version; std::string description; std::string maintainer; diff --git a/toolsrc/include/PackageSpec.h b/toolsrc/include/PackageSpec.h new file mode 100644 index 000000000..be966478b --- /dev/null +++ b/toolsrc/include/PackageSpec.h @@ -0,0 +1,58 @@ +#pragma once +#include "package_spec_parse_result.h" +#include "triplet.h" +#include "vcpkg_expected.h" + +namespace vcpkg +{ + struct PackageSpec + { + static expected from_string(const std::string& spec_as_string, const triplet& default_target_triplet); + + static expected from_name_and_triplet(const std::string& name, const triplet& target_triplet); + + const std::string& name() const; + + const triplet& target_triplet() const; + + std::string display_name() const; + + std::string dir() const; + + std::string toString() const; + + private: + std::string m_name; + 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); +} //namespace vcpkg + +namespace std +{ + template <> + struct hash + { + size_t operator()(const vcpkg::PackageSpec& value) const + { + size_t hash = 17; + hash = hash * 31 + std::hash()(value.name()); + hash = hash * 31 + std::hash()(value.target_triplet()); + return hash; + } + }; + + template <> + struct equal_to + { + bool operator()(const vcpkg::PackageSpec& left, const vcpkg::PackageSpec& right) const + { + return left == right; + } + }; +} // namespace std diff --git a/toolsrc/include/Paragraphs.h b/toolsrc/include/Paragraphs.h index 26f81ffad..101b6dde6 100644 --- a/toolsrc/include/Paragraphs.h +++ b/toolsrc/include/Paragraphs.h @@ -18,7 +18,7 @@ namespace vcpkg::Paragraphs expected try_load_port(const fs::path& control_path); - expected try_load_cached_package(const vcpkg_paths& paths, const package_spec& spec); + expected try_load_cached_package(const vcpkg_paths& paths, const PackageSpec& spec); std::vector load_all_ports(const fs::path& ports_dir); diff --git a/toolsrc/include/PostBuildLint.h b/toolsrc/include/PostBuildLint.h index 73c8ec54b..1f96b02f1 100644 --- a/toolsrc/include/PostBuildLint.h +++ b/toolsrc/include/PostBuildLint.h @@ -1,8 +1,8 @@ #pragma once -#include "package_spec.h" +#include "PackageSpec.h" #include "vcpkg_paths.h" namespace vcpkg::PostBuildLint { - size_t perform_all_checks(const package_spec& spec, const vcpkg_paths& paths); + size_t perform_all_checks(const PackageSpec& spec, const vcpkg_paths& paths); } diff --git a/toolsrc/include/StatusParagraphs.h b/toolsrc/include/StatusParagraphs.h index 3c5d35183..fc6a96a54 100644 --- a/toolsrc/include/StatusParagraphs.h +++ b/toolsrc/include/StatusParagraphs.h @@ -14,7 +14,7 @@ namespace vcpkg using iterator = container::reverse_iterator; using const_iterator = container::const_reverse_iterator; - const_iterator find(const package_spec& spec) const + const_iterator find(const PackageSpec& spec) const { return find(spec.name(), spec.target_triplet()); } diff --git a/toolsrc/include/package_spec.h b/toolsrc/include/package_spec.h deleted file mode 100644 index ead05cb99..000000000 --- a/toolsrc/include/package_spec.h +++ /dev/null @@ -1,58 +0,0 @@ -#pragma once -#include "package_spec_parse_result.h" -#include "triplet.h" -#include "vcpkg_expected.h" - -namespace vcpkg -{ - struct package_spec - { - static expected from_string(const std::string& spec_as_string, const triplet& default_target_triplet); - - static expected from_name_and_triplet(const std::string& name, const triplet& target_triplet); - - const std::string& name() const; - - const triplet& target_triplet() const; - - std::string display_name() const; - - std::string dir() const; - - std::string toString() const; - - private: - std::string m_name; - triplet m_target_triplet; - }; - - std::string to_printf_arg(const package_spec& spec); - - bool operator==(const package_spec& left, const package_spec& right); - - std::ostream& operator<<(std::ostream& os, const package_spec& spec); -} //namespace vcpkg - -namespace std -{ - template <> - struct hash - { - size_t operator()(const vcpkg::package_spec& value) const - { - size_t hash = 17; - hash = hash * 31 + std::hash()(value.name()); - hash = hash * 31 + std::hash()(value.target_triplet()); - return hash; - } - }; - - template <> - struct equal_to - { - bool operator()(const vcpkg::package_spec& left, const vcpkg::package_spec& right) const - { - return left == right; - } - }; -} // namespace std diff --git a/toolsrc/include/vcpkg_Commands.h b/toolsrc/include/vcpkg_Commands.h index 23575ca23..0795a8405 100644 --- a/toolsrc/include/vcpkg_Commands.h +++ b/toolsrc/include/vcpkg_Commands.h @@ -26,13 +26,13 @@ namespace vcpkg::Commands static constexpr std::array BuildResult_values = { BuildResult::SUCCEEDED, BuildResult::BUILD_FAILED, BuildResult::POST_BUILD_CHECKS_FAILED, BuildResult::CASCADED_DUE_TO_MISSING_DEPENDENCIES }; const std::string& to_string(const BuildResult build_result); - std::string create_error_message(const BuildResult build_result, const package_spec& spec); - std::string create_user_troubleshooting_message(const package_spec& spec); + 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_t& toolset); - BuildResult build_package(const SourceParagraph& source_paragraph, const package_spec& spec, const vcpkg_paths& paths, const fs::path& port_dir, const StatusParagraphs& status_db); - void perform_and_exit(const package_spec& spec, const fs::path& port_dir, const std::unordered_set& options, const vcpkg_paths& paths); + BuildResult build_package(const SourceParagraph& source_paragraph, const PackageSpec& spec, const vcpkg_paths& 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 vcpkg_paths& paths); void perform_and_exit(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths, const triplet& default_target_triplet); } @@ -63,7 +63,7 @@ namespace vcpkg::Commands { static bool compare_by_name(const outdated_package& left, const outdated_package& right); - package_spec spec; + PackageSpec spec; version_diff_t version_diff; }; diff --git a/toolsrc/include/vcpkg_Dependencies.h b/toolsrc/include/vcpkg_Dependencies.h index dca824ee9..b2633bb28 100644 --- a/toolsrc/include/vcpkg_Dependencies.h +++ b/toolsrc/include/vcpkg_Dependencies.h @@ -1,6 +1,6 @@ #pragma once #include -#include "package_spec.h" +#include "PackageSpec.h" #include "StatusParagraphs.h" #include "vcpkg_paths.h" #include "vcpkg_optional.h" @@ -38,9 +38,9 @@ namespace vcpkg::Dependencies struct package_spec_with_install_plan { - package_spec_with_install_plan(const package_spec& spec, install_plan_action&& plan); + package_spec_with_install_plan(const PackageSpec& spec, install_plan_action&& plan); - package_spec spec; + PackageSpec spec; install_plan_action plan; }; @@ -67,13 +67,13 @@ namespace vcpkg::Dependencies struct package_spec_with_remove_plan { - package_spec_with_remove_plan(const package_spec& spec, remove_plan_action&& plan); + package_spec_with_remove_plan(const PackageSpec& spec, remove_plan_action&& plan); - package_spec spec; + PackageSpec spec; remove_plan_action plan; }; - std::vector create_install_plan(const vcpkg_paths& paths, const std::vector& specs, const StatusParagraphs& status_db); + std::vector create_install_plan(const vcpkg_paths& paths, const std::vector& specs, const StatusParagraphs& status_db); - std::vector create_remove_plan(const std::vector& specs, const StatusParagraphs& status_db); + std::vector create_remove_plan(const std::vector& specs, const StatusParagraphs& status_db); } diff --git a/toolsrc/include/vcpkg_Input.h b/toolsrc/include/vcpkg_Input.h index 868b77a44..da7bebbfa 100644 --- a/toolsrc/include/vcpkg_Input.h +++ b/toolsrc/include/vcpkg_Input.h @@ -1,11 +1,11 @@ #pragma once #include -#include "package_spec.h" +#include "PackageSpec.h" #include "vcpkg_paths.h" namespace vcpkg::Input { - package_spec check_and_get_package_spec( + PackageSpec check_and_get_package_spec( const std::string& package_spec_as_string, const triplet& default_target_triplet, CStringView example_text); diff --git a/toolsrc/include/vcpkg_paths.h b/toolsrc/include/vcpkg_paths.h index eb0f1bb0f..fa74fd703 100644 --- a/toolsrc/include/vcpkg_paths.h +++ b/toolsrc/include/vcpkg_paths.h @@ -1,7 +1,7 @@ #pragma once #include "filesystem_fs.h" #include "vcpkg_expected.h" -#include "package_spec.h" +#include "PackageSpec.h" #include "BinaryParagraph.h" #include "Lazy.h" @@ -18,9 +18,9 @@ namespace vcpkg { static expected create(const fs::path& vcpkg_root_dir); - fs::path package_dir(const package_spec& spec) const; - fs::path port_dir(const package_spec& spec) const; - fs::path build_info_file_path(const package_spec& spec) const; + fs::path package_dir(const PackageSpec& spec) const; + fs::path port_dir(const PackageSpec& spec) const; + fs::path build_info_file_path(const PackageSpec& spec) const; fs::path listfile_path(const BinaryParagraph& pgh) const; bool is_valid_triplet(const triplet& t) const; -- cgit v1.2.3