3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-01 21:58:55 +08:00
Code Issues Projects Releases Wiki Activity

[InstallationDirs] Better name for static factory

Browse Source
This commit is contained in:
Alexander Karatarakis 2017-04-19 13:52:15 -07:00
parent 2cccd03966
commit 6d04f6612e
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
toolsrc/include/vcpkg_Commands.h
View File

@ -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.

16
toolsrc/src/commands_install.cpp
View File

@ -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);