diff options
Diffstat (limited to 'toolsrc/src')
22 files changed, 74 insertions, 63 deletions
diff --git a/toolsrc/src/vcpkg-test/util.cpp b/toolsrc/src/vcpkg-test/util.cpp index a2b9317a2..083861bc2 100644 --- a/toolsrc/src/vcpkg-test/util.cpp +++ b/toolsrc/src/vcpkg-test/util.cpp @@ -195,7 +195,9 @@ namespace vcpkg::Test ec.assign(errno, std::system_category()); } #else - (void)(target, file, ec); + (void)target; + (void)file; + (void)ec; vcpkg::Checks::exit_with_message(VCPKG_LINE_INFO, no_filesystem_message); #endif } @@ -217,7 +219,9 @@ namespace vcpkg::Test #elif FILESYSTEM_SYMLINK == FILESYSTEM_SYMLINK_UNIX ::vcpkg::Test::create_symlink(target, file, ec); #else - (void)(target, file, ec); + (void)target; + (void)file; + (void)ec; vcpkg::Checks::exit_with_message(VCPKG_LINE_INFO, no_filesystem_message); #endif } diff --git a/toolsrc/src/vcpkg/base/files.cpp b/toolsrc/src/vcpkg/base/files.cpp index 15a37a8b4..91f22bd2f 100644 --- a/toolsrc/src/vcpkg/base/files.cpp +++ b/toolsrc/src/vcpkg/base/files.cpp @@ -601,7 +601,7 @@ namespace vcpkg::Files std::error_code& ec) override { this->rename(oldpath, newpath, ec); - (void)(temp_suffix); + (void)temp_suffix; #if !defined(_WIN32) if (ec) { diff --git a/toolsrc/src/vcpkg/base/system.print.cpp b/toolsrc/src/vcpkg/base/system.print.cpp index 7366a810f..458f53155 100644 --- a/toolsrc/src/vcpkg/base/system.print.cpp +++ b/toolsrc/src/vcpkg/base/system.print.cpp @@ -22,7 +22,7 @@ namespace vcpkg::System #else // TODO: add color handling code // it should probably use VT-220 codes - (void)(c); + (void)c; System::print2(message); #endif } diff --git a/toolsrc/src/vcpkg/binarycaching.cpp b/toolsrc/src/vcpkg/binarycaching.cpp index 2cd9d1101..6b17461cc 100644 --- a/toolsrc/src/vcpkg/binarycaching.cpp +++ b/toolsrc/src/vcpkg/binarycaching.cpp @@ -207,7 +207,7 @@ namespace for (auto&& action : plan.install_actions) { - if (action.build_options.editable == Build::Editable::YES) continue; + if (!action.has_package_abi()) continue; auto& spec = action.spec; fs.remove_all(paths.package_dir(spec), VCPKG_LINE_INFO); diff --git a/toolsrc/src/vcpkg/build.cpp b/toolsrc/src/vcpkg/build.cpp index f163ef314..a0ff09327 100644 --- a/toolsrc/src/vcpkg/build.cpp +++ b/toolsrc/src/vcpkg/build.cpp @@ -871,6 +871,7 @@ namespace vcpkg::Build abi_tag_entries.emplace_back("features", Strings::join(";", sorted_feature_list)); if (action.build_options.use_head_version == UseHeadVersion::YES) abi_tag_entries.emplace_back("head", ""); + if (action.build_options.editable == Editable::YES) abi_tag_entries.emplace_back("editable", ""); Util::sort(abi_tag_entries); @@ -1019,7 +1020,7 @@ namespace vcpkg::Build std::error_code ec; const fs::path abi_package_dir = paths.package_dir(spec) / "share" / spec.name(); const fs::path abi_file_in_package = paths.package_dir(spec) / "share" / spec.name() / "vcpkg_abi_info.txt"; - if (action.build_options.editable == Build::Editable::NO) + if (action.has_package_abi()) { auto restore = binaries_provider.try_restore(paths, action); if (restore == RestoreResult::build_failed) @@ -1044,7 +1045,7 @@ namespace vcpkg::Build fs.copy_file(abi_file, abi_file_in_package, fs::copy_options::none, ec); Checks::check_exit(VCPKG_LINE_INFO, !ec, "Could not copy into file: %s", fs::u8string(abi_file_in_package)); - if (action.build_options.editable == Build::Editable::NO && result.code == BuildResult::SUCCEEDED) + if (action.has_package_abi() && result.code == BuildResult::SUCCEEDED) { binaries_provider.push_success(paths, action); } @@ -1089,7 +1090,7 @@ namespace vcpkg::Build #if defined(_WIN32) auto vcpkg_update_cmd = ".\\vcpkg"; #else - auto vcpkg_update_cmd = ".\/vcpkg"; + auto vcpkg_update_cmd = "./vcpkg"; #endif return Strings::format("Please ensure you're using the latest portfiles with `%s update`, then\n" "submit an issue at https://github.com/Microsoft/vcpkg/issues including:\n" diff --git a/toolsrc/src/vcpkg/commands.create.cpp b/toolsrc/src/vcpkg/commands.create.cpp index 3dba465af..b14b47a8f 100644 --- a/toolsrc/src/vcpkg/commands.create.cpp +++ b/toolsrc/src/vcpkg/commands.create.cpp @@ -20,7 +20,7 @@ namespace vcpkg::Commands::Create int perform(const VcpkgCmdArguments& args, const VcpkgPaths& paths) { - (void)(args.parse_arguments(COMMAND_STRUCTURE)); + (void)args.parse_arguments(COMMAND_STRUCTURE); const std::string port_name = args.command_arguments.at(0); const std::string url = args.command_arguments.at(1); diff --git a/toolsrc/src/vcpkg/commands.fetch.cpp b/toolsrc/src/vcpkg/commands.fetch.cpp index e4688fb0d..68df98700 100644 --- a/toolsrc/src/vcpkg/commands.fetch.cpp +++ b/toolsrc/src/vcpkg/commands.fetch.cpp @@ -16,8 +16,7 @@ namespace vcpkg::Commands::Fetch void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths) { - (void)(args.parse_arguments(COMMAND_STRUCTURE)); - + (void)args.parse_arguments(COMMAND_STRUCTURE); const std::string tool = args.command_arguments[0]; const fs::path tool_path = paths.get_tool_exe(tool); System::print2(fs::u8string(tool_path), '\n'); diff --git a/toolsrc/src/vcpkg/commands.hash.cpp b/toolsrc/src/vcpkg/commands.hash.cpp index 3b93b09bd..6b2e81c12 100644 --- a/toolsrc/src/vcpkg/commands.hash.cpp +++ b/toolsrc/src/vcpkg/commands.hash.cpp @@ -18,7 +18,7 @@ namespace vcpkg::Commands::Hash void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths) { - (void)(args.parse_arguments(COMMAND_STRUCTURE)); + (void)args.parse_arguments(COMMAND_STRUCTURE); const fs::path file_to_hash = args.command_arguments[0]; diff --git a/toolsrc/src/vcpkg/commands.integrate.cpp b/toolsrc/src/vcpkg/commands.integrate.cpp index 200c18e8b..3a682b4c9 100644 --- a/toolsrc/src/vcpkg/commands.integrate.cpp +++ b/toolsrc/src/vcpkg/commands.integrate.cpp @@ -533,7 +533,7 @@ With a project open, go to Tools->NuGet Package Manager->Package Manager Console void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths) { - (void)(args.parse_arguments(COMMAND_STRUCTURE)); + (void)args.parse_arguments(COMMAND_STRUCTURE); if (args.command_arguments[0] == Subcommand::INSTALL) { diff --git a/toolsrc/src/vcpkg/commands.owns.cpp b/toolsrc/src/vcpkg/commands.owns.cpp index bb5e19715..8bd020108 100644 --- a/toolsrc/src/vcpkg/commands.owns.cpp +++ b/toolsrc/src/vcpkg/commands.owns.cpp @@ -33,7 +33,7 @@ namespace vcpkg::Commands::Owns void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths) { - (void)(args.parse_arguments(COMMAND_STRUCTURE)); + (void)args.parse_arguments(COMMAND_STRUCTURE); const StatusParagraphs status_db = database_load_check(paths); search_file(paths, args.command_arguments[0], status_db); diff --git a/toolsrc/src/vcpkg/commands.porthistory.cpp b/toolsrc/src/vcpkg/commands.porthistory.cpp index 9e4cb2fe8..4313ab647 100644 --- a/toolsrc/src/vcpkg/commands.porthistory.cpp +++ b/toolsrc/src/vcpkg/commands.porthistory.cpp @@ -84,8 +84,7 @@ namespace vcpkg::Commands::PortHistory void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths) { - (void)(args.parse_arguments(COMMAND_STRUCTURE)); - + (void)args.parse_arguments(COMMAND_STRUCTURE); std::string port_name = args.command_arguments.at(0); std::vector<PortControlVersion> versions = read_versions_from_log(paths, port_name); System::print2(" version date vcpkg commit\n"); diff --git a/toolsrc/src/vcpkg/commands.portsdiff.cpp b/toolsrc/src/vcpkg/commands.portsdiff.cpp index d470470cd..a25d441c8 100644 --- a/toolsrc/src/vcpkg/commands.portsdiff.cpp +++ b/toolsrc/src/vcpkg/commands.portsdiff.cpp @@ -133,8 +133,7 @@ namespace vcpkg::Commands::PortsDiff void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths) { - (void)(args.parse_arguments(COMMAND_STRUCTURE)); - + (void)args.parse_arguments(COMMAND_STRUCTURE); const fs::path& git_exe = paths.get_tool_exe(Tools::GIT); const std::string git_commit_id_for_previous_snapshot = args.command_arguments.at(0); diff --git a/toolsrc/src/vcpkg/commands.upgrade.cpp b/toolsrc/src/vcpkg/commands.upgrade.cpp index dd42d76c4..5e9ed7ce2 100644 --- a/toolsrc/src/vcpkg/commands.upgrade.cpp +++ b/toolsrc/src/vcpkg/commands.upgrade.cpp @@ -81,41 +81,46 @@ namespace vcpkg::Commands::Upgrade else { std::vector<PackageSpec> not_installed; - std::vector<PackageSpec> no_portfile; + std::vector<PackageSpec> no_control_file; std::vector<PackageSpec> to_upgrade; std::vector<PackageSpec> up_to_date; for (auto&& spec : specs) { - auto it = status_db.find_installed(spec); - if (it == status_db.end()) + bool skip_version_check = false; + auto installed_status = status_db.find_installed(spec); + if (installed_status == status_db.end()) { not_installed.push_back(spec); + skip_version_check = true; } - auto maybe_scfl = provider.get_control_file(spec.name()); - if (auto p_scfl = maybe_scfl.get()) + auto maybe_control_file = provider.get_control_file(spec.name()); + if (!maybe_control_file.has_value()) { - if (it != status_db.end()) - { - if (p_scfl->source_control_file->core_paragraph->version != (*it)->package.version) - { - to_upgrade.push_back(spec); - } - else - { - up_to_date.push_back(spec); - } - } + no_control_file.push_back(spec); + skip_version_check = true; + } + + if (skip_version_check) continue; + + const auto& control_file = maybe_control_file.value_or_exit(VCPKG_LINE_INFO); + const auto& control_paragraph = *control_file.source_control_file->core_paragraph; + auto control_version = VersionT(control_paragraph.version, control_paragraph.port_version); + const auto& installed_paragraph = (*installed_status)->package; + auto installed_version = VersionT(installed_paragraph.version, installed_paragraph.port_version); + if (control_version == installed_version) + { + up_to_date.push_back(spec); } else { - no_portfile.push_back(spec); + to_upgrade.push_back(spec); } } Util::sort(not_installed); - Util::sort(no_portfile); + Util::sort(no_control_file); Util::sort(up_to_date); Util::sort(to_upgrade); @@ -137,16 +142,17 @@ namespace vcpkg::Commands::Upgrade '\n'); } - if (!no_portfile.empty()) + if (!no_control_file.empty()) { - System::print2(System::Color::error, "The following packages do not have a valid portfile:\n"); + System::print2(System::Color::error, + "The following packages do not have a valid CONTROL or vcpkg.json:\n"); System::print2(Strings::join("", - no_portfile, + no_control_file, [](const PackageSpec& spec) { return " " + spec.to_string() + "\n"; }), '\n'); } - Checks::check_exit(VCPKG_LINE_INFO, not_installed.empty() && no_portfile.empty()); + Checks::check_exit(VCPKG_LINE_INFO, not_installed.empty() && no_control_file.empty()); if (to_upgrade.empty()) Checks::exit_success(VCPKG_LINE_INFO); diff --git a/toolsrc/src/vcpkg/commands.version.cpp b/toolsrc/src/vcpkg/commands.version.cpp index 62f1d89c6..c7e33ee65 100644 --- a/toolsrc/src/vcpkg/commands.version.cpp +++ b/toolsrc/src/vcpkg/commands.version.cpp @@ -64,7 +64,7 @@ namespace vcpkg::Commands::Version #if defined(_WIN32) auto bootstrap = ".\\bootstrap-vcpkg.bat"; #else - auto bootstrap = ".\/bootstrap-vcpkg.sh"; + auto bootstrap = "./bootstrap-vcpkg.sh"; #endif System::printf(System::Color::warning, "Warning: Different source is available for vcpkg (%d.%d.%d -> %d.%d.%d). Use " @@ -90,8 +90,7 @@ namespace vcpkg::Commands::Version void perform_and_exit(const VcpkgCmdArguments& args, Files::Filesystem&) { - (void)(args.parse_arguments(COMMAND_STRUCTURE)); - + (void)args.parse_arguments(COMMAND_STRUCTURE); System::print2("Vcpkg package management program version ", version(), "\n" diff --git a/toolsrc/src/vcpkg/commands.xvsinstances.cpp b/toolsrc/src/vcpkg/commands.xvsinstances.cpp index 91bd1b943..67f35f542 100644 --- a/toolsrc/src/vcpkg/commands.xvsinstances.cpp +++ b/toolsrc/src/vcpkg/commands.xvsinstances.cpp @@ -28,7 +28,8 @@ namespace vcpkg::Commands::X_VSInstances Checks::exit_success(VCPKG_LINE_INFO); #else - (void)(args, paths); + (void)args; + (void)paths; Checks::exit_with_message(VCPKG_LINE_INFO, "This command is not supported on non-windows platforms."); #endif } diff --git a/toolsrc/src/vcpkg/dependencies.cpp b/toolsrc/src/vcpkg/dependencies.cpp index 9b37fe6da..4d03eb263 100644 --- a/toolsrc/src/vcpkg/dependencies.cpp +++ b/toolsrc/src/vcpkg/dependencies.cpp @@ -260,7 +260,7 @@ namespace vcpkg::Dependencies #if defined(_WIN32) auto vcpkg_remove_cmd = ".\\vcpkg"; #else - auto vcpkg_remove_cmd = ".\/vcpkg"; + auto vcpkg_remove_cmd = "./vcpkg"; #endif if (!maybe_scfl) Checks::exit_with_message( @@ -421,6 +421,11 @@ namespace vcpkg::Dependencies default: Checks::unreachable(VCPKG_LINE_INFO); } } + bool InstallPlanAction::has_package_abi() const + { + if (!abi_info) return false; + return !abi_info.get()->package_abi.empty(); + } const Build::PreBuildInfo& InstallPlanAction::pre_build_info(LineInfo linfo) const { return *abi_info.value_or_exit(linfo).pre_build_info.get(); diff --git a/toolsrc/src/vcpkg/help.cpp b/toolsrc/src/vcpkg/help.cpp index 60e636ed0..ded6592fb 100644 --- a/toolsrc/src/vcpkg/help.cpp +++ b/toolsrc/src/vcpkg/help.cpp @@ -109,7 +109,7 @@ namespace vcpkg::Help void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths) { - (void)(args.parse_arguments(COMMAND_STRUCTURE)); + (void)args.parse_arguments(COMMAND_STRUCTURE); if (args.command_arguments.empty()) { diff --git a/toolsrc/src/vcpkg/metrics.cpp b/toolsrc/src/vcpkg/metrics.cpp index c74b8541d..d5cd0a47f 100644 --- a/toolsrc/src/vcpkg/metrics.cpp +++ b/toolsrc/src/vcpkg/metrics.cpp @@ -380,9 +380,7 @@ namespace vcpkg::Metrics return; } -#if !defined(_WIN32) - (void)(payload); -#else +#if defined(_WIN32) HINTERNET connect = nullptr, request = nullptr; BOOL results = FALSE; @@ -464,13 +462,15 @@ namespace vcpkg::Metrics __debugbreak(); auto err = GetLastError(); std::cerr << "[DEBUG] failed to connect to server: " << err << "\n"; -#endif +#endif // NDEBUG } if (request) WinHttpCloseHandle(request); if (connect) WinHttpCloseHandle(connect); if (session) WinHttpCloseHandle(session); -#endif +#else // ^^^ _WIN32 // !_WIN32 vvv + (void)payload; +#endif // ^^^ !_WIN32 } void Metrics::flush(Files::Filesystem& fs) diff --git a/toolsrc/src/vcpkg/postbuildlint.cpp b/toolsrc/src/vcpkg/postbuildlint.cpp index a067b8fc0..7b8e65ed6 100644 --- a/toolsrc/src/vcpkg/postbuildlint.cpp +++ b/toolsrc/src/vcpkg/postbuildlint.cpp @@ -556,7 +556,8 @@ namespace vcpkg::PostBuildLint return LintStatus::ERROR_DETECTED; } #endif - (void)expected_architecture, (void)files; + (void)expected_architecture; + (void)files; return LintStatus::SUCCESS; } diff --git a/toolsrc/src/vcpkg/sourceparagraph.cpp b/toolsrc/src/vcpkg/sourceparagraph.cpp index ed26f4497..84d9eec78 100644 --- a/toolsrc/src/vcpkg/sourceparagraph.cpp +++ b/toolsrc/src/vcpkg/sourceparagraph.cpp @@ -182,7 +182,7 @@ namespace vcpkg #if defined(_WIN32) auto bootstrap = ".\\bootstrap-vcpkg.bat"; #else - auto bootstrap = ".\/bootstrap-vcpkg.sh"; + auto bootstrap = "./bootstrap-vcpkg.sh"; #endif System::print2("You may need to update the vcpkg binary; try running %s to update.\n\n", bootstrap); } diff --git a/toolsrc/src/vcpkg/tools.cpp b/toolsrc/src/vcpkg/tools.cpp index acfa9082b..5531a1dac 100644 --- a/toolsrc/src/vcpkg/tools.cpp +++ b/toolsrc/src/vcpkg/tools.cpp @@ -136,10 +136,7 @@ namespace vcpkg virtual const std::string& exe_stem() const = 0; virtual std::array<int, 3> default_min_version() const = 0; - virtual void add_special_paths(std::vector<fs::path>& out_candidate_paths) const - { - (void)(out_candidate_paths); - } + virtual void add_special_paths(std::vector<fs::path>& out_candidate_paths) const { (void)out_candidate_paths; } virtual Optional<std::string> get_version(const VcpkgPaths& paths, const fs::path& path_to_exe) const = 0; }; @@ -283,7 +280,7 @@ namespace vcpkg out_candidate_paths.push_back(*pf / "CMake" / "bin" / "cmake.exe"); #else // TODO: figure out if this should do anything on non-Windows - (void)(out_candidate_paths); + (void)out_candidate_paths; #endif } virtual Optional<std::string> get_version(const VcpkgPaths&, const fs::path& path_to_exe) const override @@ -342,7 +339,7 @@ CMake suite maintained and supported by Kitware (kitware.com/cmake). #ifndef _WIN32 cmd.path_arg(paths.get_tool_exe(Tools::MONO)); #else - (void)(paths); + (void)paths; #endif cmd.path_arg(path_to_exe); const auto rc = System::cmd_execute_and_capture_output(cmd.extract()); @@ -380,7 +377,7 @@ Type 'NuGet help <command>' for help on a specific command. out_candidate_paths.push_back(*pf / "git" / "cmd" / "git.exe"); #else // TODO: figure out if this should do anything on non-windows - (void)(out_candidate_paths); + (void)out_candidate_paths; #endif } @@ -441,7 +438,7 @@ Mono JIT compiler version 6.8.0.105 (Debian 6.8.0.105+dfsg-2 Wed Feb 26 23:23:50 virtual void add_special_paths(std::vector<fs::path>& out_candidate_paths) const override { - (void)(out_candidate_paths); + (void)out_candidate_paths; // TODO: Uncomment later // const std::vector<fs::path> from_path = Files::find_from_PATH("installerbase"); // candidate_paths.insert(candidate_paths.end(), from_path.cbegin(), from_path.cend()); diff --git a/toolsrc/src/vcpkg/update.cpp b/toolsrc/src/vcpkg/update.cpp index 2e88facfd..73958c540 100644 --- a/toolsrc/src/vcpkg/update.cpp +++ b/toolsrc/src/vcpkg/update.cpp @@ -53,7 +53,7 @@ namespace vcpkg::Update void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths) { - (void)(args.parse_arguments(COMMAND_STRUCTURE)); + (void)args.parse_arguments(COMMAND_STRUCTURE); System::print2("Using local portfile versions. To update the local portfiles, use `git pull`.\n"); const StatusParagraphs status_db = database_load_check(paths); @@ -78,7 +78,7 @@ namespace vcpkg::Update #if defined(_WIN32) auto vcpkg_cmd = ".\\vcpkg"; #else - auto vcpkg_cmd = ".\/vcpkg"; + auto vcpkg_cmd = "./vcpkg"; #endif System::print2("\n" "To update these packages and all dependencies, run\n" |