From 7a4ca3fd46d591ae62313e2d6a451515cbbfef4e Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Mon, 20 Mar 2023 12:02:25 -0700 Subject: [PATCH] UWP toolchain fix and update some supports expressions for uwp/xbox (#30096) * UWP toolchain fix and update some ports supports expressions for uwp/xbox * Update baseline * More ports updated for !xbox * Update baseline * Update support expression for ms-gdkx * Update baseline * ms-gdkx port should fail on ado system * Revert change to opengl-registry since its needed for angle on UWP * Minor github actions cr * Refresh baseline --- ports/cppxaml/vcpkg.json | 4 +++- ports/cuda/vcpkg.json | 4 ++-- ports/kinectsdk1/vcpkg.json | 4 ++-- ports/kinectsdk2/vcpkg.json | 4 ++-- ports/ms-gdkx/vcpkg.json | 3 ++- ports/opengl/vcpkg.json | 4 ++-- ports/vulkan-headers/vcpkg.json | 4 ++-- ports/vulkan-hpp/vcpkg.json | 4 ++-- ports/vulkan-memory-allocator-hpp/vcpkg.json | 2 ++ ports/vulkan-memory-allocator/vcpkg.json | 4 +++- ports/vulkan/vcpkg.json | 5 +++-- scripts/ci.baseline.txt | 5 +++++ scripts/toolchains/uwp.cmake | 8 +++---- versions/baseline.json | 22 ++++++++++---------- versions/c-/cppxaml.json | 5 +++++ versions/c-/cuda.json | 5 +++++ versions/k-/kinectsdk1.json | 5 +++++ versions/k-/kinectsdk2.json | 5 +++++ versions/m-/ms-gdkx.json | 5 +++++ versions/o-/opengl.json | 5 +++++ versions/v-/vulkan-headers.json | 5 +++++ versions/v-/vulkan-hpp.json | 5 +++++ versions/v-/vulkan-memory-allocator-hpp.json | 5 +++++ versions/v-/vulkan-memory-allocator.json | 5 +++++ versions/v-/vulkan.json | 5 +++++ 25 files changed, 99 insertions(+), 33 deletions(-) diff --git a/ports/cppxaml/vcpkg.json b/ports/cppxaml/vcpkg.json index d99f003879..8953b4a4cb 100644 --- a/ports/cppxaml/vcpkg.json +++ b/ports/cppxaml/vcpkg.json @@ -1,7 +1,9 @@ { "name": "cppxaml", "version": "0.0.16", + "port-version": 1, "description": "CppXaml is a library to facilitate usage of the XAML UI framework in C++ Windows apps.", "homepage": "https://asklar.github.io/xaml-islands", - "supports": "windows" + "license": "MIT", + "supports": "windows & !xbox" } diff --git a/ports/cuda/vcpkg.json b/ports/cuda/vcpkg.json index 4a17ad81e6..7d96303688 100644 --- a/ports/cuda/vcpkg.json +++ b/ports/cuda/vcpkg.json @@ -1,9 +1,9 @@ { "name": "cuda", "version": "10.1", - "port-version": 11, + "port-version": 12, "description": "A parallel computing platform and programming model", "homepage": "https://developer.nvidia.com/cuda-toolkit", "license": null, - "supports": "(windows & x64 & !uwp) | (linux & x64) | (linux & arm64)" + "supports": "(windows & x64 & !uwp & !xbox) | (linux & x64) | (linux & arm64)" } diff --git a/ports/kinectsdk1/vcpkg.json b/ports/kinectsdk1/vcpkg.json index cc19437045..e13a4e8f08 100644 --- a/ports/kinectsdk1/vcpkg.json +++ b/ports/kinectsdk1/vcpkg.json @@ -1,10 +1,10 @@ { "name": "kinectsdk1", "version": "1.8", - "port-version": 6, + "port-version": 7, "description": "Kinect for Windows SDK for Kinect v1 sensor.", "license": null, - "supports": "!arm & windows", + "supports": "!arm & windows & !uwp & !xbox", "dependencies": [ { "name": "vcpkg-tool-lessmsi", diff --git a/ports/kinectsdk2/vcpkg.json b/ports/kinectsdk2/vcpkg.json index 7fa6bf711c..6bfde2f6a3 100644 --- a/ports/kinectsdk2/vcpkg.json +++ b/ports/kinectsdk2/vcpkg.json @@ -1,10 +1,10 @@ { "name": "kinectsdk2", "version": "2.0", - "port-version": 5, + "port-version": 6, "description": "Kinect for Windows SDK for Kinect v2 sensor.", "license": null, - "supports": "!arm & windows", + "supports": "!arm & windows & !uwp & !xbox", "dependencies": [ { "name": "vcpkg-tool-lessmsi", diff --git a/ports/ms-gdkx/vcpkg.json b/ports/ms-gdkx/vcpkg.json index 35db3a97b9..0051513863 100644 --- a/ports/ms-gdkx/vcpkg.json +++ b/ports/ms-gdkx/vcpkg.json @@ -1,9 +1,10 @@ { "name": "ms-gdkx", "version": "1.0.0", + "port-version": 1, "description": "Stub port that ensures the Microsoft GDK with Xbox Extensions is installed.", "homepage": "https://aka.ms/gdkx", "documentation": "https://aka.ms/gamedevdocs", "license": null, - "supports": "xbox" + "supports": "windows & x64 & !uwp" } diff --git a/ports/opengl/vcpkg.json b/ports/opengl/vcpkg.json index ad72b1346c..6e3a19686e 100644 --- a/ports/opengl/vcpkg.json +++ b/ports/opengl/vcpkg.json @@ -1,10 +1,10 @@ { "name": "opengl", "version-date": "2022-12-04", - "port-version": 2, + "port-version": 3, "description": "Open Graphics Library (OpenGL)[3][4][5] is a cross-language, cross-platform application programming interface (API) for rendering 2D and 3D vector graphics.", "license": null, - "supports": "!xbox", + "supports": "!uwp & !xbox", "dependencies": [ "opengl-registry" ] diff --git a/ports/vulkan-headers/vcpkg.json b/ports/vulkan-headers/vcpkg.json index a5d7229024..83f560a772 100644 --- a/ports/vulkan-headers/vcpkg.json +++ b/ports/vulkan-headers/vcpkg.json @@ -1,11 +1,11 @@ { "name": "vulkan-headers", "version": "1.3.239", - "port-version": 1, + "port-version": 2, "description": "Vulkan header files and API registry", "homepage": "https://github.com/KhronosGroup/Vulkan-Headers", "license": "Apache-2.0", - "supports": "!xbox", + "supports": "!uwp & !xbox", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/vulkan-hpp/vcpkg.json b/ports/vulkan-hpp/vcpkg.json index 9f5f695493..c00a35303d 100644 --- a/ports/vulkan-hpp/vcpkg.json +++ b/ports/vulkan-hpp/vcpkg.json @@ -1,10 +1,10 @@ { "name": "vulkan-hpp", "version": "1.3.231", - "port-version": 1, + "port-version": 2, "description": "Header only C++ bindings for the Vulkan C API", "license": "Apache-2.0", - "supports": "!xbox", + "supports": "!uwp & !xbox", "dependencies": [ "vulkan" ] diff --git a/ports/vulkan-memory-allocator-hpp/vcpkg.json b/ports/vulkan-memory-allocator-hpp/vcpkg.json index 00b8ac1067..e1f34a3768 100644 --- a/ports/vulkan-memory-allocator-hpp/vcpkg.json +++ b/ports/vulkan-memory-allocator-hpp/vcpkg.json @@ -1,9 +1,11 @@ { "name": "vulkan-memory-allocator-hpp", "version": "3.0.1", + "port-version": 1, "description": "C++ bindings for VulkanMemoryAllocator", "homepage": "https://github.com/YaaZ/VulkanMemoryAllocator-Hpp", "license": "CC0-1.0", + "supports": "!uwp & !xbox", "dependencies": [ "vulkan" ] diff --git a/ports/vulkan-memory-allocator/vcpkg.json b/ports/vulkan-memory-allocator/vcpkg.json index 77296dbf52..ec3a725743 100644 --- a/ports/vulkan-memory-allocator/vcpkg.json +++ b/ports/vulkan-memory-allocator/vcpkg.json @@ -1,7 +1,9 @@ { "name": "vulkan-memory-allocator", "version": "3.0.1", + "port-version": 1, "description": "Easy to integrate Vulkan memory allocation library from GPUOpen", "homepage": "https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator", - "license": "MIT" + "license": "MIT", + "supports": "!uwp & !xbox" } diff --git a/ports/vulkan/vcpkg.json b/ports/vulkan/vcpkg.json index 724b52f7ef..96bd75075f 100644 --- a/ports/vulkan/vcpkg.json +++ b/ports/vulkan/vcpkg.json @@ -1,7 +1,8 @@ { "name": "vulkan", "version": "1.1.82.1", - "port-version": 4, + "port-version": 5, "description": "A graphics and compute API that provides high-efficiency, cross-platform access to modern GPUs on a wide variety of devices.", - "supports": "!xbox" + "license": null, + "supports": "!uwp & !xbox" } diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 6fc5a23e8d..761c712d66 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1078,6 +1078,11 @@ sentencepiece:x64-windows-static-md=fail symengine:x64-windows-static-md=fail unicorn:x64-windows-static-md=fail +# these ports require the Microsoft GDK with Xbox Extensions which is not installed on the CI pipeline machines +ms-gdkx:x64-windows=fail +ms-gdkx:x64-windows-static=fail +ms-gdkx:x64-windows-static-md=fail + # the version of v8 we have in the repo doesn't support VS2022 v8:x86-windows=fail v8:x64-windows=fail diff --git a/scripts/toolchains/uwp.cmake b/scripts/toolchains/uwp.cmake index 669bf81081..4656108782 100644 --- a/scripts/toolchains/uwp.cmake +++ b/scripts/toolchains/uwp.cmake @@ -18,12 +18,10 @@ if(DEFINED VCPKG_CMAKE_SYSTEM_VERSION) set(CMAKE_SYSTEM_VERSION "${VCPKG_CMAKE_SYSTEM_VERSION}" CACHE STRING "" FORCE) endif() -if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows") - set(CMAKE_CROSSCOMPILING ON CACHE STRING "") +set(CMAKE_CROSSCOMPILING ON CACHE STRING "") - if(NOT DEFINED CMAKE_SYSTEM_VERSION) - set(CMAKE_SYSTEM_VERSION "${CMAKE_HOST_SYSTEM_VERSION}" CACHE STRING "") - endif() +if(NOT DEFINED CMAKE_SYSTEM_VERSION) + set(CMAKE_SYSTEM_VERSION "${CMAKE_HOST_SYSTEM_VERSION}" CACHE STRING "") endif() get_property( _CMAKE_IN_TRY_COMPILE GLOBAL PROPERTY IN_TRY_COMPILE ) diff --git a/versions/baseline.json b/versions/baseline.json index 483b06be15..def8daa5a4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1794,7 +1794,7 @@ }, "cppxaml": { "baseline": "0.0.16", - "port-version": 0 + "port-version": 1 }, "cppzmq": { "baseline": "4.9.0", @@ -1890,7 +1890,7 @@ }, "cuda": { "baseline": "10.1", - "port-version": 11 + "port-version": 12 }, "cudnn": { "baseline": "7.6.5", @@ -3598,11 +3598,11 @@ }, "kinectsdk1": { "baseline": "1.8", - "port-version": 6 + "port-version": 7 }, "kinectsdk2": { "baseline": "2.0", - "port-version": 5 + "port-version": 6 }, "kissfft": { "baseline": "2021-11-14", @@ -5250,7 +5250,7 @@ }, "ms-gdkx": { "baseline": "1.0.0", - "port-version": 0 + "port-version": 1 }, "ms-gltf": { "baseline": "2022-06-28", @@ -5750,7 +5750,7 @@ }, "opengl": { "baseline": "2022-12-04", - "port-version": 2 + "port-version": 3 }, "opengl-registry": { "baseline": "2022-09-29", @@ -8262,23 +8262,23 @@ }, "vulkan": { "baseline": "1.1.82.1", - "port-version": 4 + "port-version": 5 }, "vulkan-headers": { "baseline": "1.3.239", - "port-version": 1 + "port-version": 2 }, "vulkan-hpp": { "baseline": "1.3.231", - "port-version": 1 + "port-version": 2 }, "vulkan-memory-allocator": { "baseline": "3.0.1", - "port-version": 0 + "port-version": 1 }, "vulkan-memory-allocator-hpp": { "baseline": "3.0.1", - "port-version": 0 + "port-version": 1 }, "vvenc": { "baseline": "1.7.0", diff --git a/versions/c-/cppxaml.json b/versions/c-/cppxaml.json index 94f9a1ec77..efdb058666 100644 --- a/versions/c-/cppxaml.json +++ b/versions/c-/cppxaml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "85dcf687925f266a40cf039aa8696b729f7b084e", + "version": "0.0.16", + "port-version": 1 + }, { "git-tree": "57d825ac962df4a92481b82161ea7b7088929a82", "version": "0.0.16", diff --git a/versions/c-/cuda.json b/versions/c-/cuda.json index 05fbc12964..faedc161e4 100644 --- a/versions/c-/cuda.json +++ b/versions/c-/cuda.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "85508d056c8d9e006b455ee71e29ab015abd8d63", + "version": "10.1", + "port-version": 12 + }, { "git-tree": "1d190177076c48287897d233ae2fa8c241f28f40", "version": "10.1", diff --git a/versions/k-/kinectsdk1.json b/versions/k-/kinectsdk1.json index 69568b944c..3c12c23ce4 100644 --- a/versions/k-/kinectsdk1.json +++ b/versions/k-/kinectsdk1.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "95650640a3c97fff440182fb35e878cc0b3111de", + "version": "1.8", + "port-version": 7 + }, { "git-tree": "bc44fc3968647d5e6a43066a8d2b0cf6be3f4405", "version": "1.8", diff --git a/versions/k-/kinectsdk2.json b/versions/k-/kinectsdk2.json index c379215520..805c9c7d6f 100644 --- a/versions/k-/kinectsdk2.json +++ b/versions/k-/kinectsdk2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e703f6797d85c9d99a150e4325c67bf7f3a7ea3f", + "version": "2.0", + "port-version": 6 + }, { "git-tree": "0de915e33cfe92b9972e0227eae6be31b6846fc5", "version": "2.0", diff --git a/versions/m-/ms-gdkx.json b/versions/m-/ms-gdkx.json index 15d05c4d42..eb522c0250 100644 --- a/versions/m-/ms-gdkx.json +++ b/versions/m-/ms-gdkx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "88dfc0932dd418a9099759f87a60dab8a0df8d6e", + "version": "1.0.0", + "port-version": 1 + }, { "git-tree": "db060bcb7476b1f3f593027c28f4ff5e8589da7b", "version": "1.0.0", diff --git a/versions/o-/opengl.json b/versions/o-/opengl.json index 1e1e959a5b..27cf08751b 100644 --- a/versions/o-/opengl.json +++ b/versions/o-/opengl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c3ae71738f88449ebcd781cef60d9a253fa091d4", + "version-date": "2022-12-04", + "port-version": 3 + }, { "git-tree": "23351e9e47639fa099352a258530b4c70dbc3ad5", "version-date": "2022-12-04", diff --git a/versions/v-/vulkan-headers.json b/versions/v-/vulkan-headers.json index 2b04fb25ea..849b95c7d5 100644 --- a/versions/v-/vulkan-headers.json +++ b/versions/v-/vulkan-headers.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d0e10b5347c26f2917d90b107a6177af1c270b65", + "version": "1.3.239", + "port-version": 2 + }, { "git-tree": "052634f8b28833b2d5302a0b4437031908eecde6", "version": "1.3.239", diff --git a/versions/v-/vulkan-hpp.json b/versions/v-/vulkan-hpp.json index ce71021def..3c6b4f285f 100644 --- a/versions/v-/vulkan-hpp.json +++ b/versions/v-/vulkan-hpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "61fc021c36380e8be0bf1742784dea14c9fe4a97", + "version": "1.3.231", + "port-version": 2 + }, { "git-tree": "794ed471d4b90ebb0ecad8adbb2f10fb57a7f0f6", "version": "1.3.231", diff --git a/versions/v-/vulkan-memory-allocator-hpp.json b/versions/v-/vulkan-memory-allocator-hpp.json index 76a330bc90..5dfb4cd1d2 100644 --- a/versions/v-/vulkan-memory-allocator-hpp.json +++ b/versions/v-/vulkan-memory-allocator-hpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "572ac6bfc63ddd4a37633aa76f54ff4c8325cb85", + "version": "3.0.1", + "port-version": 1 + }, { "git-tree": "2f76c60d16fb75bdbf3bfa08039557bfbe0ff84a", "version": "3.0.1", diff --git a/versions/v-/vulkan-memory-allocator.json b/versions/v-/vulkan-memory-allocator.json index 5748219dbe..0c9d5deed3 100644 --- a/versions/v-/vulkan-memory-allocator.json +++ b/versions/v-/vulkan-memory-allocator.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "49c724c78cf76e8858c92ce7b1acdc52fd9bf62b", + "version": "3.0.1", + "port-version": 1 + }, { "git-tree": "3e9468d6877548306f7d94800031ef9d04541529", "version": "3.0.1", diff --git a/versions/v-/vulkan.json b/versions/v-/vulkan.json index 99ab508c28..08a39ad3a2 100644 --- a/versions/v-/vulkan.json +++ b/versions/v-/vulkan.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "80d4793fe3882fca0afcb470183f404d97c22981", + "version": "1.1.82.1", + "port-version": 5 + }, { "git-tree": "a0810feaa193deb10db91cd9cfe727a13fba5b84", "version": "1.1.82.1",