mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-24 21:59:10 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[vcpkg] Use unzip/zip on non-windows

Browse Source
This commit is contained in:
Robert Schumacher 2018-03-09 03:51:19 -08:00
parent f56a5e4e94
commit 81b58d1868
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
toolsrc/src/vcpkg/build.cpp
View File

@ -438,10 +438,15 @@ namespace vcpkg::Build
auto files = fs.get_files_non_recursive(pkg_path); auto files = fs.get_files_non_recursive(pkg_path);
Checks::check_exit(VCPKG_LINE_INFO, files.empty(), "unable to clear path: %s", pkg_path.u8string()); Checks::check_exit(VCPKG_LINE_INFO, files.empty(), "unable to clear path: %s", pkg_path.u8string());
#if defined(_WIN32)
auto&& _7za = paths.get_7za_exe(); auto&& _7za = paths.get_7za_exe();
System::cmd_execute_clean(Strings::format( System::cmd_execute_clean(Strings::format(
R"("%s" x "%s" -o"%s" -y >nul)", _7za.u8string(), archive_path.u8string(), pkg_path.u8string())); R"("%s" x "%s" -o"%s" -y >nul)", _7za.u8string(), archive_path.u8string(), pkg_path.u8string()));
#else
System::cmd_execute_clean(Strings::format(
R"(unzip -qq "%s" "-d%s")", archive_path.u8string(), pkg_path.u8string()));
#endif
auto maybe_bcf = Paragraphs::try_load_cached_control_package(paths, spec); auto maybe_bcf = Paragraphs::try_load_cached_control_package(paths, spec);
bcf = std::make_unique<BinaryControlFile>(std::move(maybe_bcf).value_or_exit(VCPKG_LINE_INFO)); bcf = std::make_unique<BinaryControlFile>(std::move(maybe_bcf).value_or_exit(VCPKG_LINE_INFO));
@ -538,6 +543,7 @@ namespace vcpkg::Build
!fs.exists(tmp_archive_path), !fs.exists(tmp_archive_path),
"Could not remove file: %s", "Could not remove file: %s",
tmp_archive_path.u8string()); tmp_archive_path.u8string());
#if defined(_WIN32)
auto&& _7za = paths.get_7za_exe(); auto&& _7za = paths.get_7za_exe();
System::cmd_execute_clean(Strings::format( System::cmd_execute_clean(Strings::format(
@ -545,7 +551,12 @@ namespace vcpkg::Build
_7za.u8string(), _7za.u8string(),
tmp_archive_path.u8string(), tmp_archive_path.u8string(),
paths.package_dir(spec).u8string())); paths.package_dir(spec).u8string()));
#else
System::cmd_execute_clean(Strings::format(
R"(cd '%s' && zip --quiet -r '%s' *)",
paths.package_dir(spec).u8string(),
tmp_archive_path.u8string()));
#endif
fs.create_directories(archives_dir, ec); fs.create_directories(archives_dir, ec);
fs.rename(tmp_archive_path, archive_path); fs.rename(tmp_archive_path, archive_path);