mozart/cargoxx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[M6] preserve every probe's scratch under last-failure/<pkg>/

Browse Source
This commit is contained in:
Amadey Vorontsov
2026-05-15 13:43:16 +00:00
parent c46f3aa1f0
commit 8b396bcd0f
6 changed files with 79 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/cli/cmd_add.cpp
View File

@@ -77,9 +77,12 @@ auto record_lockfile_rev(const fs::path& project_root, const std::string& name,
return lockfile::write(lock, lock_path);
}
// Drives the resolver chain (Conan → vcpkg → nix-cmake-scan), running a
// real `cmd_build` against each candidate via verify_link. On success the
// overlay carries a confirmed row for the package.
// Drives the resolver chain (Conan → vcpkg → nix-cmake-scan → pc-scan),
// running a real `cmd_build` against each candidate via verify_link.
// On success the overlay carries a confirmed row for the package.
// Every probe's scratch project is preserved under
// `<XDG>/cargoxx/last-failure/<name>/<NN>-<probe>/` for inspection;
// the dir is wiped clean at the start of each call.
auto run_auto_resolution(const std::string& name, const std::string& version,
const std::vector<std::string>& components,
const fs::path& overlay_path) -> util::Result<void> {
@@ -87,17 +90,18 @@ auto run_auto_resolution(const std::string& name, const std::string& version,
return cmd_build(root, /*no_build=*/false, /*release=*/false,
/*target=*/std::nullopt, overlay_path);
};
const auto scratch_root =
std::filesystem::temp_directory_path() /
std::format("cargoxx-discover-{}", std::random_device{}());
const auto scratch_root = resolver::last_failure_dir(name);
std::error_code ec;
std::filesystem::remove_all(scratch_root, ec);
std::filesystem::create_directories(scratch_root, ec);
auto disc = resolver::discover(name, version, components, overlay_path,
scratch_root, build_fn);
std::error_code ec;
std::filesystem::remove_all(scratch_root, ec);
if (!disc) {
std::cerr << std::format(
"note: every probe attempt's scratch project is preserved at\n"
" {}/ — re-run cmake inside any subdir to reproduce.\n",
scratch_root.string());
return std::unexpected(disc.error());
}
return {};

13
src/cli/cmd_build.cpp
View File

@@ -160,14 +160,17 @@ auto cmd_build(const fs::path& project_root, bool no_build, bool release,
return cmd_build(root, /*no_build=*/false, /*release=*/false,
/*target=*/std::nullopt, effective_overlay);
};
const auto scratch_root =
std::filesystem::temp_directory_path() /
std::format("cargoxx-discover-{}", std::random_device{}());
auto disc = resolver::discover(name, version, components,
effective_overlay, scratch_root, build_fn);
const auto scratch_root = resolver::last_failure_dir(name);
std::error_code ec;
std::filesystem::remove_all(scratch_root, ec);
std::filesystem::create_directories(scratch_root, ec);
auto disc = resolver::discover(name, version, components,
effective_overlay, scratch_root, build_fn);
if (!disc) {
std::cerr << std::format(
"note: every probe attempt's scratch project is preserved at\n"
" {}/ — re-run cmake inside any subdir to reproduce.\n",
scratch_root.string());
return std::unexpected(disc.error());
}
return {};