diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2017-04-19 13:52:15 -0700 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2017-04-20 14:10:57 -0700 |
| commit | 6d04f6612eaf51cd80c559e02c141bee770233df (patch) | |
| tree | 60f15b91017f58d05f1924b9a42cbfcc7c3f8273 /toolsrc | |
| parent | 2cccd03966969a376f60e6b8658e1db60a2c2a6f (diff) | |
| download | vcpkg-6d04f6612eaf51cd80c559e02c141bee770233df.tar.gz vcpkg-6d04f6612eaf51cd80c559e02c141bee770233df.zip | |
[InstallationDirs] Better name for static factory
Diffstat (limited to 'toolsrc')
| -rw-r--r-- | toolsrc/include/vcpkg_Commands.h | 8 | ||||
| -rw-r--r-- | toolsrc/src/commands_install.cpp | 16 |
2 files changed, 12 insertions, 12 deletions
diff --git a/toolsrc/include/vcpkg_Commands.h b/toolsrc/include/vcpkg_Commands.h index 40c15688e..629b0804d 100644 --- a/toolsrc/include/vcpkg_Commands.h +++ b/toolsrc/include/vcpkg_Commands.h @@ -45,10 +45,10 @@ namespace vcpkg::Commands { struct InstallationDirs { - static InstallationDirs initiliaze(const fs::path& source_dir, - const fs::path& destination_root, - const std::string& destination_subdirectory, - const fs::path& listfile); + static InstallationDirs from_destination_root(const fs::path& source_dir, + 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. diff --git a/toolsrc/src/commands_install.cpp b/toolsrc/src/commands_install.cpp index 25e2557cf..d846e7366 100644 --- a/toolsrc/src/commands_install.cpp +++ b/toolsrc/src/commands_install.cpp @@ -15,10 +15,10 @@ namespace vcpkg::Commands::Install using Dependencies::RequestType; using Dependencies::InstallPlanType; - InstallationDirs InstallationDirs::initiliaze(const fs::path& source_dir, - const fs::path& destination_root, - const std::string& destination_subdirectory, - const fs::path& listfile) + InstallationDirs InstallationDirs::from_destination_root(const fs::path& source_dir, + const fs::path& destination_root, + const std::string& destination_subdirectory, + const fs::path& listfile) { InstallationDirs dirs; dirs.m_source_dir = source_dir; @@ -256,10 +256,10 @@ namespace vcpkg::Commands::Install write_update(paths, source_paragraph); status_db->insert(std::make_unique<StatusParagraph>(source_paragraph)); - const InstallationDirs dirs = InstallationDirs::initiliaze(package_dir, - paths.installed, - triplet.to_string(), - paths.listfile_path(binary_paragraph)); + const InstallationDirs dirs = InstallationDirs::from_destination_root(package_dir, + paths.installed, + triplet.to_string(), + paths.listfile_path(binary_paragraph)); install_files_and_write_listfile(paths.get_filesystem(), dirs); |