Rework and parallelize abi hashing

include/vcpkg/abi.h

@@ -0,0 +1,66 @@
+#pragma once
+
+#include <vcpkg/fwd/abi.h>
+#include <vcpkg/fwd/cmakevars.h>
+#include <vcpkg/fwd/dependencies.h>
+#include <vcpkg/fwd/vcpkgpaths.h>
+
+#include <vcpkg/base/optional.h>
+#include <vcpkg/base/path.h>
+
+#include <vcpkg/commands.build.h>
+#include <vcpkg/statusparagraphs.h>
+
+#include <memory>
+#include <string>
+#include <vector>
+
+namespace vcpkg
+{
+    struct AbiEntry
+    {
+        std::string key;
+        std::string value;
+
+        AbiEntry() = default;
+        AbiEntry(std::string key, std::string value) : key(std::move(key)), value(std::move(value)) { }
+
+        bool operator<(const AbiEntry& other) const noexcept
+        {
+            return key < other.key || (key == other.key && value < other.value);
+        }
+    };
+
+    struct AbiInfo
+    {
+        // These should always be known if an AbiInfo exists
+        std::unique_ptr<PreBuildInfo> pre_build_info;
+        Optional<const Toolset&> toolset;
+        // These might not be known if compiler tracking is turned off or the port is --editable
+        Optional<const CompilerInfo&> compiler_info;
+        Optional<const std::string&> triplet_abi;
+        std::string package_abi;
+
+        // Checks if full abi tag was created
+        bool abi_tag_complete() const noexcept { return package_abi.size() != 0; }
+
+        void abi_file_contents(std::string&& abi_tag, std::string&& sbom_file) noexcept
+        {
+            abi_tag_file_contents.emplace(std::move(abi_tag));
+            sbom_file_contents.emplace(std::move(sbom_file));
+        }
+
+        // PRE: abi_tag_complete() == true
+        //  dir: Directory where the files should be saved, usually packages_dir/share
+        void save_abi_files(const Filesystem& fs, Path&& dir) const;
+
+    private:
+        Optional<std::string> abi_tag_file_contents;
+        Optional<std::string> sbom_file_contents;
+    };
+
+    void compute_all_abis(const VcpkgPaths& paths,
+                          ActionPlan& action_plan,
+                          const CMakeVars::CMakeVarProvider& var_provider,
+                          const StatusParagraphs& status_db);
+} // namespace vcpkg

include/vcpkg/base/path.h

@@ -21,7 +21,8 @@ namespace vcpkg
 
         const char* c_str() const noexcept;
 
-        std::string generic_u8string() const;
+        std::string generic_u8string() const&;
+        std::string generic_u8string() &&;
 
         bool empty() const noexcept;
 

include/vcpkg/commands.build.h

@@ -212,20 +212,6 @@ namespace vcpkg
 
     BuildInfo read_build_info(const ReadOnlyFilesystem& fs, const Path& filepath);
 
-    struct AbiEntry
-    {
-        std::string key;
-        std::string value;
-
-        AbiEntry() = default;
-        AbiEntry(StringView key, StringView value) : key(key.to_string()), value(value.to_string()) { }
-
-        bool operator<(const AbiEntry& other) const
-        {
-            return key < other.key || (key == other.key && value < other.value);
-        }
-    };
-
     struct CompilerInfo
     {
         std::string id;
@@ -234,26 +220,6 @@ namespace vcpkg
         std::string path;
     };
 
-    struct AbiInfo
-    {
-        // These should always be known if an AbiInfo exists
-        std::unique_ptr<PreBuildInfo> pre_build_info;
-        Optional<const Toolset&> toolset;
-        // These might not be known if compiler tracking is turned off or the port is --editable
-        Optional<const CompilerInfo&> compiler_info;
-        Optional<const std::string&> triplet_abi;
-        std::string package_abi;
-        Optional<Path> abi_tag_file;
-        std::vector<Path> relative_port_files;
-        std::vector<std::string> relative_port_hashes;
-        std::vector<Json::Value> heuristic_resources;
-    };
-
-    void compute_all_abis(const VcpkgPaths& paths,
-                          ActionPlan& action_plan,
-                          const CMakeVars::CMakeVarProvider& var_provider,
-                          const StatusParagraphs& status_db);
-
     struct EnvCache
     {
         explicit EnvCache(bool compiler_tracking) : m_compiler_tracking(compiler_tracking) { }

include/vcpkg/dependencies.h

@@ -7,6 +7,7 @@
 
 #include <vcpkg/base/optional.h>
 
+#include <vcpkg/abi.h>
 #include <vcpkg/commands.build.h>
 #include <vcpkg/packagespec.h>
 #include <vcpkg/statusparagraph.h>

include/vcpkg/fwd/abi.h

@@ -0,0 +1,7 @@
+#pragma once
+
+namespace vcpkg
+{
+    struct AbiInfo;
+    struct AbiEntry;
+}

include/vcpkg/fwd/build.h

@@ -134,9 +134,7 @@ namespace vcpkg
     struct PreBuildInfo;
     struct ExtendedBuildResult;
     struct BuildInfo;
-    struct AbiEntry;
     struct CompilerInfo;
-    struct AbiInfo;
     struct EnvCache;
     struct BuildCommand;
 }

