diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2017-02-27 15:45:56 -0800 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2017-02-27 15:45:56 -0800 |
| commit | c0ae9fee7e30cdd4898df22aecf5412b2d8f8ee6 (patch) | |
| tree | 460db03fec88a2a9ed55a5f55a1d8b732c20d299 /toolsrc/include | |
| parent | 00737588cc6155776734c5a5261c9b08f9446eb4 (diff) | |
| download | vcpkg-c0ae9fee7e30cdd4898df22aecf5412b2d8f8ee6.tar.gz vcpkg-c0ae9fee7e30cdd4898df22aecf5412b2d8f8ee6.zip | |
Move some functions from vcpkglib.h to Paragraphs.h
Diffstat (limited to 'toolsrc/include')
| -rw-r--r-- | toolsrc/include/Paragraphs.h | 9 | ||||
| -rw-r--r-- | toolsrc/include/vcpkglib.h | 8 |
2 files changed, 9 insertions, 8 deletions
diff --git a/toolsrc/include/Paragraphs.h b/toolsrc/include/Paragraphs.h index 761b49759..9564d2290 100644 --- a/toolsrc/include/Paragraphs.h +++ b/toolsrc/include/Paragraphs.h @@ -2,9 +2,18 @@ #include "filesystem_fs.h" #include <unordered_map> +#include "expected.h" +#include "BinaryParagraph.h" +#include "vcpkg_paths.h" namespace vcpkg::Paragraphs { std::vector<std::unordered_map<std::string, std::string>> get_paragraphs(const fs::path& control_path); std::vector<std::unordered_map<std::string, std::string>> parse_paragraphs(const std::string& str); + + expected<SourceParagraph> try_load_port(const fs::path& control_path); + + expected<BinaryParagraph> try_load_cached_package(const vcpkg_paths& paths, const package_spec& spec); + + std::vector<SourceParagraph> load_all_ports(const fs::path& ports_dir); } diff --git a/toolsrc/include/vcpkglib.h b/toolsrc/include/vcpkglib.h index 69cde7ea2..1ce55bd8a 100644 --- a/toolsrc/include/vcpkglib.h +++ b/toolsrc/include/vcpkglib.h @@ -1,7 +1,5 @@ #pragma once -#include "package_spec.h" -#include "BinaryParagraph.h" #include "StatusParagraphs.h" #include "vcpkg_paths.h" #include "ImmutableSortedVector.h" @@ -19,10 +17,4 @@ namespace vcpkg }; std::vector<StatusParagraph_and_associated_files> get_installed_files(const vcpkg_paths& paths, const StatusParagraphs& status_db); - - expected<SourceParagraph> try_load_port(const fs::path& control_path); - - expected<BinaryParagraph> try_load_cached_package(const vcpkg_paths& paths, const package_spec& spec); - - std::vector<SourceParagraph> load_all_ports(const fs::path& ports_dir); } // namespace vcpkg |