3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-28 03:10:57 +08:00
Code Issues Projects Releases Wiki Activity

Make handle features (#6797)

Browse Source
This commit is contained in:
gnaggnoyil 2019-07-10 04:02:48 +08:00 committed by Curtis J Bezault
parent a15e2446fa
commit 7f80c0e2d3
2 changed files with 67 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
toolsrc/include/vcpkg/base/util.h
View File

@ -6,9 +6,18 @@
#include <unordered_map> #include <unordered_map>
#include <utility> #include <utility>
#include <vector> #include <vector>
#include <type_traits>
namespace vcpkg::Util namespace vcpkg::Util
{ {
template <class T>
constexpr std::add_const_t<T>& as_const(T& t) noexcept
{
return t;
}
template <class T>
void as_const(const T&&) = delete;
template<class Container> template<class Container>
using ElementT = using ElementT =
std::remove_reference_t<decltype(*std::declval<typename std::remove_reference_t<Container>::iterator>())>; std::remove_reference_t<decltype(*std::declval<typename std::remove_reference_t<Container>::iterator>())>;

61
toolsrc/src/vcpkg/commands.dependinfo.cpp
View File

@ -6,6 +6,10 @@
#include <vcpkg/commands.h> #include <vcpkg/commands.h>
#include <vcpkg/help.h> #include <vcpkg/help.h>
#include <vcpkg/paragraphs.h> #include <vcpkg/paragraphs.h>
#include <vcpkg/packagespec.h>
#include <vector>
#include <memory>
#include <vcpkg/dependencies.h> #include <vcpkg/dependencies.h>
using vcpkg::Dependencies::PathsPortFileProvider; using vcpkg::Dependencies::PathsPortFileProvider;
@ -130,14 +134,29 @@ namespace vcpkg::Commands::DependInfo
const std::vector<const SourceControlFile*>& source_control_files, const std::vector<const SourceControlFile*>& source_control_files,
const std::unordered_set<std::string>& switches) const std::unordered_set<std::string>& switches)
{ {
auto maybe_requested_spec = ParsedSpecifier::from_string(requested_package);
// TODO: move this check to the top-level invocation of this function since
// argument `requested_package` shall always be valid in inner-level invocation.
if (!maybe_requested_spec.has_value())
{
System::print2(System::Color::warning,
"'",
requested_package,
"' is not a valid package specifier: ",
vcpkg::to_string(maybe_requested_spec.error()),
"\n");
return;
}
auto requested_spec = maybe_requested_spec.get();
const auto source_control_file = const auto source_control_file =
Util::find_if(source_control_files, [&requested_package](const auto& source_control_file) { Util::find_if(source_control_files, [&requested_spec](const auto& source_control_file) {
return source_control_file->core_paragraph->name == requested_package; return source_control_file->core_paragraph->name == requested_spec->name;
}); });
if (source_control_file != source_control_files.end()) if (source_control_file != source_control_files.end())
{ {
const auto new_package = packages_to_keep.insert(requested_package).second; const auto new_package = packages_to_keep.insert(requested_spec->name).second;
if (new_package && !Util::Sets::contains(switches, OPTION_NO_RECURSE)) if (new_package && !Util::Sets::contains(switches, OPTION_NO_RECURSE))
{ {
@ -145,6 +164,42 @@ namespace vcpkg::Commands::DependInfo
{ {
build_dependencies_list(packages_to_keep, dependency.depend.name, source_control_files, switches); build_dependencies_list(packages_to_keep, dependency.depend.name, source_control_files, switches);
} }
// Collect features with `*` considered
std::set<const FeatureParagraph*> collected_features;
for (const auto& requested_feature_name : requested_spec->features)
{
if (requested_feature_name == "*")
{
for (auto &&feature_paragraph : (*source_control_file)->feature_paragraphs)
{
collected_features.insert(std::addressof(Util::as_const(*feature_paragraph)));
}
continue;
}
auto maybe_feature = (*source_control_file)->find_feature(requested_feature_name);
if (auto &&feature_paragraph = maybe_feature.get())
{
collected_features.insert(std::addressof(Util::as_const(*feature_paragraph)));
}
else
{
System::print2(System::Color::warning,
"dependency '",
requested_feature_name,
"' of package '",
requested_spec->name,
"' does not exist\n");
continue;
}
}
for (auto feature_paragraph : collected_features)
{
for (const auto& dependency : feature_paragraph->depends)
{
build_dependencies_list(packages_to_keep, dependency.depend.name, source_control_files, switches);
}
}
} }
} }
else else