From fd183d9ad189199413800370c8c3d8858b903a22 Mon Sep 17 00:00:00 2001 From: Peter Bright Date: Thu, 7 Mar 2019 12:28:12 -0500 Subject: Mark overridden functions with override. (#5585) * Update files.cpp * Mark overrides with override. --- toolsrc/src/vcpkg/base/files.cpp | 2 +- toolsrc/src/vcpkg/tools.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'toolsrc/src') diff --git a/toolsrc/src/vcpkg/base/files.cpp b/toolsrc/src/vcpkg/base/files.cpp index f9bce8631..1740b6f6d 100644 --- a/toolsrc/src/vcpkg/base/files.cpp +++ b/toolsrc/src/vcpkg/base/files.cpp @@ -216,7 +216,7 @@ namespace vcpkg::Files { return fs::stdfs::copy_file(oldpath, newpath, opts, ec); } - virtual void copy_symlink(const fs::path& oldpath, const fs::path& newpath, std::error_code& ec) + virtual void copy_symlink(const fs::path& oldpath, const fs::path& newpath, std::error_code& ec) override { return fs::stdfs::copy_symlink(oldpath, newpath, ec); } diff --git a/toolsrc/src/vcpkg/tools.cpp b/toolsrc/src/vcpkg/tools.cpp index b713b2752..99a2f4fb8 100644 --- a/toolsrc/src/vcpkg/tools.cpp +++ b/toolsrc/src/vcpkg/tools.cpp @@ -364,7 +364,7 @@ Type 'NuGet help ' for help on a specific command. virtual const std::string& exe_stem() const override { return m_exe; } virtual std::array default_min_version() const override { return {2, 7, 4}; } - virtual void add_special_paths(std::vector& out_candidate_paths) const + virtual void add_special_paths(std::vector& out_candidate_paths) const override { #if defined(_WIN32) const auto& program_files = System::get_program_files_platform_bitness(); @@ -403,7 +403,7 @@ git version 2.17.1.windows.2 virtual const std::string& exe_stem() const override { return m_exe; } virtual std::array default_min_version() const override { return {0, 0, 0}; } - virtual void add_special_paths(std::vector& out_candidate_paths) const + virtual void add_special_paths(std::vector& out_candidate_paths) const override { // TODO: Uncomment later // const std::vector from_path = Files::find_from_PATH("installerbase"); -- cgit v1.2.3 From 32f1120b9f7181b3db4537b9eb1c966d22b0dfe1 Mon Sep 17 00:00:00 2001 From: myd7349 Date: Sat, 9 Mar 2019 06:38:23 +0800 Subject: [vcpkg edit] Update find_from_registry (#5393) --- toolsrc/src/vcpkg/commands.edit.cpp | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) (limited to 'toolsrc/src') diff --git a/toolsrc/src/vcpkg/commands.edit.cpp b/toolsrc/src/vcpkg/commands.edit.cpp index c9d52c572..83ddea014 100644 --- a/toolsrc/src/vcpkg/commands.edit.cpp +++ b/toolsrc/src/vcpkg/commands.edit.cpp @@ -13,16 +13,37 @@ namespace vcpkg::Commands::Edit std::vector output; #if defined(_WIN32) - static const std::array REGKEYS = { - R"(SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\{C26E74D1-022E-4238-8B9D-1E7564A36CC9}_is1)", - R"(SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{1287CAD5-7C8D-410D-88B9-0D1EE4A83FF2}_is1)", - R"(SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\{F8A2A208-72B3-4D61-95FC-8A65D340689B}_is1)", + struct RegKey + { + HKEY root; + const char *subkey; + } REGKEYS[] = { + { + HKEY_LOCAL_MACHINE, + R"(SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\{C26E74D1-022E-4238-8B9D-1E7564A36CC9}_is1)" + }, + { + HKEY_LOCAL_MACHINE, + R"(SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{1287CAD5-7C8D-410D-88B9-0D1EE4A83FF2}_is1)" + }, + { + HKEY_LOCAL_MACHINE, + R"(SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\{F8A2A208-72B3-4D61-95FC-8A65D340689B}_is1)" + }, + { + HKEY_CURRENT_USER, + R"(Software\Microsoft\Windows\CurrentVersion\Uninstall\{771FD6B0-FA20-440A-A002-3B3BAC16DC50}_is1)" + }, + { + HKEY_LOCAL_MACHINE, + R"(SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{EA457B21-F73E-494C-ACAB-524FDE069978}_is1)" + }, }; for (auto&& keypath : REGKEYS) { const Optional code_installpath = - System::get_registry_string(HKEY_LOCAL_MACHINE, keypath, "InstallLocation"); + System::get_registry_string(keypath.root, keypath.subkey, "InstallLocation"); if (const auto c = code_installpath.get()) { const fs::path install_path = fs::path(*c); -- cgit v1.2.3 From eafe9ebcdf191ad0fff98c0f060000edb208318d Mon Sep 17 00:00:00 2001 From: Bo Rydberg <2945606+bolry@users.noreply.github.com> Date: Sun, 10 Mar 2019 19:05:15 +0100 Subject: Fix missing terminator .bashrc integration (#5616) Add NL to last line in ~/.bashrc file --- toolsrc/src/vcpkg/commands.integrate.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'toolsrc/src') diff --git a/toolsrc/src/vcpkg/commands.integrate.cpp b/toolsrc/src/vcpkg/commands.integrate.cpp index c1d3a8c8d..acac3293f 100644 --- a/toolsrc/src/vcpkg/commands.integrate.cpp +++ b/toolsrc/src/vcpkg/commands.integrate.cpp @@ -443,7 +443,7 @@ With a project open, go to Tools->NuGet Package Manager->Package Manager Console System::print("Adding vcpkg completion entry to %s\n", bashrc_path.u8string()); bashrc_content.push_back(Strings::format("source %s", completion_script_path.u8string())); - fs.write_contents(bashrc_path, Strings::join("\n", bashrc_content)); + fs.write_contents(bashrc_path, Strings::join("\n", bashrc_content) + '\n'); Checks::exit_success(VCPKG_LINE_INFO); } #endif -- cgit v1.2.3