diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-08-20 19:36:43 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-08-20 19:36:43 -0700 |
| commit | 1ba7cef1f07e8fd8c0053694b306dcc3960f720e (patch) | |
| tree | 36dd22a0f81cafbaf142907251995c1d2f70da0d /toolsrc/include | |
| parent | bd222504abea410d77487e176649ae9b6989c4e0 (diff) | |
| download | vcpkg-1ba7cef1f07e8fd8c0053694b306dcc3960f720e.tar.gz vcpkg-1ba7cef1f07e8fd8c0053694b306dcc3960f720e.zip | |
[vcpkg] Remove incomplete default features implementation
Diffstat (limited to 'toolsrc/include')
| -rw-r--r-- | toolsrc/include/SourceParagraph.h | 11 | ||||
| -rw-r--r-- | toolsrc/include/vcpkg_Dependencies.h | 8 |
2 files changed, 6 insertions, 13 deletions
diff --git a/toolsrc/include/SourceParagraph.h b/toolsrc/include/SourceParagraph.h index d938e2e3b..05f18f940 100644 --- a/toolsrc/include/SourceParagraph.h +++ b/toolsrc/include/SourceParagraph.h @@ -23,6 +23,12 @@ namespace vcpkg static Dependency parse_dependency(std::string name, std::string qualifier); }; + std::vector<std::string> filter_dependencies(const std::vector<Dependency>& deps, const Triplet& t); + std::vector<FeatureSpec> filter_dependencies_to_specs(const std::vector<Dependency>& deps, const Triplet& t); + + // zlib[uwp] becomes Dependency{"zlib", "uwp"} + std::vector<Dependency> expand_qualified_dependencies(const std::vector<std::string>& depends); + const std::string to_string(const Dependency& dep); struct FeatureParagraph @@ -60,11 +66,6 @@ namespace vcpkg return print_error_message({&error_info_list, 1}); } - std::vector<std::string> filter_dependencies(const std::vector<Dependency>& deps, const Triplet& t); - - // zlib[uwp] becomes Dependency{"zlib", "uwp"} - std::vector<Dependency> expand_qualified_dependencies(const std::vector<std::string>& depends); - struct Supports { static ExpectedT<Supports, std::vector<std::string>> parse(const std::vector<std::string>& strs); diff --git a/toolsrc/include/vcpkg_Dependencies.h b/toolsrc/include/vcpkg_Dependencies.h index 37d3a59e5..3a81cf27b 100644 --- a/toolsrc/include/vcpkg_Dependencies.h +++ b/toolsrc/include/vcpkg_Dependencies.h @@ -194,14 +194,6 @@ namespace vcpkg::Dependencies Graphs::Graph<ClusterPtr> remove_graph; Graphs::Graph<ClusterPtr> install_graph; }; - bool mark_plus(const std::string& feature, - Cluster& cluster, - std::unordered_map<PackageSpec, Cluster>& pkg_to_cluster, - GraphPlan& graph_plan); - void mark_minus(Cluster& cluster, std::unordered_map<PackageSpec, Cluster>& pkg_to_cluster, GraphPlan& graph_plan); - void mark_plus_default(Cluster& cluster, - std::unordered_map<PackageSpec, Cluster>& pkg_to_cluster, - GraphPlan& graph_plan); std::vector<AnyAction> create_feature_install_plan(const std::unordered_map<PackageSpec, SourceControlFile>& map, const std::vector<FeatureSpec>& specs, const StatusParagraphs& status_db); |