diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2017-04-24 18:16:50 -0700 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2017-04-25 17:50:43 -0700 |
| commit | 7396e4ad633536025c0406b223c6a51abc09931f (patch) | |
| tree | a1ea628b3227950c36f33e06052a2e8200c99b95 /toolsrc/src/commands_export.cpp | |
| parent | ff639ecc0291bd4a27aacfb4c56b49712cfd16e6 (diff) | |
| download | vcpkg-7396e4ad633536025c0406b223c6a51abc09931f.tar.gz vcpkg-7396e4ad633536025c0406b223c6a51abc09931f.zip | |
`export`: Export directory now has the same name pattern as the zip/7z/nuget file
Diffstat (limited to 'toolsrc/src/commands_export.cpp')
| -rw-r--r-- | toolsrc/src/commands_export.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/toolsrc/src/commands_export.cpp b/toolsrc/src/commands_export.cpp index 57dcb5e88..1b7df0368 100644 --- a/toolsrc/src/commands_export.cpp +++ b/toolsrc/src/commands_export.cpp @@ -81,7 +81,7 @@ namespace vcpkg::Commands::Export Files::Filesystem& fs = paths.get_filesystem(); const std::string exported_dir_filename = exported_dir_path.filename().string(); - const std::string nuget_id = "vcpkg-" + exported_dir_filename; + const std::string nuget_id = exported_dir_filename; const std::string nupkg_version = "1.0.0"; const std::string nuspec_file_content = create_nuspec_file_contents(exported_dir_filename, nuget_id, nupkg_version); @@ -108,7 +108,7 @@ namespace vcpkg::Commands::Export const size_t bytes_written = std::strftime(mbstr, sizeof(mbstr), "%Y%m%d-%H%M%S", &date_time); Checks::check_exit(VCPKG_LINE_INFO, bytes_written == 15, "Expected 15 bytes to be written, but %u were written", bytes_written); const std::string date_time_as_string(mbstr); - return ("exported-" + date_time_as_string); + return ("vcpkg-exported-" + date_time_as_string); } enum class ArchiveFormat @@ -149,7 +149,7 @@ namespace vcpkg::Commands::Export const std::wstring option = get_option(format); const std::wstring exported_dir_filename = exported_dir_path.filename().native(); - const std::wstring exported_archive_filename = Strings::wformat(L"vcpkg-%s.%s", exported_dir_filename, extension); + const std::wstring exported_archive_filename = Strings::wformat(L"%s.%s", exported_dir_filename, extension); const std::wstring exported_archive_path = (paths.root / exported_archive_filename).native(); const fs::path& cmake_exe = paths.get_cmake_exe(); |
