From f904afe18346c6b87fa1c9a06a4b94b60b2791ef Mon Sep 17 00:00:00 2001 From: Mengna Li <95600143+Adela0814@users.noreply.github.com> Date: Sat, 11 Feb 2023 03:32:20 +0800 Subject: [PATCH] [crashpad] fix tool dependencies missing (#29555) * fix feature tools * update --- ports/crashpad/portfile.cmake | 8 +++++--- ports/crashpad/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/c-/crashpad.json | 5 +++++ 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ports/crashpad/portfile.cmake b/ports/crashpad/portfile.cmake index 71dfe227cf..5962f284f7 100644 --- a/ports/crashpad/portfile.cmake +++ b/ports/crashpad/portfile.cmake @@ -119,6 +119,10 @@ if(VCPKG_TARGET_IS_OSX) file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/obj/util/libmig_output.a" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") endif() +vcpkg_copy_tools( + TOOL_NAMES crashpad_handler + SEARCH_DIR "${CURRENT_PACKAGES_DIR}/tools") + # remove empty directories file(REMOVE_RECURSE "${PACKAGES_INCLUDE_DIR}/util/net/testdata" @@ -131,6 +135,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/${PORT}/build/config") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/${PORT}/util/mach/__pycache__") vcpkg_copy_pdbs() -file(INSTALL "${SOURCE_PATH}/LICENSE" - DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" - RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/crashpad/vcpkg.json b/ports/crashpad/vcpkg.json index 45f366553b..8330d3e46a 100644 --- a/ports/crashpad/vcpkg.json +++ b/ports/crashpad/vcpkg.json @@ -1,7 +1,7 @@ { "name": "crashpad", "version-date": "2022-09-05", - "port-version": 2, + "port-version": 3, "description": [ "Crashpad is a crash-reporting system.", "Crashpad is a library for capturing, storing and transmitting postmortem crash reports from a client to an upstream collection server. Crashpad aims to make it possible for clients to capture process state at the time of crash with the best possible fidelity and coverage, with the minimum of fuss." diff --git a/versions/baseline.json b/versions/baseline.json index 1b2cb8175e..77a9510c56 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1798,7 +1798,7 @@ }, "crashpad": { "baseline": "2022-09-05", - "port-version": 2 + "port-version": 3 }, "crashrpt": { "baseline": "1.4.3", diff --git a/versions/c-/crashpad.json b/versions/c-/crashpad.json index 33a92f7c66..65c8691077 100644 --- a/versions/c-/crashpad.json +++ b/versions/c-/crashpad.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "699f5caaac594c10928ddf73ba45e64ad764252f", + "version-date": "2022-09-05", + "port-version": 3 + }, { "git-tree": "37f155d62394f7faae4d48be6efcd81fce1587eb", "version-date": "2022-09-05",