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 --- versions/baseline.json | 14 +++++++++++++- versions/l-/llfio.json | 9 +++++++++ versions/n-/ned14-internal-quickcpplib.json | 9 +++++++++ versions/o-/outcome.json | 5 +++++ versions/s-/status-code.json | 9 +++++++++ 5 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 versions/l-/llfio.json create mode 100644 versions/n-/ned14-internal-quickcpplib.json create mode 100644 versions/s-/status-code.json (limited to 'versions') diff --git a/versions/baseline.json b/versions/baseline.json index 92d134e9b..c984e3c4d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3664,6 +3664,10 @@ "baseline": "latest-1", "port-version": 0 }, + "llfio": { + "baseline": "2.0-a74411ed", + "port-version": 0 + }, "llgl": { "baseline": "2019-08-15", "port-version": 1 @@ -4140,6 +4144,10 @@ "baseline": "0.2.2", "port-version": 0 }, + "ned14-internal-quickcpplib": { + "baseline": "0.0.0-24d92c71", + "port-version": 0 + }, "netcdf-c": { "baseline": "4.7.4", "port-version": 2 @@ -4537,7 +4545,7 @@ "port-version": 1 }, "outcome": { - "baseline": "2.1.3", + "baseline": "2.2.0-b9e664fb", "port-version": 0 }, "p-ranav-csv": { @@ -5716,6 +5724,10 @@ "baseline": "0.6.4", "port-version": 0 }, + "status-code": { + "baseline": "1.0.0-ab3cd821", + "port-version": 0 + }, "status-value-lite": { "baseline": "1.1.0", "port-version": 0 diff --git a/versions/l-/llfio.json b/versions/l-/llfio.json new file mode 100644 index 000000000..be8d6699e --- /dev/null +++ b/versions/l-/llfio.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "debab55b24a36f3615bd29f0fe3088032bd61e53", + "version-string": "2.0-a74411ed", + "port-version": 0 + } + ] +} diff --git a/versions/n-/ned14-internal-quickcpplib.json b/versions/n-/ned14-internal-quickcpplib.json new file mode 100644 index 000000000..8ef6d4ace --- /dev/null +++ b/versions/n-/ned14-internal-quickcpplib.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "d71cb92f85e0f089d1d2f4161be4f08be9de26d1", + "version-string": "0.0.0-24d92c71", + "port-version": 0 + } + ] +} diff --git a/versions/o-/outcome.json b/versions/o-/outcome.json index 3e807b020..dcdf04c4f 100644 --- a/versions/o-/outcome.json +++ b/versions/o-/outcome.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "77cd889f0b2157b6ae77982c30c8e17355d95245", + "version-string": "2.2.0-b9e664fb", + "port-version": 0 + }, { "git-tree": "33dc2e0d31074248a2313ff2eeecad075206d9bb", "version-string": "2.1.3", diff --git a/versions/s-/status-code.json b/versions/s-/status-code.json new file mode 100644 index 000000000..9273d78c3 --- /dev/null +++ b/versions/s-/status-code.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "a140621d67b58b39b6f3ab49cc0c4f1456e5a29f", + "version-string": "1.0.0-ab3cd821", + "port-version": 0 + } + ] +} -- cgit v1.2.3