The-Homebrew-Cloud/cemu-vcpkg
2
0
Fork 0
mirror of https://github.com/cemu-project/vcpkg.git synced 2025-02-23 19:17:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Renames and formatting

Browse Source
This commit is contained in:
Alexander Karatarakis 2017-01-30 12:36:27 -08:00
parent 661776fe29
commit 884cd176b0
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
toolsrc/include/vcpkg_Dependencies.h
View File

@ -16,8 +16,8 @@ namespace vcpkg::Dependencies
struct install_plan_action
{
install_plan_type type;
std::unique_ptr<BinaryParagraph> bpgh;
std::unique_ptr<SourceParagraph> spgh;
std::unique_ptr<BinaryParagraph> binary_pgh;
std::unique_ptr<SourceParagraph> source_pgh;
};
struct package_spec_with_install_plan

4
toolsrc/src/commands_install.cpp
View File

@ -214,14 +214,14 @@ namespace vcpkg::Commands::Install
}
else if (action.plan.type == install_plan_type::BUILD_AND_INSTALL)
{
Commands::Build::build_package(*action.plan.spgh, action.spec, paths, paths.port_dir(action.spec));
Commands::Build::build_package(*action.plan.source_pgh, action.spec, paths, paths.port_dir(action.spec));
const BinaryParagraph bpgh = try_load_cached_package(paths, action.spec).get_or_throw();
install_package(paths, bpgh, status_db);
System::println(System::color::success, "Package %s is installed", action.spec);
}
else if (action.plan.type == install_plan_type::INSTALL)
{
install_package(paths, *action.plan.bpgh, status_db);
install_package(paths, *action.plan.binary_pgh, status_db);
System::println(System::color::success, "Package %s is installed", action.spec);
}
else

10
toolsrc/src/vcpkg_Dependencies.cpp
View File

@ -66,7 +66,7 @@ namespace vcpkg::Dependencies
const std::vector<package_spec> pkgs = graph.find_topological_sort();
for (const package_spec& pkg : pkgs)
{
ret.push_back({ pkg, std::move(was_examined[pkg]) });
ret.push_back({pkg, std::move(was_examined[pkg])});
}
return ret;
}
@ -93,7 +93,7 @@ namespace vcpkg::Dependencies
auto it = status_db.find(spec);
if (it == status_db.end() || (*it)->state == install_state_t::not_installed)
{
was_examined.emplace(spec, remove_plan_action{ remove_plan_type::NOT_INSTALLED, nullptr});
was_examined.emplace(spec, remove_plan_action{remove_plan_type::NOT_INSTALLED, nullptr});
continue;
}
@ -114,8 +114,8 @@ namespace vcpkg::Dependencies
examine_stack.push_back(an_installed_package.get()->package.spec);
}
const remove_plan_type type = specs_as_set.find(spec) != specs_as_set.end() ? remove_plan_type::REMOVE_USER_REQUESTED: remove_plan_type::REMOVE_AUTO_SELECTED;
was_examined.emplace(spec, remove_plan_action{ type, std::make_unique<StatusParagraph>(std::move(**it))});
const remove_plan_type type = specs_as_set.find(spec) != specs_as_set.end() ? remove_plan_type::REMOVE_USER_REQUESTED : remove_plan_type::REMOVE_AUTO_SELECTED;
was_examined.emplace(spec, remove_plan_action{type, std::make_unique<StatusParagraph>(std::move(**it))});
}
std::vector<package_spec_with_remove_plan> ret;
@ -123,7 +123,7 @@ namespace vcpkg::Dependencies
const std::vector<package_spec> pkgs = graph.find_topological_sort();
for (const package_spec& pkg : pkgs)
{
ret.push_back({ pkg, std::move(was_examined[pkg]) });
ret.push_back({pkg, std::move(was_examined[pkg])});
}
return ret;
}