mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-29 08:19:38 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

install_state_t -> InstallState

Browse Source
This commit is contained in:
Alexander Karatarakis 2017-04-03 15:14:17 -07:00
parent d33e191ce4
commit ab34b88f2d
6 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
toolsrc/include/StatusParagraph.h
View File

@ -5,7 +5,7 @@
namespace vcpkg
{
enum class install_state_t
enum class InstallState
{
error,
not_installed,
@ -30,12 +30,12 @@ namespace vcpkg
BinaryParagraph package;
want_t want;
install_state_t state;
InstallState state;
};
std::ostream& operator<<(std::ostream& os, const StatusParagraph& pgh);
std::string to_string(install_state_t f);
std::string to_string(InstallState f);
std::string to_string(want_t f);
}

18
toolsrc/src/StatusParagraph.cpp
View File

@ -12,7 +12,7 @@ namespace vcpkg
static const std::string STATUS = "Status";
}
StatusParagraph::StatusParagraph() : want(want_t::error), state(install_state_t::error)
StatusParagraph::StatusParagraph() : want(want_t::error), state(InstallState::error)
{
}
@ -58,22 +58,22 @@ namespace vcpkg
state = [](const std::string& text)
{
if (text == "not-installed")
return install_state_t::not_installed;
return InstallState::not_installed;
if (text == "installed")
return install_state_t::installed;
return InstallState::installed;
if (text == "half-installed")
return install_state_t::half_installed;
return install_state_t::error;
return InstallState::half_installed;
return InstallState::error;
}(std::string(b, e));
}
std::string to_string(install_state_t f)
std::string to_string(InstallState f)
{
switch (f)
{
case install_state_t::half_installed: return "half-installed";
case install_state_t::installed: return "installed";
case install_state_t::not_installed: return "not-installed";
case InstallState::half_installed: return "half-installed";
case InstallState::installed: return "installed";
case InstallState::not_installed: return "not-installed";
default: return "error";
}
}

4
toolsrc/src/commands_install.cpp
View File

@ -165,7 +165,7 @@ namespace vcpkg::Commands::Install
StatusParagraph spgh;
spgh.package = binary_paragraph;
spgh.want = want_t::install;
spgh.state = install_state_t::half_installed;
spgh.state = InstallState::half_installed;
for (auto&& dep : spgh.package.depends)
{
if (status_db->find_installed(dep, spgh.package.spec.target_triplet()) == status_db->end())
@ -178,7 +178,7 @@ namespace vcpkg::Commands::Install
install_and_write_listfile(paths, spgh.package);
spgh.state = install_state_t::installed;
spgh.state = InstallState::installed;
write_update(paths, spgh);
status_db->insert(std::make_unique<StatusParagraph>(spgh));
}

4
toolsrc/src/commands_remove.cpp
View File

@ -32,7 +32,7 @@ namespace vcpkg::Commands::Remove
StatusParagraph& pkg = **status_db->find(spec.name(), spec.target_triplet());
pkg.want = want_t::purge;
pkg.state = install_state_t::half_installed;
pkg.state = InstallState::half_installed;
write_update(paths, pkg);
std::fstream listfile(paths.listfile_path(pkg.package), std::ios_base::in | std::ios_base::binary);
@ -97,7 +97,7 @@ namespace vcpkg::Commands::Remove
fs::remove(paths.listfile_path(pkg.package));
}
pkg.state = install_state_t::not_installed;
pkg.state = InstallState::not_installed;
write_update(paths, pkg);
}

2
toolsrc/src/vcpkg_Dependencies.cpp
View File

@ -122,7 +122,7 @@ namespace vcpkg::Dependencies
}
const StatusParagraphs::const_iterator it = status_db.find(spec);
if (it == status_db.end() || (*it)->state == install_state_t::not_installed)
if (it == status_db.end() || (*it)->state == InstallState::not_installed)
{
was_examined.emplace(spec, remove_plan_action(remove_plan_type::NOT_INSTALLED, request_type::USER_REQUESTED));
continue;

4
toolsrc/src/vcpkglib.cpp
View File

@ -176,7 +176,7 @@ namespace vcpkg
std::vector<StatusParagraph*> installed_packages;
for (auto&& pgh : status_db)
{
if (pgh->state == install_state_t::not_installed && pgh->want == want_t::purge)
if (pgh->state == InstallState::not_installed && pgh->want == want_t::purge)
continue;
installed_packages.push_back(pgh.get());
}
@ -190,7 +190,7 @@ namespace vcpkg
for (const std::unique_ptr<StatusParagraph>& pgh : status_db)
{
if (pgh->state != install_state_t::installed)
if (pgh->state != InstallState::installed)
{
continue;
}