From 47322f74bdefea394fdd07989a9535c35caeb8a3 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Wed, 19 Apr 2017 17:48:43 -0700 Subject: Move source_dir outside of InstallDir struct --- toolsrc/include/vcpkg_Commands.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'toolsrc/include') diff --git a/toolsrc/include/vcpkg_Commands.h b/toolsrc/include/vcpkg_Commands.h index f137747ee..9760b5a35 100644 --- a/toolsrc/include/vcpkg_Commands.h +++ b/toolsrc/include/vcpkg_Commands.h @@ -45,25 +45,22 @@ namespace vcpkg::Commands { struct InstallDir { - static InstallDir from_destination_root(const fs::path& source_dir, - const fs::path& destination_root, + static InstallDir from_destination_root(const fs::path& destination_root, const std::string& destination_subdirectory, const fs::path& listfile); private: - fs::path m_source_dir; // "source" from source-destination, not source code. fs::path m_destination; std::string m_destination_subdirectory; fs::path m_listfile; public: - const fs::path& source_dir() const; const fs::path& destination() const; const std::string& destination_subdirectory() const; const fs::path& listfile() const; }; - void install_files_and_write_listfile(Files::Filesystem& fs, const InstallDir& dirs); + void install_files_and_write_listfile(Files::Filesystem& fs, const fs::path& source_dir, const InstallDir& 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); } -- cgit v1.2.3