From 8becbe15a2a7f229041b70d0333ffc96522efb6f Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Fri, 30 Sep 2016 16:49:30 -0700 Subject: Place check_and_get_package_spec in a separate file --- toolsrc/include/vcpkg_Input.h | 11 +++++++++++ toolsrc/include/vcpkg_cmd_arguments.h | 5 ----- 2 files changed, 11 insertions(+), 5 deletions(-) create mode 100644 toolsrc/include/vcpkg_Input.h (limited to 'toolsrc/include') diff --git a/toolsrc/include/vcpkg_Input.h b/toolsrc/include/vcpkg_Input.h new file mode 100644 index 000000000..7041001c8 --- /dev/null +++ b/toolsrc/include/vcpkg_Input.h @@ -0,0 +1,11 @@ +#pragma once +#include +#include +#include "package_spec.h" + +namespace vcpkg {namespace Input +{ + package_spec check_and_get_package_spec(const std::string& package_spec_as_string, const triplet& default_target_triplet, const char* example_text); + + std::vector check_and_get_package_specs(const std::vector& package_specs_as_strings, const triplet& default_target_triplet, const char* example_text); +}} diff --git a/toolsrc/include/vcpkg_cmd_arguments.h b/toolsrc/include/vcpkg_cmd_arguments.h index 54b97cde1..95feb4814 100644 --- a/toolsrc/include/vcpkg_cmd_arguments.h +++ b/toolsrc/include/vcpkg_cmd_arguments.h @@ -4,9 +4,7 @@ #include #include #include "opt_bool.h" -#include "package_spec.h" #include "vcpkg_paths.h" -#include "StatusParagraphs.h" namespace vcpkg { @@ -15,9 +13,6 @@ namespace vcpkg static vcpkg_cmd_arguments create_from_command_line(const int argc, const wchar_t* const* const argv); static vcpkg_cmd_arguments create_from_arg_sequence(const std::string* arg_begin, const std::string* arg_end); - static package_spec check_and_get_package_spec(const std::string& package_spec_as_string, const triplet& default_target_triplet, const char* example_text); - static std::vector check_and_get_package_specs(const std::vector& package_specs_as_strings, const triplet& default_target_triplet, const char* example_text); - std::unique_ptr vcpkg_root_dir; std::unique_ptr target_triplet; opt_bool debug = opt_bool::unspecified; -- cgit v1.2.3 From 4b0f3d87befb84c819afbf664614281491a784b9 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Fri, 30 Sep 2016 16:54:07 -0700 Subject: Introduce Input::check_triplet() --- toolsrc/include/vcpkg_Input.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'toolsrc/include') diff --git a/toolsrc/include/vcpkg_Input.h b/toolsrc/include/vcpkg_Input.h index 7041001c8..311df3bec 100644 --- a/toolsrc/include/vcpkg_Input.h +++ b/toolsrc/include/vcpkg_Input.h @@ -1,11 +1,13 @@ #pragma once #include -#include #include "package_spec.h" +#include "vcpkg_paths.h" namespace vcpkg {namespace Input { package_spec check_and_get_package_spec(const std::string& package_spec_as_string, const triplet& default_target_triplet, const char* example_text); std::vector check_and_get_package_specs(const std::vector& package_specs_as_strings, const triplet& default_target_triplet, const char* example_text); + + void check_triplet(const triplet& t, const vcpkg_paths& paths); }} -- cgit v1.2.3 From e3455e281bd9a2147259f7ba769211b9709e51da Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Fri, 30 Sep 2016 16:55:34 -0700 Subject: Introduce Input::check_all_triplets() --- toolsrc/include/vcpkg_Input.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'toolsrc/include') diff --git a/toolsrc/include/vcpkg_Input.h b/toolsrc/include/vcpkg_Input.h index 311df3bec..1aa5bcb99 100644 --- a/toolsrc/include/vcpkg_Input.h +++ b/toolsrc/include/vcpkg_Input.h @@ -10,4 +10,6 @@ namespace vcpkg {namespace Input std::vector check_and_get_package_specs(const std::vector& package_specs_as_strings, const triplet& default_target_triplet, const char* example_text); void check_triplet(const triplet& t, const vcpkg_paths& paths); + + void check_all_triplets(std::vector triplets, const vcpkg_paths& paths); }} -- cgit v1.2.3 From 188eac680ba930c51943d4af34de58bbd325dcb1 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Fri, 30 Sep 2016 17:02:39 -0700 Subject: Rename check_all_triplets() to check_triplets() --- toolsrc/include/vcpkg_Input.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'toolsrc/include') diff --git a/toolsrc/include/vcpkg_Input.h b/toolsrc/include/vcpkg_Input.h index 1aa5bcb99..bbf3adfbf 100644 --- a/toolsrc/include/vcpkg_Input.h +++ b/toolsrc/include/vcpkg_Input.h @@ -11,5 +11,5 @@ namespace vcpkg {namespace Input void check_triplet(const triplet& t, const vcpkg_paths& paths); - void check_all_triplets(std::vector triplets, const vcpkg_paths& paths); + void check_triplets(std::vector triplets, const vcpkg_paths& paths); }} -- cgit v1.2.3