3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-27 18:31:15 +08:00
Code Issues Projects Releases Wiki Activity

[vcpkg] Improve error reporting for vcpkg_abi_info.txt copy failure. (#15871)

Browse Source 
In build https://dev.azure.com/vcpkg/public/_build/results?buildId=48398

we are getting output like:

```
Error: Building package v-hacd:x64-windows-static failed with: BUILD_FAILED
Elapsed time for package v-hacd:x64-windows-static: 4.156 s
Starting package 1396/1464: v8:x64-windows-static
Building package v8[core]:x64-windows-static...
-- Using msys root at D:/downloads/tools/msys2/969c0913b9df89e1
-- Fetching https://chromium.googlesource.com/v8/v8.git...
CMake Error at scripts/cmake/vcpkg_execute_required_process.cmake:108 (message):
    Command failed: C:/agent/externals/git/cmd/git.exe fetch https://chromium.googlesource.com/v8/v8.git 7565e93eb72cea4268028fc20186d415c22b1cff --depth 1 -n
    Working Directory: D:/downloads/git-tmp
    Error code: 128
    See logs for more information:
      D:\buildtrees\v8\git-fetch-x64-windows-static-err.log

Call Stack (most recent call first):
  scripts/cmake/vcpkg_from_git.cmake:91 (vcpkg_execute_required_process)
  ports/v8/portfile.cmake:71 (vcpkg_from_git)
  scripts/ports.cmake:128 (include)

Could not copy into file: D:\packages\v8_x64-windows-static\share\v8\vcpkg_abi_info.txt
```

but aren't printing the reason for the copy failure. Added printing of that reason.
This commit is contained in:
Billy O'Neal 2021-01-25 12:21:12 -08:00 committed by GitHub
parent 1d866090fb
commit dbf5193ebb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1134,7 +1134,7 @@ namespace vcpkg::Build
const IBuildLogsRecorder& build_logs_recorder,
const StatusParagraphs& status_db)
{
auto& fs = paths.get_filesystem();
auto& filesystem = paths.get_filesystem();
auto& spec = action.spec;
const std::string& name = action.source_control_file_location.value_or_exit(VCPKG_LINE_INFO)
.source_control_file->core_paragraph->name;
@ -1177,7 +1177,6 @@ namespace vcpkg::Build
auto& abi_file = *abi_info.abi_tag_file.get();
std::error_code ec;
const fs::path abi_package_dir = paths.package_dir(spec) / "share" / spec.name();
const fs::path abi_file_in_package = paths.package_dir(spec) / "share" / spec.name() / "vcpkg_abi_info.txt";
if (action.has_package_abi())
@ -1204,18 +1203,35 @@ namespace vcpkg::Build
}
ExtendedBuildResult result = do_build_package_and_clean_buildtrees(args, paths, action);
build_logs_recorder.record_build_result(paths, spec, result.code);
fs.create_directories(abi_package_dir, ec);
fs.copy_file(abi_file, abi_file_in_package, fs::copy_options::none, ec);
Checks::check_exit(VCPKG_LINE_INFO, !ec, "Could not copy into file: %s", fs::u8string(abi_file_in_package));
std::error_code ec;
filesystem.create_directories(abi_package_dir, ec);
if (ec)
{
Checks::exit_with_message(VCPKG_LINE_INFO,
Strings::format("Could not create %s: %s (%d)",
fs::u8string(abi_package_dir).c_str(),
ec.message().c_str(),
ec.value()));
}
filesystem.copy_file(abi_file, abi_file_in_package, fs::copy_options::none, ec);
if (ec)
{
Checks::exit_with_message(VCPKG_LINE_INFO,
Strings::format("Could not copy %s -> %s: %s (%d)",
fs::u8string(abi_file).c_str(),
fs::u8string(abi_file_in_package).c_str(),
ec.message().c_str(),
ec.value()));
}
if (action.has_package_abi() && result.code == BuildResult::SUCCEEDED)
{
binaries_provider.push_success(paths, action);
}
build_logs_recorder.record_build_result(paths, spec, result.code);
return result;
}