Skip to content

[scripts] Add new ways to report build failures and giving hint messages from portfile.cmake #30775

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
autoantwort wants to merge 2 commits into
base: master
Choose a base branch
from
+12 −0
Draft

[scripts] Add new ways to report build failures and giving hint messages from portfile.cmake #30775

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8c7eb6a
Add new ways to report build failures and giving hint messages from p…
autoantwort Apr 11, 2023
2b68116
use env variable
autoantwort Apr 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions scripts/cmake/vcpkg_fail_with_user_interaction_required.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
function(vcpkg_fail_with_user_interaction_required message)
file(APPEND "${Z_VCPKG_REQUIRED_USER_INTERACTION_ON_BUILD_FAILURE_FILE}" "${message}")
message(FATAL_ERROR "${message}")
endfunction()
3 changes: 3 additions & 0 deletions scripts/cmake/vcpkg_user_hint_on_failure.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
function(vcpkg_user_hint_on_failure message)
file(APPEND "${Z_VCPKG_USER_HINTS_ON_BUILD_FAILURE_FILE}" "${message}\n")
endfunction()
5 changes: 5 additions & 0 deletions scripts/ports.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ include("${SCRIPTS}/cmake/vcpkg_execute_required_process.cmake")
include("${SCRIPTS}/cmake/vcpkg_execute_required_process_repeat.cmake")
include("${SCRIPTS}/cmake/vcpkg_extract_source_archive.cmake")
include("${SCRIPTS}/cmake/vcpkg_extract_source_archive_ex.cmake")
include("${SCRIPTS}/cmake/vcpkg_fail_with_user_interaction_required.cmake")
include("${SCRIPTS}/cmake/vcpkg_fail_port_install.cmake")
include("${SCRIPTS}/cmake/vcpkg_find_acquire_program.cmake")
include("${SCRIPTS}/cmake/vcpkg_fixup_cmake_targets.cmake")
Expand All @@ -56,6 +57,7 @@ include("${SCRIPTS}/cmake/vcpkg_list.cmake")
include("${SCRIPTS}/cmake/vcpkg_minimum_required.cmake")
include("${SCRIPTS}/cmake/vcpkg_replace_string.cmake")
include("${SCRIPTS}/cmake/vcpkg_test_cmake.cmake")
include("${SCRIPTS}/cmake/vcpkg_user_hint_on_failure.cmake")

include("${SCRIPTS}/cmake/z_vcpkg_apply_patches.cmake")
include("${SCRIPTS}/cmake/z_vcpkg_forward_output_variable.cmake")
Expand Down Expand Up @@ -144,6 +146,9 @@ if(CMD STREQUAL "BUILD")
set(Z_VCPKG_ERROR_LOG_COLLECTION_FILE "${CURRENT_BUILDTREES_DIR}/error-logs-${TARGET_TRIPLET}.txt")
file(REMOVE "${Z_VCPKG_ERROR_LOG_COLLECTION_FILE}")

file(REMOVE "${Z_VCPKG_USER_HINTS_ON_BUILD_FAILURE_FILE}")
file(REMOVE "${Z_VCPKG_REQUIRED_USER_INTERACTION_ON_BUILD_FAILURE_FILE}")

include("${CURRENT_PORT_DIR}/portfile.cmake")
if(DEFINED PORT)
if(VCPKG_FIXUP_ELF_RPATH)
Expand Down