include/vcpkg/spdx.h

@@ -4,6 +4,7 @@
 #include <vcpkg/base/fwd/json.h>
 #include <vcpkg/base/fwd/stringview.h>
 
+#include <vcpkg/fwd/abi.h>
 #include <vcpkg/fwd/dependencies.h>
 
 #include <vcpkg/base/span.h>
@@ -23,11 +24,14 @@ namespace vcpkg
     /// @param resource_docs Additional documents to concatenate into the created document. These are intended to
     /// capture fetched resources, such as tools or source archives.
     std::string create_spdx_sbom(const InstallPlanAction& action,
-                                 View<Path> relative_paths,
-                                 View<std::string> hashes,
+                                 View<AbiEntry> port_files_abi,
                                  std::string created_time,
                                  std::string document_namespace,
                                  std::vector<Json::Value>&& resource_docs);
 
     Json::Value run_resource_heuristics(StringView contents, StringView portRawVersion);
+    std::string write_sbom(const InstallPlanAction& action,
+                           std::vector<Json::Value>&& heuristic_resources,
+                           const std::vector<AbiEntry>& port_files_abi,
+                           StringView uuid);
 }

include/vcpkg/vcpkgpaths.h

@@ -58,8 +58,6 @@ namespace vcpkg
         Path build_info_file_path(const PackageSpec& spec) const;
 
         const TripletDatabase& get_triplet_db() const;
-        const std::map<std::string, std::string>& get_cmake_script_hashes() const;
-        StringView get_ports_cmake_hash() const;
 
         LockFile& get_installed_lockfile() const;
         void flush_lockfile() const;

src/vcpkg-test/binarycaching.cpp

@@ -2,6 +2,7 @@
 
 #include <vcpkg/base/xmlserializer.h>
 
+#include <vcpkg/abi.h>
 #include <vcpkg/binarycaching.h>
 #include <vcpkg/binarycaching.private.h>
 #include <vcpkg/dependencies.h>

src/vcpkg-test/spdx.cpp

@@ -1,5 +1,6 @@
 #include <vcpkg-test/util.h>
 
+#include <vcpkg/abi.h>
 #include <vcpkg/dependencies.h>
 #include <vcpkg/spdx.h>
 
@@ -25,13 +26,11 @@ TEST_CASE ("spdx maximum serialization", "[spdx]")
     auto& abi = *(ipa.abi_info = AbiInfo{}).get();
     abi.package_abi = "ABIHASH";
 
-    const auto sbom =
-        create_spdx_sbom(ipa,
-                         std::vector<Path>{"vcpkg.json", "portfile.cmake", "patches/patch1.diff"},
-                         std::vector<std::string>{"vcpkg.json-hash", "portfile.cmake-hash", "patch1.diff-hash"},
-                         "now",
-                         "https://test-document-namespace",
-                         {});
+    std::vector<AbiEntry> port_abi{{"vcpkg.json", "vcpkg.json-hash"},
+                                   {"portfile.cmake", "portfile.cmake-hash"},
+                                   {"patches/patch1.diff", "patch1.diff-hash"}};
+
+    const auto sbom = create_spdx_sbom(ipa, port_abi, "now", "https://test-document-namespace", {});
 
     auto expected = Json::parse(R"json(
 {
@@ -179,13 +178,9 @@ TEST_CASE ("spdx minimum serialization", "[spdx]")
         spec, scfl, "test_packages_root", RequestType::USER_REQUESTED, UseHeadVersion::No, Editable::No, {}, {}, {});
     auto& abi = *(ipa.abi_info = AbiInfo{}).get();
     abi.package_abi = "deadbeef";
+    std::vector<AbiEntry> port_abi{{"vcpkg.json", "hash-vcpkg.json"}, {"portfile.cmake", "hash-portfile.cmake"}};
 
-    const auto sbom = create_spdx_sbom(ipa,
-                                       std::vector<Path>{"vcpkg.json", "portfile.cmake"},
-                                       std::vector<std::string>{"hash-vcpkg.json", "hash-portfile.cmake"},
-                                       "now+1",
-                                       "https://test-document-namespace-2",
-                                       {});
+    const auto sbom = create_spdx_sbom(ipa, port_abi, "now+1", "https://test-document-namespace-2", {});
 
     auto expected = Json::parse(R"json(
 {
@@ -326,7 +321,7 @@ TEST_CASE ("spdx concat resources", "[spdx]")
                     .value(VCPKG_LINE_INFO)
                     .value;
 
-    const auto sbom = create_spdx_sbom(ipa, {}, {}, "now+1", "ns", {std::move(doc1), std::move(doc2)});
+    const auto sbom = create_spdx_sbom(ipa, {}, "now+1", "ns", {std::move(doc1), std::move(doc2)});
 
     auto expected = Json::parse(R"json(
 {