From fc722d918743bea2c386fc352636f15f0044a865 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Mon, 24 Jan 2022 15:14:39 -0800 Subject: [PATCH] [sentry-native] Remove vcpkg_fail_port_install. (#22765) * [sentry-native] Remove vcpkg_fail_port_install. vcpkg.json and portfile.cmake don't agree, but given that vcpkg.json is more restrictive than portfile.cmake, I just deleted the call. vcpkg.json: !(arm | (arm64 & !osx) | uwp) portfile.cmake: osx | !(arm32 | arm64 | uwp) Putting `!(arm | (arm64 & !osx) | uwp)` into DNF: ``` !(arm | (arm64 & !osx) | uwp) given !arm & !(arm64 & !osx) & !uwp demorgan !arm & (!arm64 | osx) & !uwp demorgan (!arm & !uwp & !arm64) | (!arm & !uwp & osx) distribute ands over ors (!arm32 & !arm64 & !uwp) | (!arm32 & !arm64 & !uwp & osx) definition of arm (!arm32 & !arm64 & !uwp) | (!arm32 & !arm64 & osx) osx implies uwp ``` Putting `osx | !(arm32 | arm64 | uwp)` into DNF: ``` osx | !(arm32 | arm64 | uwp) given osx | (!arm32 & !arm64 & !uwp) demorgan ``` (at which point one of the conjunctions is identical and the other is just more conditions on osx) In support of https://github.com/microsoft/vcpkg/pull/21502 * DNF * add license Co-authored-by: nicole mazzuca --- ports/sentry-native/vcpkg.json | 5 +++-- versions/baseline.json | 2 +- versions/s-/sentry-native.json | 5 +++++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ports/sentry-native/vcpkg.json b/ports/sentry-native/vcpkg.json index d5469a0f52..3c2d6b00b9 100644 --- a/ports/sentry-native/vcpkg.json +++ b/ports/sentry-native/vcpkg.json @@ -1,10 +1,11 @@ { "name": "sentry-native", "version-semver": "0.4.13", - "port-version": 1, + "port-version": 2, "description": "Sentry SDK for C, C++ and native applications.", "homepage": "https://sentry.io/", - "supports": "!(arm | (arm64 & !osx) | uwp)", + "license": "MIT", + "supports": "osx | (!arm & !uwp)", "dependencies": [ { "name": "curl", diff --git a/versions/baseline.json b/versions/baseline.json index ac494878ff..f36beb3542 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6302,7 +6302,7 @@ }, "sentry-native": { "baseline": "0.4.13", - "port-version": 1 + "port-version": 2 }, "septag-sx": { "baseline": "2019-05-07", diff --git a/versions/s-/sentry-native.json b/versions/s-/sentry-native.json index 8729100877..c8b94c1196 100644 --- a/versions/s-/sentry-native.json +++ b/versions/s-/sentry-native.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "02e695aa00b661662dfae906a4cd55c0d8371f73", + "version-semver": "0.4.13", + "port-version": 2 + }, { "git-tree": "9fb136cdde824d2f306a1afbd99830af76446158", "version-semver": "0.4.13",