microsoft
/
vcpkg
зеркало из https://github.com/microsoft/vcpkg.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

[Dependencies] Make function static

This commit is contained in:
Alexander Karatarakis 2016-11-07 17:05:32 -08:00
Родитель 8be5e7c123
Коммит d85e169c05
2 изменённых файлов: 24 добавлений и 25 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

1
toolsrc/include/vcpkg_Dependencies.h
Просмотреть файл

@ -11,6 +11,5 @@ namespace vcpkg {namespace Dependencies
std::unordered_set<package_spec> find_unmet_dependencies(const vcpkg_paths& paths, const std::vector<package_spec>& specs, const StatusParagraphs& status_db);
std::vector<std::string> get_unmet_package_dependencies(const vcpkg_paths& paths, const package_spec& spec, const StatusParagraphs& status_db);
std::vector<std::string> get_unmet_package_build_dependencies(const vcpkg_paths& paths, const package_spec& spec, const StatusParagraphs& status_db);
}}

48
toolsrc/src/vcpkg_Dependencies.cpp
Просмотреть файл

@ -12,6 +12,29 @@
namespace vcpkg { namespace Dependencies
{
// TODO: Refactoring between this function and install_package
static std::vector<std::string> get_single_level_unmet_dependencies(const vcpkg_paths& paths, const package_spec& spec, const StatusParagraphs& status_db)
{
const fs::path packages_dir_control_file_path = paths.package_dir(spec) / "CONTROL";
auto control_contents_maybe = Files::get_contents(packages_dir_control_file_path);
if (auto control_contents = control_contents_maybe.get())
{
std::vector<std::unordered_map<std::string, std::string>> pghs;
try
{
pghs = Paragraphs::parse_paragraphs(*control_contents);
}
catch (std::runtime_error)
{
}
Checks::check_exit(pghs.size() == 1, "Invalid control file at %s", packages_dir_control_file_path.string());
return BinaryParagraph(pghs[0]).depends;
}
return get_unmet_package_build_dependencies(paths, spec, status_db);
}
static Graphs::Graph<package_spec> build_dependency_graph(const vcpkg_paths& paths, const std::vector<package_spec>& specs, const StatusParagraphs& status_db)
{
std::vector<package_spec> examine_stack(specs);
@ -29,7 +52,7 @@ namespace vcpkg { namespace Dependencies
continue;
}
std::vector<std::string> dependencies_as_string = get_unmet_package_dependencies(paths, spec, status_db);
std::vector<std::string> dependencies_as_string = get_single_level_unmet_dependencies(paths, spec, status_db);
for (const std::string& dep_as_string : dependencies_as_string)
{
@ -64,29 +87,6 @@ namespace vcpkg { namespace Dependencies
return Maps::extract_key_set(dependency_graph.adjacency_list());
}
// TODO: Refactoring between this function and install_package
std::vector<std::string> get_unmet_package_dependencies(const vcpkg_paths& paths, const package_spec& spec, const StatusParagraphs& status_db)
{
const fs::path packages_dir_control_file_path = paths.package_dir(spec) / "CONTROL";
auto control_contents_maybe = Files::get_contents(packages_dir_control_file_path);
if (auto control_contents = control_contents_maybe.get())
{
std::vector<std::unordered_map<std::string, std::string>> pghs;
try
{
pghs = Paragraphs::parse_paragraphs(*control_contents);
}
catch (std::runtime_error)
{
}
Checks::check_exit(pghs.size() == 1, "Invalid control file at %s", packages_dir_control_file_path.string());
return BinaryParagraph(pghs[0]).depends;
}
return get_unmet_package_build_dependencies(paths, spec, status_db);
}
std::vector<std::string> get_unmet_package_build_dependencies(const vcpkg_paths& paths, const package_spec& spec, const StatusParagraphs& status_db)
{
const fs::path ports_dir_control_file_path = paths.port_dir(spec) / "CONTROL";