diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2016-09-30 17:09:23 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2016-09-30 17:09:23 -0700 |
| commit | 98b4a67fe1af6974f146b518c0f1644de290d8da (patch) | |
| tree | 015bea935501b3ae80c635b06da83e9591d9166c /toolsrc/include | |
| parent | 241ca8cd17929d53a5c10c4f366f6972d865ba4f (diff) | |
| parent | 188eac680ba930c51943d4af34de58bbd325dcb1 (diff) | |
| download | vcpkg-98b4a67fe1af6974f146b518c0f1644de290d8da.tar.gz vcpkg-98b4a67fe1af6974f146b518c0f1644de290d8da.zip | |
Merge branch 'master' of https://github.com/microsoft/vcpkg
Diffstat (limited to 'toolsrc/include')
| -rw-r--r-- | toolsrc/include/vcpkg_Input.h | 15 | ||||
| -rw-r--r-- | toolsrc/include/vcpkg_cmd_arguments.h | 5 |
2 files changed, 15 insertions, 5 deletions
diff --git a/toolsrc/include/vcpkg_Input.h b/toolsrc/include/vcpkg_Input.h new file mode 100644 index 000000000..bbf3adfbf --- /dev/null +++ b/toolsrc/include/vcpkg_Input.h @@ -0,0 +1,15 @@ +#pragma once +#include <vector> +#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<package_spec> check_and_get_package_specs(const std::vector<std::string>& 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_triplets(std::vector<package_spec> triplets, const vcpkg_paths& paths); +}} 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 <vector> #include <unordered_set> #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<package_spec> check_and_get_package_specs(const std::vector<std::string>& package_specs_as_strings, const triplet& default_target_triplet, const char* example_text); - std::unique_ptr<std::string> vcpkg_root_dir; std::unique_ptr<std::string> target_triplet; opt_bool debug = opt_bool::unspecified; |