From a434cc74ea515e6612bcb66d8f4ab69bbb8c62bf Mon Sep 17 00:00:00 2001 From: Niall Douglas Date: Tue, 30 Mar 2021 18:17:02 +0100 Subject: [outcome] Replace Outcome single header based port with full fat cmake install port (#15603) * Replace Outcome single header based port with full fat cmake install port. * [outcome] Improve portfile.cmake * update baseline * Refactor @JackBoosY's changes to make the dependency SHA feature chosen. * update baseline * Fix outcome features so they actually work. * update baseline * [outcome] install usage * update baseline * [outcome] Always use vcpkg copies of dependencies * DO NOT MERGE YET, ONLY FOR INSPECTION BY PR REVIEW. 1. Break out these dependencies into standalone ports: - ned14-internal-quickcpplib - status-code 2. Add port for LLFIO. 3. Add dependency smoke tests for Outcome and LLFIO as per instructions. * Fix all remaining issues, including link failure. This changeset is now ready to merge into vcpkg. * Update versions. * Have LLFIO not build static or shared libs according to VCPKG_LIBRARY_LINKAGE. * Fix last commit breaking everything :) * Update versions. * Disable uwp support for LLFIO. * versions * Fix status code on GCC 6 and 7 * Don't download ntkernel-error-category if not on Windows. * Fix status-code on UWP. * Update versions. * Fix MSVC on ARM. * Apply all the feedback from the PR review, more or less. * versions * Update to latest, disable UWP for Outcome. Co-authored-by: JackBoosY Co-authored-by: Robert Schumacher --- scripts/test_ports/llfio-run-tests/CONTROL | 5 +++++ scripts/test_ports/llfio-run-tests/portfile.cmake | 1 + scripts/test_ports/outcome-run-tests/CONTROL | 5 +++++ scripts/test_ports/outcome-run-tests/portfile.cmake | 1 + 4 files changed, 12 insertions(+) create mode 100644 scripts/test_ports/llfio-run-tests/CONTROL create mode 100644 scripts/test_ports/llfio-run-tests/portfile.cmake create mode 100644 scripts/test_ports/outcome-run-tests/CONTROL create mode 100644 scripts/test_ports/outcome-run-tests/portfile.cmake (limited to 'scripts') diff --git a/scripts/test_ports/llfio-run-tests/CONTROL b/scripts/test_ports/llfio-run-tests/CONTROL new file mode 100644 index 000000000..eeac83f91 --- /dev/null +++ b/scripts/test_ports/llfio-run-tests/CONTROL @@ -0,0 +1,5 @@ +Source: llfio-run-tests +Version: 0 +Description: Ensures that LLFIO built with vcpkg version of dependencies produces working executables. +Build-Depends: llfio[run-tests], llfio[status-code,run-tests] +Supports: x64 diff --git a/scripts/test_ports/llfio-run-tests/portfile.cmake b/scripts/test_ports/llfio-run-tests/portfile.cmake new file mode 100644 index 000000000..065116c27 --- /dev/null +++ b/scripts/test_ports/llfio-run-tests/portfile.cmake @@ -0,0 +1 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/scripts/test_ports/outcome-run-tests/CONTROL b/scripts/test_ports/outcome-run-tests/CONTROL new file mode 100644 index 000000000..bc289efab --- /dev/null +++ b/scripts/test_ports/outcome-run-tests/CONTROL @@ -0,0 +1,5 @@ +Source: outcome-run-tests +Version: 0 +Description: Ensures that outcome built with vcpkg version of dependencies produces working executables. +Build-Depends: outcome[run-tests] +Supports: x64 diff --git a/scripts/test_ports/outcome-run-tests/portfile.cmake b/scripts/test_ports/outcome-run-tests/portfile.cmake new file mode 100644 index 000000000..065116c27 --- /dev/null +++ b/scripts/test_ports/outcome-run-tests/portfile.cmake @@ -0,0 +1 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) -- cgit v1.2.3