From e56d87c689ba4d8ac22b0b5840486790891e838c Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Fri, 7 Apr 2017 16:01:09 -0700 Subject: Remove to_printf_args(PackageSpec) --- toolsrc/src/commands_install.cpp | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'toolsrc/src/commands_install.cpp') diff --git a/toolsrc/src/commands_install.cpp b/toolsrc/src/commands_install.cpp index 2c57404de..1a8fccf9e 100644 --- a/toolsrc/src/commands_install.cpp +++ b/toolsrc/src/commands_install.cpp @@ -201,7 +201,7 @@ namespace vcpkg::Commands::Install const fs::path triplet_install_path = paths.installed / triplet.canonical_name(); System::println(System::Color::error, "The following files are already installed in %s and are in conflict with %s", triplet_install_path.generic_string(), - binary_paragraph.spec); + binary_paragraph.spec.display_name()); System::print("\n "); System::println(Strings::join("\n ", intersection)); System::println(""); @@ -281,16 +281,18 @@ namespace vcpkg::Commands::Install // execute the plan for (const PackageSpecWithInstallPlan& action : install_plan) { + const std::string display_name = action.spec.display_name(); + try { switch (action.plan.plan_type) { case InstallPlanType::ALREADY_INSTALLED: - System::println(System::Color::success, "Package %s is already installed", action.spec); + System::println(System::Color::success, "Package %s is already installed", action.spec.display_name()); break; case InstallPlanType::BUILD_AND_INSTALL: { - System::println("Building package %s... ", action.spec); + System::println("Building package %s... ", display_name); const Build::BuildResult result = Commands::Build::build_package(action.plan.source_pgh.value_or_exit(VCPKG_LINE_INFO), action.spec, paths, @@ -302,18 +304,18 @@ namespace vcpkg::Commands::Install System::println(Build::create_user_troubleshooting_message(action.spec)); Checks::exit_fail(VCPKG_LINE_INFO); } - System::println(System::Color::success, "Building package %s... done", action.spec); + System::println(System::Color::success, "Building package %s... done", display_name); const BinaryParagraph bpgh = Paragraphs::try_load_cached_package(paths, action.spec).value_or_exit(VCPKG_LINE_INFO); - System::println("Installing package %s... ", action.spec); + System::println("Installing package %s... ", display_name); install_package(paths, bpgh, &status_db); - System::println(System::Color::success, "Installing package %s... done", action.spec); + System::println(System::Color::success, "Installing package %s... done", display_name); break; } case InstallPlanType::INSTALL: - System::println("Installing package %s... ", action.spec); + System::println("Installing package %s... ", display_name); install_package(paths, action.plan.binary_pgh.value_or_exit(VCPKG_LINE_INFO), &status_db); - System::println(System::Color::success, "Installing package %s... done", action.spec); + System::println(System::Color::success, "Installing package %s... done", display_name); break; case InstallPlanType::UNKNOWN: default: @@ -322,7 +324,7 @@ namespace vcpkg::Commands::Install } catch (const std::exception& e) { - System::println(System::Color::error, "Error: Could not install package %s: %s", action.spec, e.what()); + System::println(System::Color::error, "Error: Could not install package %s: %s", action.spec.display_name(), e.what()); Checks::exit_fail(VCPKG_LINE_INFO); } } -- cgit v1.2.3 From 8b59a289f2acbd27e6f7202cb3cc36c3000cc585 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Fri, 7 Apr 2017 16:08:32 -0700 Subject: Use existing variable --- toolsrc/src/commands_install.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'toolsrc/src/commands_install.cpp') diff --git a/toolsrc/src/commands_install.cpp b/toolsrc/src/commands_install.cpp index 1a8fccf9e..884be598a 100644 --- a/toolsrc/src/commands_install.cpp +++ b/toolsrc/src/commands_install.cpp @@ -288,7 +288,7 @@ namespace vcpkg::Commands::Install switch (action.plan.plan_type) { case InstallPlanType::ALREADY_INSTALLED: - System::println(System::Color::success, "Package %s is already installed", action.spec.display_name()); + System::println(System::Color::success, "Package %s is already installed", display_name); break; case InstallPlanType::BUILD_AND_INSTALL: { -- cgit v1.2.3 From 18fa18a07b97aa69826562738e498fbd2317e091 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Fri, 7 Apr 2017 16:17:54 -0700 Subject: Remove PackageSpec.display_name() --- toolsrc/src/commands_install.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'toolsrc/src/commands_install.cpp') diff --git a/toolsrc/src/commands_install.cpp b/toolsrc/src/commands_install.cpp index 884be598a..38672da3a 100644 --- a/toolsrc/src/commands_install.cpp +++ b/toolsrc/src/commands_install.cpp @@ -201,7 +201,7 @@ namespace vcpkg::Commands::Install const fs::path triplet_install_path = paths.installed / triplet.canonical_name(); System::println(System::Color::error, "The following files are already installed in %s and are in conflict with %s", triplet_install_path.generic_string(), - binary_paragraph.spec.display_name()); + binary_paragraph.spec); System::print("\n "); System::println(Strings::join("\n ", intersection)); System::println(""); @@ -281,7 +281,7 @@ namespace vcpkg::Commands::Install // execute the plan for (const PackageSpecWithInstallPlan& action : install_plan) { - const std::string display_name = action.spec.display_name(); + const std::string display_name = action.spec.to_string(); try { @@ -324,7 +324,7 @@ namespace vcpkg::Commands::Install } catch (const std::exception& e) { - System::println(System::Color::error, "Error: Could not install package %s: %s", action.spec.display_name(), e.what()); + System::println(System::Color::error, "Error: Could not install package %s: %s", action.spec, e.what()); Checks::exit_fail(VCPKG_LINE_INFO); } } -- cgit v1.2.3 From 12f09d3151b44571ce64217ca4f6c5958d249cd6 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Fri, 7 Apr 2017 17:53:57 -0700 Subject: Use Triplet.canonical_name() or .to_string() --- toolsrc/src/commands_install.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'toolsrc/src/commands_install.cpp') diff --git a/toolsrc/src/commands_install.cpp b/toolsrc/src/commands_install.cpp index 38672da3a..3b476add3 100644 --- a/toolsrc/src/commands_install.cpp +++ b/toolsrc/src/commands_install.cpp @@ -23,10 +23,11 @@ namespace vcpkg::Commands::Install const size_t prefix_length = package_prefix_path.native().size(); const Triplet& target_triplet = bpgh.spec.target_triplet(); - const std::string& target_triplet_as_string = target_triplet.canonical_name(); + const std::string& triplet_subfolder = target_triplet.canonical_name(); + const fs::path triplet_subfolder_path = paths.installed / triplet_subfolder; std::error_code ec; - fs::create_directory(paths.installed / target_triplet_as_string, ec); - output.push_back(Strings::format(R"(%s/)", target_triplet_as_string)); + fs::create_directory(triplet_subfolder_path, ec); + output.push_back(Strings::format(R"(%s/)", triplet_subfolder)); for (auto it = fs::recursive_directory_iterator(package_prefix_path); it != fs::recursive_directory_iterator(); ++it) { @@ -38,7 +39,7 @@ namespace vcpkg::Commands::Install } const std::string suffix = it->path().generic_u8string().substr(prefix_length + 1); - const fs::path target = paths.installed / target_triplet_as_string / suffix; + const fs::path target = triplet_subfolder_path / suffix; auto status = it->status(ec); if (ec) @@ -56,7 +57,7 @@ namespace vcpkg::Commands::Install } // Trailing backslash for directories - output.push_back(Strings::format(R"(%s/%s/)", target_triplet_as_string, suffix)); + output.push_back(Strings::format(R"(%s/%s/)", triplet_subfolder, suffix)); continue; } @@ -71,7 +72,7 @@ namespace vcpkg::Commands::Install { System::println(System::Color::error, "failed: %s: %s", target.u8string(), ec.message()); } - output.push_back(Strings::format(R"(%s/%s)", target_triplet_as_string, suffix)); + output.push_back(Strings::format(R"(%s/%s)", triplet_subfolder, suffix)); continue; } -- cgit v1.2.3 From cd0c8e1ca3fa99bfbb907eb06e0f58ce47972dda Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Mon, 10 Apr 2017 12:51:11 -0700 Subject: Tweak `install` input parsing to match `remove` --- toolsrc/src/commands_install.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'toolsrc/src/commands_install.cpp') diff --git a/toolsrc/src/commands_install.cpp b/toolsrc/src/commands_install.cpp index 3b476add3..f741d8608 100644 --- a/toolsrc/src/commands_install.cpp +++ b/toolsrc/src/commands_install.cpp @@ -238,12 +238,12 @@ namespace vcpkg::Commands::Install static const std::string example = Commands::Help::create_example_string("install zlib zlib:x64-windows curl boost"); args.check_min_arg_count(1, example); - auto specs = Util::fmap(args.command_arguments, [&](auto&& arg) + const std::vector specs = Util::fmap(args.command_arguments, [&](auto&& arg) { - auto spec = Input::check_and_get_package_spec(arg, default_target_triplet, example); - Input::check_triplet(spec.target_triplet(), paths); - return spec; + return Input::check_and_get_package_spec(arg, default_target_triplet, example); }); + for (auto&& spec : specs) + Input::check_triplet(spec.target_triplet(), paths); const std::unordered_set options = args.check_and_get_optional_command_arguments({ OPTION_DRY_RUN }); const bool dryRun = options.find(OPTION_DRY_RUN) != options.cend(); -- cgit v1.2.3 From 410aa5b43a5fa995d8684590b119bbb04353a139 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Mon, 10 Apr 2017 13:00:33 -0700 Subject: default_target_triplet -> default_triplet --- toolsrc/src/commands_install.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'toolsrc/src/commands_install.cpp') diff --git a/toolsrc/src/commands_install.cpp b/toolsrc/src/commands_install.cpp index f741d8608..232c9af9f 100644 --- a/toolsrc/src/commands_install.cpp +++ b/toolsrc/src/commands_install.cpp @@ -230,7 +230,7 @@ namespace vcpkg::Commands::Install status_db->insert(std::make_unique(spgh)); } - void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_target_triplet) + void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_triplet) { static const std::string OPTION_DRY_RUN = "--dry-run"; @@ -240,7 +240,7 @@ namespace vcpkg::Commands::Install const std::vector specs = Util::fmap(args.command_arguments, [&](auto&& arg) { - return Input::check_and_get_package_spec(arg, default_target_triplet, example); + return Input::check_and_get_package_spec(arg, default_triplet, example); }); for (auto&& spec : specs) Input::check_triplet(spec.target_triplet(), paths); -- cgit v1.2.3 From 3e94a8db42804a6ac0cc71e5b74483ebd5958f83 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Mon, 10 Apr 2017 13:03:34 -0700 Subject: PackageSpec.target_triplet() -> ".triplet() --- toolsrc/src/commands_install.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'toolsrc/src/commands_install.cpp') diff --git a/toolsrc/src/commands_install.cpp b/toolsrc/src/commands_install.cpp index 232c9af9f..a0e2b40ad 100644 --- a/toolsrc/src/commands_install.cpp +++ b/toolsrc/src/commands_install.cpp @@ -22,7 +22,7 @@ namespace vcpkg::Commands::Install const fs::path package_prefix_path = paths.package_dir(bpgh.spec); const size_t prefix_length = package_prefix_path.native().size(); - const Triplet& target_triplet = bpgh.spec.target_triplet(); + const Triplet& target_triplet = bpgh.spec.triplet(); const std::string& triplet_subfolder = target_triplet.canonical_name(); const fs::path triplet_subfolder_path = paths.installed / triplet_subfolder; std::error_code ec; @@ -103,7 +103,7 @@ namespace vcpkg::Commands::Install std::vector output; for (const StatusParagraphAndAssociatedFiles& t : pgh_and_files) { - if (t.pgh.package.spec.target_triplet() != triplet) + if (t.pgh.package.spec.triplet() != triplet) { continue; } @@ -186,7 +186,7 @@ namespace vcpkg::Commands::Install void install_package(const VcpkgPaths& paths, const BinaryParagraph& binary_paragraph, StatusParagraphs* status_db) { const fs::path package_dir = paths.package_dir(binary_paragraph.spec); - const Triplet& triplet = binary_paragraph.spec.target_triplet(); + const Triplet& triplet = binary_paragraph.spec.triplet(); const std::vector pgh_and_files = get_installed_files(paths, *status_db); const SortedVector package_files = build_list_of_package_files(package_dir); @@ -215,7 +215,7 @@ namespace vcpkg::Commands::Install 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()) + if (status_db->find_installed(dep, spgh.package.spec.triplet()) == status_db->end()) { Checks::unreachable(VCPKG_LINE_INFO); } @@ -243,7 +243,7 @@ namespace vcpkg::Commands::Install return Input::check_and_get_package_spec(arg, default_triplet, example); }); for (auto&& spec : specs) - Input::check_triplet(spec.target_triplet(), paths); + Input::check_triplet(spec.triplet(), paths); const std::unordered_set options = args.check_and_get_optional_command_arguments({ OPTION_DRY_RUN }); const bool dryRun = options.find(OPTION_DRY_RUN) != options.cend(); -- cgit v1.2.3 From 60090703b3149d0f04140b62b05ead3819124a2f Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Mon, 10 Apr 2017 13:12:49 -0700 Subject: `install` target_triplet -> triplet --- toolsrc/src/commands_install.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'toolsrc/src/commands_install.cpp') diff --git a/toolsrc/src/commands_install.cpp b/toolsrc/src/commands_install.cpp index a0e2b40ad..f3da36fa0 100644 --- a/toolsrc/src/commands_install.cpp +++ b/toolsrc/src/commands_install.cpp @@ -22,8 +22,8 @@ namespace vcpkg::Commands::Install const fs::path package_prefix_path = paths.package_dir(bpgh.spec); const size_t prefix_length = package_prefix_path.native().size(); - const Triplet& target_triplet = bpgh.spec.triplet(); - const std::string& triplet_subfolder = target_triplet.canonical_name(); + const Triplet& triplet = bpgh.spec.triplet(); + const std::string& triplet_subfolder = triplet.canonical_name(); const fs::path triplet_subfolder_path = paths.installed / triplet_subfolder; std::error_code ec; fs::create_directory(triplet_subfolder_path, ec); -- cgit v1.2.3