aboutsummaryrefslogtreecommitdiff
path: root/toolsrc/include
diff options
context:
space:
mode:
authorAlexander Karatarakis <alkarata@microsoft.com>2017-04-19 17:48:43 -0700
committerAlexander Karatarakis <alkarata@microsoft.com>2017-04-21 18:06:40 -0700
commit47322f74bdefea394fdd07989a9535c35caeb8a3 (patch)
tree6510bc15d4ff7f495a73caa75cfd59db5c8176ff /toolsrc/include
parent96955c08e763bea33399090881cf75578f172f34 (diff)
downloadvcpkg-47322f74bdefea394fdd07989a9535c35caeb8a3.tar.gz
vcpkg-47322f74bdefea394fdd07989a9535c35caeb8a3.zip
Move source_dir outside of InstallDir struct
Diffstat (limited to 'toolsrc/include')
-rw-r--r--toolsrc/include/vcpkg_Commands.h7
1 files changed, 2 insertions, 5 deletions
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);
}