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

[vcpkg-remove] Make purge the default for remove.

Browse Source 
Added (currently undocumented) --no-purge as workaround if required.
This commit is contained in:
Robert Schumacher 2017-04-03 15:22:09 -07:00
parent 2826c04976
commit ebf1fff6a7
3 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
toolsrc/src/commands_help.cpp
View File

@ -19,10 +19,9 @@ namespace vcpkg::Commands::Help
System::println( System::println(
"Commands:\n" "Commands:\n"
" vcpkg search [pat] Search for packages available to be built\n" " vcpkg search [pat] Search for packages available to be built\n"
" vcpkg install <pkg> Install a package\n" " vcpkg install <pkg>... Install a package\n"
" vcpkg remove <pkg> Uninstall a package. \n" " vcpkg remove <pkg>... Uninstall a package\n"
" vcpkg remove --outdated Uninstall all out-of-date packages\n" " vcpkg remove --outdated Uninstall all out-of-date packages\n"
" vcpkg remove --purge <pkg> Uninstall and delete a package. \n"
" vcpkg list List installed packages\n" " vcpkg list List installed packages\n"
" vcpkg update Display list of packages for updating\n" " vcpkg update Display list of packages for updating\n"
" vcpkg hash <file> [alg] Hash a file by specific algorithm, default SHA512\n" " vcpkg hash <file> [alg] Hash a file by specific algorithm, default SHA512\n"

21
toolsrc/src/commands_remove.cpp
View File

@ -13,11 +13,6 @@ namespace vcpkg::Commands::Remove
using Dependencies::request_type; using Dependencies::request_type;
using Update::outdated_package; using Update::outdated_package;
static const std::string OPTION_PURGE = "--purge";
static const std::string OPTION_RECURSE = "--recurse";
static const std::string OPTION_DRY_RUN = "--dry-run";
static const std::string OPTION_OUTDATED = "--outdated";
static void delete_directory(const fs::path& directory) static void delete_directory(const fs::path& directory)
{ {
std::error_code ec; std::error_code ec;
@ -169,8 +164,13 @@ namespace vcpkg::Commands::Remove
void perform_and_exit(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths, const triplet& default_triplet) void perform_and_exit(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths, const triplet& default_triplet)
{ {
static const std::string OPTION_PURGE = "--purge";
static const std::string OPTION_NO_PURGE = "--no-purge";
static const std::string OPTION_RECURSE = "--recurse";
static const std::string OPTION_DRY_RUN = "--dry-run";
static const std::string OPTION_OUTDATED = "--outdated";
static const std::string example = Commands::Help::create_example_string("remove zlib zlib:x64-windows curl boost"); static const std::string example = Commands::Help::create_example_string("remove zlib zlib:x64-windows curl boost");
const std::unordered_set<std::string> options = args.check_and_get_optional_command_arguments({ OPTION_PURGE, OPTION_RECURSE, OPTION_DRY_RUN, OPTION_OUTDATED }); const std::unordered_set<std::string> options = args.check_and_get_optional_command_arguments({ OPTION_PURGE, OPTION_NO_PURGE, OPTION_RECURSE, OPTION_DRY_RUN, OPTION_OUTDATED });
StatusParagraphs status_db = database_load_check(paths); StatusParagraphs status_db = database_load_check(paths);
std::vector<package_spec> specs; std::vector<package_spec> specs;
@ -187,7 +187,14 @@ namespace vcpkg::Commands::Remove
Input::check_triplet(spec.target_triplet(), paths); Input::check_triplet(spec.target_triplet(), paths);
} }
const bool alsoRemoveFolderFromPackages = options.find(OPTION_PURGE) != options.cend(); const bool alsoRemoveFolderFromPackages = options.find(OPTION_NO_PURGE) == options.end();
if (options.find(OPTION_PURGE) != options.end() && !alsoRemoveFolderFromPackages)
{
// User specified --purge and --no-purge
System::println(System::color::error, "Error: cannot specify both --no-purge and --purge.");
System::print(example);
Checks::exit_fail(VCPKG_LINE_INFO);
}
const bool isRecursive = options.find(OPTION_RECURSE) != options.cend(); const bool isRecursive = options.find(OPTION_RECURSE) != options.cend();
const bool dryRun = options.find(OPTION_DRY_RUN) != options.cend(); const bool dryRun = options.find(OPTION_DRY_RUN) != options.cend();

2
toolsrc/src/commands_update.cpp
View File

@ -60,7 +60,7 @@ namespace vcpkg::Commands::Update
} }
System::println("\n" System::println("\n"
"To update these packages, run\n" "To update these packages, run\n"
" vcpkg remove --purge --outdated\n" " vcpkg remove --outdated\n"
" vcpkg install <pkgs>..."); " vcpkg install <pkgs>...");
} }