From 89aaf195fbdfa63708fd6ac90103cac0cdedf3c6 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Thu, 1 Dec 2016 01:37:41 -0800 Subject: Remove unused variable --- toolsrc/include/vcpkg.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'toolsrc/include') diff --git a/toolsrc/include/vcpkg.h b/toolsrc/include/vcpkg.h index 832fb1920..2fc993616 100644 --- a/toolsrc/include/vcpkg.h +++ b/toolsrc/include/vcpkg.h @@ -7,19 +7,17 @@ namespace vcpkg { - extern bool g_do_dry_run; - StatusParagraphs database_load_check(const vcpkg_paths& paths); void install_package(const vcpkg_paths& paths, const BinaryParagraph& binary_paragraph, StatusParagraphs& status_db); void deinstall_package(const vcpkg_paths& paths, const package_spec& spec, StatusParagraphs& status_db); expected try_load_port(const fs::path& control_path); + inline expected try_load_port(const vcpkg_paths& paths, const std::string& name) { return try_load_port(paths.ports / name); } expected try_load_cached_package(const vcpkg_paths& paths, const package_spec& spec); - } // namespace vcpkg -- cgit v1.2.3 From 6eac44c9640a50fbde88535df6261a1a3f234350 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Thu, 1 Dec 2016 01:49:24 -0800 Subject: Move install_package() and deinstall_package() to the files of the appropriate commands --- toolsrc/include/vcpkg.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'toolsrc/include') diff --git a/toolsrc/include/vcpkg.h b/toolsrc/include/vcpkg.h index 2fc993616..ef78e213e 100644 --- a/toolsrc/include/vcpkg.h +++ b/toolsrc/include/vcpkg.h @@ -9,8 +9,7 @@ namespace vcpkg { StatusParagraphs database_load_check(const vcpkg_paths& paths); - void install_package(const vcpkg_paths& paths, const BinaryParagraph& binary_paragraph, StatusParagraphs& status_db); - void deinstall_package(const vcpkg_paths& paths, const package_spec& spec, StatusParagraphs& status_db); + void write_update(const vcpkg_paths& paths, const StatusParagraph& p); expected try_load_port(const fs::path& control_path); -- cgit v1.2.3 From 7c2abc755f58beaea36aa1cbc1c3b7f375e567a3 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Thu, 1 Dec 2016 15:36:39 -0800 Subject: Introduce function get_installed_files() --- toolsrc/include/vcpkg.h | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'toolsrc/include') diff --git a/toolsrc/include/vcpkg.h b/toolsrc/include/vcpkg.h index ef78e213e..75dc40b43 100644 --- a/toolsrc/include/vcpkg.h +++ b/toolsrc/include/vcpkg.h @@ -11,6 +11,14 @@ namespace vcpkg void write_update(const vcpkg_paths& paths, const StatusParagraph& p); + struct StatusParagraph_and_associated_files + { + StatusParagraph pgh; + std::vector files; + }; + + std::vector get_installed_files(const vcpkg_paths& paths, const StatusParagraphs& status_db); + expected try_load_port(const fs::path& control_path); inline expected try_load_port(const vcpkg_paths& paths, const std::string& name) -- cgit v1.2.3