aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Karatarakis <alkarata@microsoft.com>2017-04-17 17:13:51 -0700
committerAlexander Karatarakis <alkarata@microsoft.com>2017-04-17 19:03:51 -0700
commit9b5275bb85fe5d55e8287bddb71b71bfac0e82c1 (patch)
tree6b05fc9e0bdad4709fa2520887d2b14989d4ee93
parentd52ddf82632c5d92e966173b4d52f58e5189bc8f (diff)
downloadvcpkg-9b5275bb85fe5d55e8287bddb71b71bfac0e82c1.tar.gz
vcpkg-9b5275bb85fe5d55e8287bddb71b71bfac0e82c1.zip
Make install_and_write_listfile() public
(also rename it)
-rw-r--r--toolsrc/include/vcpkg_Commands.h9
-rw-r--r--toolsrc/src/commands_install.cpp12
2 files changed, 11 insertions, 10 deletions
diff --git a/toolsrc/include/vcpkg_Commands.h b/toolsrc/include/vcpkg_Commands.h
index bb25812ac..21c82cea2 100644
--- a/toolsrc/include/vcpkg_Commands.h
+++ b/toolsrc/include/vcpkg_Commands.h
@@ -43,6 +43,15 @@ namespace vcpkg::Commands
namespace Install
{
+ struct InstallationDirs
+ {
+ fs::path source_dir; // "source" from source-destination, not source code.
+ fs::path destination_root;
+ std::string destination_subdirectory;
+ fs::path listfile;
+ };
+
+ void install_files_and_write_listfile(Files::Filesystem& fs, const InstallationDirs& dirs);
void install_package(const VcpkgPaths& paths, const BinaryParagraph& binary_paragraph, StatusParagraphs* status_db);
void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_triplet);
}
diff --git a/toolsrc/src/commands_install.cpp b/toolsrc/src/commands_install.cpp
index 50cc6ed85..05d1e32eb 100644
--- a/toolsrc/src/commands_install.cpp
+++ b/toolsrc/src/commands_install.cpp
@@ -15,15 +15,7 @@ namespace vcpkg::Commands::Install
using Dependencies::RequestType;
using Dependencies::InstallPlanType;
- struct InstallationDirs
- {
- fs::path source_dir; // "source" from source-destination, not source code.
- fs::path destination_root;
- std::string destination_subdirectory;
- fs::path listfile;
- };
-
- static void install_and_write_listfile(Files::Filesystem& fs, const InstallationDirs& dirs)
+ void install_files_and_write_listfile(Files::Filesystem& fs, const InstallationDirs& dirs)
{
std::vector<std::string> output;
@@ -229,7 +221,7 @@ namespace vcpkg::Commands::Install
dirs.destination_subdirectory = triplet.to_string();
dirs.listfile = paths.listfile_path(binary_paragraph);
- install_and_write_listfile(paths.get_filesystem(), dirs);
+ install_files_and_write_listfile(paths.get_filesystem(), dirs);
source_paragraph.state = InstallState::INSTALLED;
write_update(paths, source_paragraph);