From d5ec528843d29e3a52d745a64b469f810b2cedbf Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Fri, 14 Feb 2025 12:51:40 -0800 Subject: [PATCH] Promote x64-windows-release out of community (#43555) --- ports/qtwebengine/vcpkg.json | 3 +- scripts/azure-pipelines/azure-pipelines.yml | 6 + .../azure-pipelines/test-modified-ports.ps1 | 10 +- scripts/ci.baseline.txt | 388 ++++++++++-------- scripts/test_ports/cmake-user/portfile.cmake | 12 +- .../test-vcpkg_fixup_pkgconfig.cmake | 386 ++++++++--------- .../{community => }/x64-windows-release.cmake | 0 versions/baseline.json | 2 +- versions/q-/qtwebengine.json | 5 + 9 files changed, 454 insertions(+), 358 deletions(-) rename triplets/{community => }/x64-windows-release.cmake (100%) diff --git a/ports/qtwebengine/vcpkg.json b/ports/qtwebengine/vcpkg.json index fc03f8d583..d6afb0a659 100644 --- a/ports/qtwebengine/vcpkg.json +++ b/ports/qtwebengine/vcpkg.json @@ -2,10 +2,11 @@ "$comment": "x86-windows is not within the upstream support matrix of Qt6", "name": "qtwebengine", "version": "6.8.2", + "port-version": 1, "description": "Qt WebEngine provides functionality for rendering regions of dynamic web content.", "homepage": "https://www.qt.io/", "license": null, - "supports": "!static & !((x86 | arm) & windows)", + "supports": "!static & ((!x86 & !arm & native) | !windows)", "dependencies": [ { "name": "ffmpeg", diff --git a/scripts/azure-pipelines/azure-pipelines.yml b/scripts/azure-pipelines/azure-pipelines.yml index eaaaeea5e0..40c48b4ed8 100644 --- a/scripts/azure-pipelines/azure-pipelines.yml +++ b/scripts/azure-pipelines/azure-pipelines.yml @@ -24,6 +24,12 @@ jobs: vcpkgToolSha: ${{ parameters.vcpkgToolSha }} tripletPattern: ${{ parameters.tripletPattern }} +- template: windows/azure-pipelines.yml + parameters: + jobName: x64_windows_release + vcpkgToolSha: ${{ parameters.vcpkgToolSha }} + tripletPattern: ${{ parameters.tripletPattern }} + - template: windows/azure-pipelines.yml parameters: jobName: x64_windows_static diff --git a/scripts/azure-pipelines/test-modified-ports.ps1 b/scripts/azure-pipelines/test-modified-ports.ps1 index c060bfc568..66cf7dc2f4 100755 --- a/scripts/azure-pipelines/test-modified-ports.ps1 +++ b/scripts/azure-pipelines/test-modified-ports.ps1 @@ -128,6 +128,12 @@ if ($lastLastExitCode -ne 0) exit $lastLastExitCode } +if ($Triplet -eq 'x64-windows-release') { + $tripletSwitch = "--host-triplet=$Triplet" +} else { + $tripletSwitch = "--triplet=$Triplet" +} + $parentHashes = @() if (($BuildReason -eq 'PullRequest') -and -not $NoParentHashes) { @@ -165,7 +171,7 @@ if (($BuildReason -eq 'PullRequest') -and -not $NoParentHashes) # but changes must trigger at least some testing. Copy-Item "scripts/buildsystems/vcpkg.cmake" -Destination "scripts/test_ports/cmake" Copy-Item "scripts/buildsystems/vcpkg.cmake" -Destination "scripts/test_ports/cmake-user" - & "./vcpkg$executableExtension" ci "--triplet=$Triplet" --dry-run "--ci-baseline=$PSScriptRoot/../ci.baseline.txt" @commonArgs --no-binarycaching "--output-hashes=$parentHashesFile" + & "./vcpkg$executableExtension" ci $tripletSwitch --dry-run "--ci-baseline=$PSScriptRoot/../ci.baseline.txt" @commonArgs --no-binarycaching "--output-hashes=$parentHashesFile" $lastLastExitCode = $LASTEXITCODE if ($lastLastExitCode -ne 0) { @@ -192,7 +198,7 @@ if (($BuildReason -eq 'PullRequest') -and -not $NoParentHashes) # but changes must trigger at least some testing. Copy-Item "scripts/buildsystems/vcpkg.cmake" -Destination "scripts/test_ports/cmake" Copy-Item "scripts/buildsystems/vcpkg.cmake" -Destination "scripts/test_ports/cmake-user" -& "./vcpkg$executableExtension" ci "--triplet=$Triplet" --failure-logs=$failureLogs --x-xunit=$xunitFile "--ci-baseline=$PSScriptRoot/../ci.baseline.txt" @commonArgs @cachingArgs @parentHashes @skipFailuresArg +& "./vcpkg$executableExtension" ci $tripletSwitch --failure-logs=$failureLogs --x-xunit=$xunitFile "--ci-baseline=$PSScriptRoot/../ci.baseline.txt" @commonArgs @cachingArgs @parentHashes @skipFailuresArg $lastLastExitCode = $LASTEXITCODE $failureLogsEmpty = (-Not (Test-Path $failureLogs) -Or ((Get-ChildItem $failureLogs).count -eq 0)) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 5a90f895f7..a5ff117b1a 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -32,6 +32,7 @@ ## x64-osx ## x64-uwp ## x64-windows +## x64-windows-release ## x64-windows-static ## x64-windows-static-md ## x86-windows @@ -67,13 +68,15 @@ atliac-minitest:x64-uwp=fail backward-cpp:arm-neon-android=fail backward-cpp:arm64-android=fail backward-cpp:x64-android=fail -bde:arm64-osx =skip # conflict https://github.com/microsoft/vcpkg/pull/32645 -bde:x64-linux =skip -bde:x64-osx =skip -bde:x64-windows-static-md =skip -bde:x64-windows-static =skip -bde:x64-windows =skip -bde:x86-windows =skip +# conflict https://github.com/microsoft/vcpkg/pull/32645 +bde:arm64-osx=skip +bde:x64-linux=skip +bde:x64-osx=skip +bde:x64-windows-release=skip +bde:x64-windows-static-md=skip +bde:x64-windows-static=skip +bde:x64-windows=skip +bde:x86-windows=skip benchmark:arm-neon-android=fail bento4:arm-neon-android=fail berkeleydb:arm-neon-android=fail @@ -88,6 +91,8 @@ vcpkg-ci-blas:x86-windows=pass # openblas lapack-test:x86-windows=pass # lapack-reference[noblas] vcpkg-ci-blas:x64-windows=pass # openblas lapack-test:x64-windows=pass # lapack-reference[noblas] +vcpkg-ci-blas:x64-windows-release=pass # openblas +lapack-test:x64-windows-release=pass # lapack-reference[noblas] vcpkg-ci-blas:x64-windows-static=pass # lapack-reference[blas] lapack-test:x64-windows-static=pass # lapack-reference[blas] vcpkg-ci-blas:x64-windows-static-md=pass # lapack-reference[blas] @@ -114,6 +119,7 @@ clapack:arm64-osx=skip clapack:x64-android=fail clapack:x64-linux=skip clapack:x64-osx=skip +clapack:x64-windows-release=skip clapack:x64-windows-static-md=skip clapack:x64-windows-static=skip clapack:x64-windows=skip @@ -145,17 +151,18 @@ bond:x64-osx=fail # Conflicts with openssl boringssl:arm-neon-android=skip boringssl:arm64-android=skip -boringssl:arm64-windows=skip -boringssl:arm64-windows-static-md=skip +boringssl:arm64-osx=skip boringssl:arm64-uwp=skip +boringssl:arm64-windows-static-md=skip +boringssl:arm64-windows=skip boringssl:x64-android=skip boringssl:x64-linux=skip boringssl:x64-osx=skip -boringssl:arm64-osx=skip boringssl:x64-uwp=skip -boringssl:x64-windows=skip -boringssl:x64-windows-static=skip +boringssl:x64-windows-release=skip boringssl:x64-windows-static-md=skip +boringssl:x64-windows-static=skip +boringssl:x64-windows=skip boringssl:x86-windows=skip brpc:x64-android=fail buck-yeh-bux:x64-uwp=skip @@ -166,32 +173,34 @@ caf:arm64-android=fail caf:x64-android=fail caf:x64-uwp=fail # file conflict with dbg-macro -c-dbg-macro:x86-windows=skip -c-dbg-macro:x64-windows=skip -c-dbg-macro:x64-windows-static=skip -c-dbg-macro:x64-windows-static-md=skip -c-dbg-macro:x64-uwp=skip -c-dbg-macro:arm64-windows=skip -c-dbg-macro:arm64-windows-static-md=skip -c-dbg-macro:arm64-uwp=skip -c-dbg-macro:x64-osx=skip c-dbg-macro:arm64-osx=skip +c-dbg-macro:arm64-uwp=skip +c-dbg-macro:arm64-windows-static-md=skip +c-dbg-macro:arm64-windows=skip c-dbg-macro:x64-linux=skip +c-dbg-macro:x64-osx=skip +c-dbg-macro:x64-uwp=skip +c-dbg-macro:x64-windows-release=skip +c-dbg-macro:x64-windows-static-md=skip +c-dbg-macro:x64-windows-static=skip +c-dbg-macro:x64-windows=skip +c-dbg-macro:x86-windows=skip casclib:arm64-uwp=fail casclib:x64-uwp=fail catch-classic:arm-neon-android=skip catch-classic:arm64-android=skip -catch-classic:arm64-windows=skip -catch-classic:arm64-windows-static-md=skip +catch-classic:arm64-osx=skip catch-classic:arm64-uwp=skip +catch-classic:arm64-windows-static-md=skip +catch-classic:arm64-windows=skip catch-classic:x64-android=skip catch-classic:x64-linux=skip catch-classic:x64-osx=skip -catch-classic:arm64-osx=skip catch-classic:x64-uwp=skip -catch-classic:x64-windows=skip -catch-classic:x64-windows-static=skip +catch-classic:x64-windows-release=skip catch-classic:x64-windows-static-md=skip +catch-classic:x64-windows-static=skip +catch-classic:x64-windows=skip catch-classic:x86-windows=skip cctag:x64-windows-static-md=fail cello:arm64-uwp=fail @@ -199,9 +208,10 @@ cello:x64-uwp=fail chakracore:x64-linux=skip # chromium-base has several problems and is upgraded to "skip" because it hits a lot of servers that can slow CI # broken on Windows because it does not yet support VS2022 -chromium-base:x64-windows=skip -chromium-base:x64-windows-static=skip +chromium-base:x64-windows-release=skip chromium-base:x64-windows-static-md=skip +chromium-base:x64-windows-static=skip +chromium-base:x64-windows=skip # broken on Linux because chromium-base:x64-linux=skip # broken on OSX for unknown reasons; it appears to be messing with some form of system-wide cache @@ -261,11 +271,12 @@ dbg-macro:arm64-android=skip dbg-macro:x64-android=skip # Since pipeline cannot automatically install dbghelp dependency, skip this detection dbghelp:arm64-uwp=skip -dbghelp:arm64-windows=skip dbghelp:arm64-windows-static-md=skip +dbghelp:arm64-windows=skip dbghelp:x64-uwp=skip -dbghelp:x64-windows-static=skip +dbghelp:x64-windows-release=skip dbghelp:x64-windows-static-md=skip +dbghelp:x64-windows-static=skip dbghelp:x64-windows=skip dbghelp:x86-windows=skip # Cross builds depend on try_run results @@ -275,10 +286,11 @@ dcmtk:arm64-windows=fail dcmtk:arm64-windows-static-md=fail dcmtk:x64-android=fail # legacy directxsdk which conflicts with dxsdk-d3dx -directxsdk:x86-windows=skip -directxsdk:x64-windows=skip -directxsdk:x64-windows-static=skip +directxsdk:x64-windows-release=skip directxsdk:x64-windows-static-md=skip +directxsdk:x64-windows-static=skip +directxsdk:x64-windows=skip +directxsdk:x86-windows=skip discord-rpc:arm64-uwp=fail discord-rpc:x64-uwp=fail # Needs newer GCC than we have @@ -323,15 +335,16 @@ fltk:arm64-android=fail fltk:x64-android=fail # fluidlite conflicts with fluidsynth; we test fluidsynth rather than fluidlite because # fluidlite has no dependencies and thus is less likely to be broken by another package. +fluidlite:arm64-osx=skip fluidlite:arm64-uwp=skip -fluidlite:arm64-windows=skip fluidlite:arm64-windows-windows-static-md=skip +fluidlite:arm64-windows=skip fluidlite:x64-linux=skip fluidlite:x64-osx=skip -fluidlite:arm64-osx=skip fluidlite:x64-uwp=skip -fluidlite:x64-windows-static=skip +fluidlite:x64-windows-release=skip fluidlite:x64-windows-static-md=skip +fluidlite:x64-windows-static=skip fluidlite:x64-windows=skip fluidlite:x86-windows=skip fmem:arm-neon-android=fail @@ -373,10 +386,11 @@ gamenetworkingsockets:x64-android=fail # VS 2022 Update 3 seems to have broken Gazebo: https://devdiv.visualstudio.com/DefaultCollection/DevDiv/_workitems/edit/1522474 # gazebo is broken due it depend on old ports that already in the new versions. # There is an open PR that try to fix that. -gazebo:x64-windows=fail -gazebo:x64-windows-static-md=fail -gazebo:x86-windows=skip gazebo:x64-linux=fail +gazebo:x64-windows-release=fail +gazebo:x64-windows-static-md=fail +gazebo:x64-windows=fail +gazebo:x86-windows=skip gdk-pixbuf:arm-neon-android=fail gdk-pixbuf:arm64-android=fail gdk-pixbuf:x64-android=fail @@ -387,15 +401,16 @@ gherkin-c:arm-neon-android=fail gherkin-c:arm64-android=fail gherkin-c:x64-android=fail # Conflicts with libevent -gherkin-c:arm64-windows=skip -gherkin-c:arm64-windows-static-md=skip gherkin-c:arm64-uwp=skip +gherkin-c:arm64-windows-static-md=skip +gherkin-c:arm64-windows=skip gherkin-c:x64-linux=skip gherkin-c:x64-osx=skip gherkin-c:x64-uwp=skip -gherkin-c:x64-windows=skip -gherkin-c:x64-windows-static=skip +gherkin-c:x64-windows-release=skip gherkin-c:x64-windows-static-md=skip +gherkin-c:x64-windows-static=skip +gherkin-c:x64-windows=skip gherkin-c:x86-windows=skip gl3w:arm-neon-android=fail gl3w:arm64-android=fail @@ -412,10 +427,11 @@ graphicsmagick:arm64-uwp=fail graphicsmagick:x64-uwp=fail # gsoap does not offer stable public source downloads gsoap:x64-android=fail -gsoap:x64-windows = skip -gsoap:x86-windows = skip -gsoap:x64-windows-static = skip -gsoap:x64-windows-static-md = skip +gsoap:x64-windows-release=skip +gsoap:x64-windows-static-md=skip +gsoap:x64-windows-static=skip +gsoap:x64-windows=skip +gsoap:x86-windows=skip gstreamer:arm-neon-android=fail gstreamer:arm64-android=fail gstreamer:x64-android=fail @@ -458,18 +474,19 @@ ignition-tools:arm-neon-android=fail ignition-tools:arm64-android=fail ignition-tools:x64-android=fail ijg-libjpeg:arm-neon-android=skip -ijg-libjpeg:arm64-uwp=skip ijg-libjpeg:arm64-android=skip ijg-libjpeg:arm64-osx= skip -ijg-libjpeg:arm64-windows=skip +ijg-libjpeg:arm64-uwp=skip ijg-libjpeg:arm64-windows-static-md=skip +ijg-libjpeg:arm64-windows=skip ijg-libjpeg:x64-android=skip ijg-libjpeg:x64-linux= skip ijg-libjpeg:x64-osx=skip ijg-libjpeg:x64-uwp=skip -ijg-libjpeg:x64-windows=skip -ijg-libjpeg:x64-windows-static=skip +ijg-libjpeg:x64-windows-release=skip ijg-libjpeg:x64-windows-static-md=fail +ijg-libjpeg:x64-windows-static=skip +ijg-libjpeg:x64-windows=skip ijg-libjpeg:x86-windows=skip intelrdfpmathlib:arm-neon-android=fail intelrdfpmathlib:arm64-android=fail @@ -505,6 +522,7 @@ lcm:arm-neon-android=fail lcm:arm64-android=fail lcm:arm64-windows-static-md=fail lcm:x64-android=fail +lcm:x64-windows-release=fail lcm:x64-windows-static-md=fail lcm:x64-windows-static=fail leptonica:x64-uwp=fail @@ -563,14 +581,15 @@ liblo:arm64-android=fail liblo:x64-android=fail liblo:x64-uwp=fail # libmariadb conflicts with libmysql -libmariadb:arm64-windows=skip +libmariadb:arm64-osx=skip libmariadb:arm64-windows-static-md=skip +libmariadb:arm64-windows=skip libmariadb:x64-linux=skip libmariadb:x64-osx=skip -libmariadb:arm64-osx=skip -libmariadb:x64-windows=skip -libmariadb:x64-windows-static=skip +libmariadb:x64-windows-release=skip libmariadb:x64-windows-static-md=skip +libmariadb:x64-windows-static=skip +libmariadb:x64-windows=skip libmaxminddb:arm64-android=fail libmaxminddb:arm-neon-android=fail libmaxminddb:x64-android=fail @@ -588,30 +607,32 @@ libopensp:arm-neon-android=fail libopensp:arm64-android=fail libopensp:x64-android=fail libp7client:x64-android=fail -libpng-apng:arm64-windows=skip -libpng-apng:arm64-windows-static-md=skip libpng-apng:arm64-uwp=skip +libpng-apng:arm64-windows-static-md=skip +libpng-apng:arm64-windows=skip libpng-apng:x64-linux=skip libpng-apng:x64-osx=skip libpng-apng:x64-uwp=skip -libpng-apng:x64-windows=skip -libpng-apng:x64-windows-static=skip +libpng-apng:x64-windows-release=skip libpng-apng:x64-windows-static-md=skip +libpng-apng:x64-windows-static=skip +libpng-apng:x64-windows=skip libpng-apng:x86-windows=skip # The developer of libqcow does not offer stable release archives libqcow:arm-neon-android=skip -libqcow:arm64-uwp=skip libqcow:arm64-android=skip -libqcow:x64-android=skip -libqcow:x64-uwp=skip -libqcow:x64-windows-static=skip -libqcow:x64-windows-static-md=skip -libqcow:x64-osx=skip -libqcow:x64-windows=skip -libqcow:x64-linux=skip -libqcow:x86-windows=skip -libqcow:arm64-windows=skip +libqcow:arm64-uwp=skip libqcow:arm64-windows-static-md=skip +libqcow:arm64-windows=skip +libqcow:x64-android=skip +libqcow:x64-linux=skip +libqcow:x64-osx=skip +libqcow:x64-uwp=skip +libqcow:x64-windows-release=skip +libqcow:x64-windows-static-md=skip +libqcow:x64-windows-static=skip +libqcow:x64-windows=skip +libqcow:x86-windows=skip # 32-bit needs android-24 libraw:arm-neon-android=fail # Conflicts with openssl @@ -619,12 +640,13 @@ libressl:arm-neon-android=skip libressl:arm64-android=skip libressl:arm64-osx=skip libressl:arm64-uwp=skip -libressl:arm64-windows=skip libressl:arm64-windows-static-md=skip +libressl:arm64-windows=skip libressl:x64-android=skip libressl:x64-linux=skip libressl:x64-osx=skip libressl:x64-uwp=skip +libressl:x64-windows-release=skip libressl:x64-windows-static-md=skip libressl:x64-windows-static=skip libressl:x64-windows=skip @@ -645,15 +667,16 @@ libusb-win32:x64-uwp=fail libvhdi:arm-neon-android=fail libvhdi:arm64-android=fail libvhdi:x64-android=fail -#Skip detection to avoid upstream remove older releases -libvmdk:arm-neon-android=skip # upstream issue https://github.com/microsoft/vcpkg/pull/13765#issuecomment-699710253 +# upstream issue https://github.com/microsoft/vcpkg/pull/13765#issuecomment-699710253 +libvmdk:arm-neon-android=skip libvmdk:arm64-android=skip libvmdk:arm64-osx=skip -libvmdk:arm64-windows=skip libvmdk:arm64-windows-static-md=skip +libvmdk:arm64-windows=skip libvmdk:x64-android=skip libvmdk:x64-linux=skip libvmdk:x64-osx=skip +libvmdk:x64-windows-release=skip libvmdk:x64-windows-static-md=skip libvmdk:x64-windows-static=skip libvmdk:x64-windows=skip @@ -691,14 +714,15 @@ magma:x64-linux=fail mchehab-zbar:arm-neon-android=fail mchehab-zbar:arm64-android=fail mchehab-zbar:x64-android=fail -mecab:arm64-windows=skip -mecab:arm64-windows-static-md=skip mecab:arm64-uwp=skip +mecab:arm64-windows-static-md=skip +mecab:arm64-windows=skip mecab:x64-linux=skip mecab:x64-uwp=skip -mecab:x64-windows=skip -mecab:x64-windows-static=skip mecab:x64-windows-static-md=skip +mecab:x64-windows-static=skip +mecab:x64-windows-release=skip +mecab:x64-windows=skip mecab:x86-windows=skip memorymodule:arm-neon-android=fail memorymodule:arm64-android=fail @@ -719,9 +743,10 @@ moos-core:arm64-android=fail moos-core:x64-android=fail mpir:x64-android=fail # ms-gltf 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-release=fail ms-gdkx:x64-windows-static-md=fail +ms-gdkx:x64-windows-static=fail +ms-gdkx:x64-windows=fail ms-gltf:arm-neon-android=fail ms-gltf:arm64-android=fail ms-gltf:x64-android=fail @@ -729,36 +754,39 @@ monkeys-audio:arm64-windows=fail monkeys-audio:arm64-windows-static-md=fail monkeys-audio:x64-windows-static=fail moos-core:x64-windows-static=fail -moos-essential:arm64-windows=fail moos-essential:arm64-windows-static-md=fail +moos-essential:arm64-windows=fail +moos-essential:x64-windows-release=fail moos-essential:x64-windows-static-md=fail moos-essential:x64-windows=fail moos-essential:x86-windows=fail # Conflicts with libjpeg-turbo mozjpeg:arm-neon-android=fail mozjpeg:arm64-android=fail -mozjpeg:x64-android=fail -mozjpeg:arm64-windows=skip -mozjpeg:arm64-windows-static-md=skip +mozjpeg:arm64-osx=skip mozjpeg:arm64-uwp=skip +mozjpeg:arm64-windows-static-md=skip +mozjpeg:arm64-windows=skip +mozjpeg:x64-android=fail mozjpeg:x64-linux=skip mozjpeg:x64-osx=skip -mozjpeg:arm64-osx=skip mozjpeg:x64-uwp=skip -mozjpeg:x64-windows=skip -mozjpeg:x64-windows-static=skip +mozjpeg:x64-windows-release=skip mozjpeg:x64-windows-static-md=skip +mozjpeg:x64-windows-static=skip +mozjpeg:x64-windows=skip mozjpeg:x86-windows=skip # mpir conflicts with gmp # see https://github.com/microsoft/vcpkg/issues/11756 -mpir:x86-windows=skip -mpir:x64-windows=skip -mpir:x64-windows-static=skip -mpir:x64-windows-static-md=skip -mpir:arm64-windows=skip mpir:arm64-windows-static-md=skip -mpir:x64-osx=skip +mpir:arm64-windows=skip mpir:x64-linux=skip +mpir:x64-osx=skip +mpir:x64-windows-release=skip +mpir:x64-windows-static-md=skip +mpir:x64-windows-static=skip +mpir:x64-windows=skip +mpir:x86-windows=skip msmpi:arm64-windows=fail msmpi:arm64-windows-static-md=fail munit:x64-android=fail @@ -840,12 +868,13 @@ optional-bare:arm-neon-android=skip optional-bare:arm64-android=skip optional-bare:arm64-osx=skip optional-bare:arm64-uwp=skip -optional-bare:arm64-windows=skip optional-bare:arm64-windows-static-md=skip +optional-bare:arm64-windows=skip optional-bare:x64-android=skip optional-bare:x64-linux=skip optional-bare:x64-osx=skip optional-bare:x64-uwp=skip +optional-bare:x64-windows-release=skip optional-bare:x64-windows-static-md=skip optional-bare:x64-windows-static=skip optional-bare:x64-windows=skip @@ -898,15 +927,17 @@ qt5-base:arm64-windows-static-md=fail qt5-base:x64-android=fail # Skip deprecated Qt module # (remove after 1 year or longer due to vcpkg upgrade not handling removed ports correctly) +qt5-canvas3d:arm64-osx=skip qt5-canvas3d:x64-linux=skip qt5-canvas3d:x64-osx=skip -qt5-canvas3d:arm64-osx=skip -qt5-canvas3d:x64-windows=skip -qt5-canvas3d:x64-windows-static=skip +qt5-canvas3d:x64-windows-release=skip qt5-canvas3d:x64-windows-static-md=skip +qt5-canvas3d:x64-windows-static=skip +qt5-canvas3d:x64-windows=skip qt5-canvas3d:x86-windows=skip # Skipped to avoid exceeding the 48 hour time limit in CI # May also need an older ninja version +qt5-webengine:x64-windows-release=skip qt5-webengine:x64-windows=skip qt5-webengine:x86-windows=skip # Missing system libraries @@ -923,38 +954,41 @@ rabit:arm64-android=fail rabit:x64-android=fail range-v3-vs2015:arm-neon-android=skip range-v3-vs2015:arm64-android=skip -range-v3-vs2015:arm64-windows=skip -range-v3-vs2015:arm64-windows-static-md=skip +range-v3-vs2015:arm64-osx=skip range-v3-vs2015:arm64-uwp=skip +range-v3-vs2015:arm64-windows-static-md=skip +range-v3-vs2015:arm64-windows=skip range-v3-vs2015:x64-android=skip range-v3-vs2015:x64-linux=skip range-v3-vs2015:x64-osx=skip -range-v3-vs2015:arm64-osx=skip range-v3-vs2015:x64-uwp=skip -range-v3-vs2015:x64-windows=skip -range-v3-vs2015:x64-windows-static=skip +range-v3-vs2015:x64-windows-release=skip range-v3-vs2015:x64-windows-static-md=skip +range-v3-vs2015:x64-windows-static=skip +range-v3-vs2015:x64-windows=skip range-v3-vs2015:x86-windows=skip -rapidstring:arm64-windows=fail -rapidstring:arm64-windows-static-md=fail rapidstring:arm64-uwp=fail +rapidstring:arm64-windows-static-md=fail +rapidstring:arm64-windows=fail rapidstring:x64-linux=fail rapidstring:x64-uwp=fail -rapidstring:x64-windows=fail -rapidstring:x64-windows-static=fail +rapidstring:x64-windows-release=fail rapidstring:x64-windows-static-md=fail +rapidstring:x64-windows-static=fail +rapidstring:x64-windows=fail rapidstring:x86-windows=fail # file conflicts with rbdl -rbdl-orb:x86-windows=skip -rbdl-orb:x64-windows=skip -rbdl-orb:x64-windows-static=skip -rbdl-orb:x64-windows-static-md=skip -rbdl-orb:x64-uwp=skip rbdl-orb:arm64-uwp=skip -rbdl-orb:arm64-windows=skip rbdl-orb:arm64-windows-static-md=skip +rbdl-orb:arm64-windows=skip rbdl-orb:x64-linux=skip rbdl-orb:x64-osx=skip +rbdl-orb:x64-uwp=skip +rbdl-orb:x64-windows-release=skip +rbdl-orb:x64-windows-static-md=skip +rbdl-orb:x64-windows-static=skip +rbdl-orb:x64-windows=skip +rbdl-orb:x86-windows=skip rbdl:arm-neon-android=fail rbdl:arm64-android=fail rbdl:x64-android=fail @@ -978,6 +1012,7 @@ saucer:arm64-windows-static-md=fail saucer:arm64-windows-static-md=fail saucer:arm64-windows=fail saucer:arm64-windows=fail +saucer:x64-windows-release=fail saucer:x64-windows-static-md=fail saucer:x64-windows-static=fail saucer:x64-windows=fail @@ -987,17 +1022,18 @@ scintilla:arm64-android=fail scintilla:x64-android=fail sciter:arm-neon-android=fail sciter:arm64-android=fail -sciter:arm64-windows=skip -sciter:arm64-windows-static-md=skip +sciter:arm64-osx=skip sciter:arm64-uwp=skip +sciter:arm64-windows-static-md=skip +sciter:arm64-windows=skip sciter:x64-android=fail sciter:x64-linux=skip sciter:x64-osx=skip -sciter:arm64-osx=skip sciter:x64-uwp=skip -sciter:x64-windows=skip -sciter:x64-windows-static=skip +sciter:x64-windows-release=skip sciter:x64-windows-static-md=skip +sciter:x64-windows-static=skip +sciter:x64-windows=skip sciter:x86-windows=skip sdl1:arm-neon-android=fail sdl1:arm64-android=fail @@ -1007,31 +1043,33 @@ sfml:arm-neon-android=fail sfml:arm64-android=fail sfml:x64-android=fail shader-slang:x64-windows-static=fail -shogun:arm64-windows=skip -shogun:arm64-windows-static-md=skip -shogun:arm64-uwp=skip -shogun:x64-osx=skip -shogun:arm64-osx=skip -shogun:x64-uwp=skip -shogun:x64-windows= skip -shogun:x64-windows-static=skip -shogun:x64-windows-static-md=skip -shogun:x86-windows=skip shogun:arm64-android=skip +shogun:arm64-osx=skip +shogun:arm64-uwp=skip +shogun:arm64-windows-static-md=skip +shogun:arm64-windows=skip +shogun:x64-osx=skip +shogun:x64-uwp=skip +shogun:x64-windows-release=skip +shogun:x64-windows-static-md=skip +shogun:x64-windows-static=skip +shogun:x64-windows=skip +shogun:x86-windows=skip # "Obsolete" and conflicts with microsoft-signalr signalrclient:arm-neon-android=skip signalrclient:arm64-android=skip signalrclient:arm64-osx=skip signalrclient:arm64-uwp=skip -signalrclient:arm64-windows=skip signalrclient:arm64-windows-static-md=skip +signalrclient:arm64-windows=skip signalrclient:x64-android=skip signalrclient:x64-linux=skip signalrclient:x64-osx=skip signalrclient:x64-uwp=skip -signalrclient:x64-windows=skip +signalrclient:x64-windows-release=skip signalrclient:x64-windows-static-md=skip signalrclient:x64-windows-static=skip +signalrclient:x64-windows=skip signalrclient:x86-windows=skip simbody:arm64-windows=fail simbody:arm64-windows-static-md=fail @@ -1098,10 +1136,12 @@ teemo:x64-android=fail # tensorflow does not support VS2022 tensorflow:x64-android=fail +tensorflow:x64-windows-release=fail tensorflow:x64-windows-static-md=fail tensorflow:x64-windows-static=fail tensorflow:x64-windows=fail tensorflow-cc:x64-android=fail +tensorflow-cc:x64-windows-release=fail tensorflow-cc:x64-windows-static-md=fail tensorflow-cc:x64-windows-static=fail tensorflow-cc:x64-windows=fail @@ -1109,9 +1149,9 @@ tensorflow-cc:x64-windows=fail # Also skipping because our macOS machines are relatively underpowered and this saves 8 hours of CI # time for a relatively unpopular library / system combo. tensorflow:x64-osx=skip -tensorflow:arm64-osx =skip +tensorflow:arm64-osx=skip tensorflow-cc:x64-osx=skip -tensorflow-cc:arm64-osx =skip +tensorflow-cc:arm64-osx=skip thorvg:arm-neon-android=fail tinycthread:arm-neon-android=fail @@ -1137,6 +1177,7 @@ usrsctp:arm64-android=fail usrsctp:x64-android=fail # the version of v8 we have in the repo doesn't support VS2022 v8:x64-android=fail +v8:x64-windows-release=fail v8:x64-windows-static-md=fail v8:x64-windows-static=fail v8:x64-windows=fail @@ -1170,8 +1211,9 @@ wavpack:x64-android=fail # 32-bit needs android-24 wcslib:arm-neon-android=fail # Collides with libpcap -> similar headers -winpcap:x64-windows = skip -winpcap:x86-windows = skip +winpcap:x64-windows-release=skip +winpcap:x64-windows=skip +winpcap:x86-windows=skip wordnet:arm-neon-android=fail wordnet:arm64-android=fail wordnet:x64-android=fail @@ -1204,6 +1246,7 @@ cmake:arm64-windows-static-md=pass cmake:arm64-windows=pass cmake:x64-linux=pass cmake:x64-osx=pass +cmake:x64-windows-release=pass cmake:x64-windows-static-md=pass cmake:x64-windows-static=pass cmake:x64-windows=pass @@ -1212,6 +1255,7 @@ cmake-user:arm64-windows=pass cmake-user:arm64-windows-static-md=pass cmake-user:x64-linux=pass cmake-user:x64-osx=pass +cmake-user:x64-windows-release=pass cmake-user:x64-windows-static-md=pass cmake-user:x64-windows-static=pass cmake-user:x64-windows=pass @@ -1219,45 +1263,50 @@ cmake-user:x86-windows=pass gtk:arm64-osx=pass gtk:x64-linux=pass gtk:x64-osx=pass +gtk:x64-windows-release=pass gtk:x64-windows-static-md=pass gtk:x64-windows=pass gtk:x86-windows=pass -qt:x64-windows=pass -qt:x64-windows-static=pass -# qt:x64-windows-static-md=pass # hunspell is fail so this cannot pass. -# qt:arm64-windows-static-md=pass # hunspell is fail so this cannot pass. qt:arm64-windows=pass qt:x64-linux=pass +qt:x64-windows-release=pass +qt:x64-windows-static=pass +qt:x64-windows=pass +# qt:x64-windows-static-md=pass # hunspell is fail so this cannot pass. +# qt:arm64-windows-static-md=pass # hunspell is fail so this cannot pass. # qt:x64-osx=pass # gstreamer issues preventing qtmultimedia -vcpkg-ci-arrow:x64-windows=pass -vcpkg-ci-arrow:x64-windows-static=pass -vcpkg-ci-arrow:x64-windows-static-md=pass -vcpkg-ci-arrow:x64-osx=pass vcpkg-ci-arrow:x64-linux=pass +vcpkg-ci-arrow:x64-osx=pass +vcpkg-ci-arrow:x64-windows-release=pass +vcpkg-ci-arrow:x64-windows-static-md=pass +vcpkg-ci-arrow:x64-windows-static=pass +vcpkg-ci-arrow:x64-windows=pass vcpkg-ci-aurora-au:x64-linux=pass vcpkg-ci-boost:arm-neon-android=pass vcpkg-ci-boost:arm64-android=pass vcpkg-ci-boost:arm64-uwp=pass -vcpkg-ci-boost:arm64-windows=pass vcpkg-ci-boost:arm64-windows-static-md=pass +vcpkg-ci-boost:arm64-windows=pass vcpkg-ci-boost:x64-android=pass vcpkg-ci-boost:x64-linux=pass vcpkg-ci-boost:x64-osx=pass vcpkg-ci-boost:x64-uwp=pass +vcpkg-ci-boost:x64-windows-release=pass vcpkg-ci-boost:x64-windows-static-md=pass vcpkg-ci-boost:x64-windows-static=pass vcpkg-ci-boost:x64-windows=pass vcpkg-ci-boost:x86-windows=pass vcpkg-ci-curl:arm-neon-android=pass vcpkg-ci-curl:arm64-android=pass +vcpkg-ci-curl:arm64-osx=pass +vcpkg-ci-curl:arm64-uwp=pass +vcpkg-ci-curl:arm64-windows-static-md=pass +vcpkg-ci-curl:arm64-windows=pass vcpkg-ci-curl:x64-android=pass vcpkg-ci-curl:x64-linux=pass -vcpkg-ci-curl:arm64-osx=pass vcpkg-ci-curl:x64-osx=pass -vcpkg-ci-curl:arm64-uwp=pass vcpkg-ci-curl:x64-uwp=pass -vcpkg-ci-curl:arm64-windows=pass -vcpkg-ci-curl:arm64-windows-static-md=pass +vcpkg-ci-curl:x64-windows-release=pass vcpkg-ci-curl:x64-windows-static-md=pass vcpkg-ci-curl:x64-windows-static=pass vcpkg-ci-curl:x64-windows=pass @@ -1266,12 +1315,13 @@ vcpkg-ci-ffmpeg:arm-neon-android=pass vcpkg-ci-ffmpeg:arm64-android=pass vcpkg-ci-ffmpeg:arm64-osx=pass vcpkg-ci-ffmpeg:arm64-uwp=pass -vcpkg-ci-ffmpeg:arm64-windows=pass vcpkg-ci-ffmpeg:arm64-windows-static-md=pass +vcpkg-ci-ffmpeg:arm64-windows=pass vcpkg-ci-ffmpeg:x64-android=pass vcpkg-ci-ffmpeg:x64-linux=pass vcpkg-ci-ffmpeg:x64-osx=pass vcpkg-ci-ffmpeg:x64-uwp=pass +vcpkg-ci-ffmpeg:x64-windows-release=pass vcpkg-ci-ffmpeg:x64-windows-static-md=pass vcpkg-ci-ffmpeg:x64-windows-static=pass vcpkg-ci-ffmpeg:x64-windows=pass @@ -1280,6 +1330,7 @@ vcpkg-ci-freerdp:arm-neon-android=pass vcpkg-ci-freerdp:arm64-android=pass vcpkg-ci-freerdp:x64-android=pass vcpkg-ci-freerdp:x64-linux=pass +vcpkg-ci-freerdp:x64-windows-release=pass vcpkg-ci-freerdp:x64-windows-static-md=pass vcpkg-ci-freerdp:x64-windows-static=pass vcpkg-ci-freerdp:x64-windows=pass @@ -1289,6 +1340,7 @@ vcpkg-ci-gdal:arm64-android=pass vcpkg-ci-gdal:x64-android=pass vcpkg-ci-gdal:x64-linux=pass vcpkg-ci-gdal:x64-osx=pass +vcpkg-ci-gdal:x64-windows-release=pass vcpkg-ci-gdal:x64-windows-static-md=pass vcpkg-ci-gdal:x64-windows-static=pass vcpkg-ci-gdal:x64-windows=pass @@ -1296,46 +1348,51 @@ vcpkg-ci-gdal:x86-windows=pass vcpkg-ci-itk:arm64-osx=pass vcpkg-ci-itk:x64-linux=pass vcpkg-ci-itk:x64-osx=pass -vcpkg-ci-itk:x64-windows=pass -vcpkg-ci-itk:x64-windows-static=pass +vcpkg-ci-itk:x64-windows-release=pass vcpkg-ci-itk:x64-windows-static-md=pass +vcpkg-ci-itk:x64-windows-static=pass +vcpkg-ci-itk:x64-windows=pass vcpkg-ci-itk:x86-windows=pass vcpkg-ci-llvm:x64-linux=pass vcpkg-ci-llvm:x64-osx=pass +vcpkg-ci-llvm:x64-windows-release=pass vcpkg-ci-llvm:x64-windows-static-md=pass vcpkg-ci-llvm:x64-windows-static=pass vcpkg-ci-llvm:x64-windows=pass vcpkg-ci-llvm:x86-windows=pass vcpkg-ci-mathgl:x64-linux=pass vcpkg-ci-mathgl:x64-osx=pass -vcpkg-ci-mathgl:x64-windows=pass -vcpkg-ci-mathgl:x64-windows-static=pass +vcpkg-ci-mathgl:x64-windows-release=pass vcpkg-ci-mathgl:x64-windows-static-md=pass +vcpkg-ci-mathgl:x64-windows-static=pass +vcpkg-ci-mathgl:x64-windows=pass vcpkg-ci-mathgl:x86-windows=pass vcpkg-ci-opencv:arm-neon-android=pass vcpkg-ci-opencv:arm64-android=pass vcpkg-ci-opencv:arm64-osx=pass vcpkg-ci-opencv:arm64-uwp=pass -vcpkg-ci-opencv:arm64-windows=pass vcpkg-ci-opencv:arm64-windows-static-md=pass +vcpkg-ci-opencv:arm64-windows=pass vcpkg-ci-opencv:x64-android=pass vcpkg-ci-opencv:x64-linux=pass vcpkg-ci-opencv:x64-osx=pass vcpkg-ci-opencv:x64-uwp=pass +vcpkg-ci-opencv:x64-windows-release=pass vcpkg-ci-opencv:x64-windows-static-md=pass vcpkg-ci-opencv:x64-windows-static=pass vcpkg-ci-opencv:x64-windows=pass vcpkg-ci-opencv:x86-windows=pass -vcpkg-ci-openimageio:arm64-osx=pass -vcpkg-ci-openimageio:x64-linux=pass -vcpkg-ci-openimageio:x64-osx=pass +vcpkg-ci-openimageio:x86-windows=pass +vcpkg-ci-openimageio:x64-windows=pass +vcpkg-ci-openimageio:x64-windows-static=pass vcpkg-ci-openimageio:x64-windows-static-md=pass vcpkg-ci-openimageio:x64-windows-static=pass vcpkg-ci-openimageio:x64-windows=pass vcpkg-ci-openimageio:x86-windows=pass +vcpkg-ci-paraview:arm64-osx=pass vcpkg-ci-paraview:x64-linux=pass vcpkg-ci-paraview:x64-osx=pass -vcpkg-ci-paraview:arm64-osx=pass +vcpkg-ci-paraview:x64-windows-release=pass vcpkg-ci-paraview:x64-windows-static-md=pass vcpkg-ci-paraview:x64-windows-static=pass vcpkg-ci-paraview:x64-windows=pass @@ -1343,31 +1400,34 @@ vcpkg-ci-paraview:x86-windows=pass vcpkg-ci-skia:arm-neon-android=pass vcpkg-ci-skia:arm64-android=pass vcpkg-ci-skia:arm64-uwp=pass -vcpkg-ci-skia:arm64-windows=pass vcpkg-ci-skia:arm64-windows-static-md=pass +vcpkg-ci-skia:arm64-windows=pass vcpkg-ci-skia:x64-android=pass vcpkg-ci-skia:x64-linux=pass vcpkg-ci-skia:x64-osx=pass vcpkg-ci-skia:x64-uwp=pass +vcpkg-ci-skia:x64-windows-release=pass vcpkg-ci-skia:x64-windows-static-md=pass vcpkg-ci-skia:x64-windows-static=pass vcpkg-ci-skia:x64-windows=pass vcpkg-ci-skia:x86-windows=pass vcpkg-ci-soci:x64-linux=pass vcpkg-ci-soci:x64-osx=pass -vcpkg-ci-soci:x64-windows=pass -vcpkg-ci-soci:x64-windows-static=pass +vcpkg-ci-soci:x64-windows-release=pass vcpkg-ci-soci:x64-windows-static-md=pass +vcpkg-ci-soci:x64-windows-static=pass +vcpkg-ci-soci:x64-windows=pass vcpkg-ci-sqlpp11:arm-neon-android=pass vcpkg-ci-sqlpp11:arm64-android=pass vcpkg-ci-sqlpp11:arm64-osx=pass vcpkg-ci-sqlpp11:arm64-uwp=pass -vcpkg-ci-sqlpp11:arm64-windows=pass vcpkg-ci-sqlpp11:arm64-windows-static-md=pass +vcpkg-ci-sqlpp11:arm64-windows=pass vcpkg-ci-sqlpp11:x64-android=pass vcpkg-ci-sqlpp11:x64-linux=pass vcpkg-ci-sqlpp11:x64-osx=pass vcpkg-ci-sqlpp11:x64-uwp=pass +vcpkg-ci-sqlpp11:x64-windows-release=pass vcpkg-ci-sqlpp11:x64-windows-static-md=pass vcpkg-ci-sqlpp11:x64-windows-static=pass vcpkg-ci-sqlpp11:x64-windows=pass @@ -1375,19 +1435,21 @@ vcpkg-ci-sqlpp11:x86-windows=pass vcpkg-ci-vxl:arm-neon-android=pass vcpkg-ci-vxl:arm64-android=pass vcpkg-ci-vxl:arm64-osx=pass -vcpkg-ci-vxl:arm64-windows=pass vcpkg-ci-vxl:arm64-windows-static-md=pass +vcpkg-ci-vxl:arm64-windows=pass vcpkg-ci-vxl:x64-android=pass vcpkg-ci-vxl:x64-linux=pass vcpkg-ci-vxl:x64-osx=pass -vcpkg-ci-vxl:x64-windows=pass -vcpkg-ci-vxl:x64-windows-static=pass +vcpkg-ci-vxl:x64-windows-release=pass vcpkg-ci-vxl:x64-windows-static-md=pass +vcpkg-ci-vxl:x64-windows-static=pass +vcpkg-ci-vxl:x64-windows=pass vcpkg-ci-vxl:x86-windows=pass -vcpkg-ci-wxwidgets:arm64-windows=pass vcpkg-ci-wxwidgets:arm64-windows-static-md=pass +vcpkg-ci-wxwidgets:arm64-windows=pass vcpkg-ci-wxwidgets:x64-linux=pass vcpkg-ci-wxwidgets:x64-osx=pass +vcpkg-ci-wxwidgets:x64-windows-release=pass vcpkg-ci-wxwidgets:x64-windows-static-md=pass vcpkg-ci-wxwidgets:x64-windows-static=pass vcpkg-ci-wxwidgets:x64-windows=pass diff --git a/scripts/test_ports/cmake-user/portfile.cmake b/scripts/test_ports/cmake-user/portfile.cmake index d5fc746976..cb93950038 100644 --- a/scripts/test_ports/cmake-user/portfile.cmake +++ b/scripts/test_ports/cmake-user/portfile.cmake @@ -226,9 +226,11 @@ foreach(executable IN LISTS cmake_commands) OPTIONS "-DCMAKE_BUILD_TYPE=Release" ) - test_cmake_project(NAME "debug" - CMAKE_COMMAND "${executable}" - OPTIONS - "-DCMAKE_BUILD_TYPE=Debug" - ) + if (NOT VCPKG_BUILD_TYPE) + test_cmake_project(NAME "debug" + CMAKE_COMMAND "${executable}" + OPTIONS + "-DCMAKE_BUILD_TYPE=Debug" + ) + endif() endforeach() diff --git a/scripts/test_ports/unit-test-cmake/test-vcpkg_fixup_pkgconfig.cmake b/scripts/test_ports/unit-test-cmake/test-vcpkg_fixup_pkgconfig.cmake index 47bfc950ec..625cb3ce2d 100644 --- a/scripts/test_ports/unit-test-cmake/test-vcpkg_fixup_pkgconfig.cmake +++ b/scripts/test_ports/unit-test-cmake/test-vcpkg_fixup_pkgconfig.cmake @@ -1,186 +1,200 @@ -file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") -set(pc_file_release "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/unit-test-cmake.pc") -file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") -set(pc_file_debug "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/unit-test-cmake.pc") -set(reload_pc_strings 0) - -function(write_pkgconfig) - file(WRITE "${pc_file_release}" ${ARGN}) - file(WRITE "${pc_file_debug}" ${ARGN}) - file(STRINGS "${pc_file_release}" pc_strings_input) - set(pc_strings_INPUT "${pc_strings_input}" PARENT_SCOPE) - set(reload_pc_strings 1 PARENT_SCOPE) -endfunction() - -function(unit_test_pkgconfig_check_key build_types field value) - if(NOT build_types) - message(SEND_ERROR "The build_type parameter must be list of debug;release.") - endif() - if(reload_pc_strings) - file(STRINGS "${pc_file_release}" pc_strings_release) - file(STRINGS "${pc_file_debug}" pc_strings_debug) - set(pc_strings_release "${pc_strings_release}" PARENT_SCOPE) - set(pc_strings_debug "${pc_strings_debug}" PARENT_SCOPE) - set(reload_pc_strings 0 PARENT_SCOPE) - endif() - foreach(build_type IN LISTS build_types) - set(listname "pc_strings_${build_type}") - set(expected "${field}${value}") - list(FILTER ${listname} INCLUDE REGEX "^${field}") - if(NOT "${${listname}}" STREQUAL "${expected}" AND NOT "${${listname}}_is_empty" STREQUAL "${value}_is_empty") - string(REPLACE "\$" "\\\$" pc_strings_INPUT "${pc_strings_INPUT}") - string(REPLACE "\$" "\\\$" expected "${expected}") - string(REPLACE "\$" "\\\$" "${listname}" "${${listname}}") - message(SEND_ERROR "vcpkg_fixup_pkgconfig() resulted in a wrong value for ${build_type} builds; - input : [[${pc_strings_INPUT}]] - expected: [[${expected}]] - actual : [[${${listname}}]]") - set_has_error() - return() - endif() - endforeach() -endfunction() - -# "Libs:" only -write_pkgconfig([[ -Libs: -L${prefix}/lib -l"aaa" -]]) -unit_test_ensure_success([[ vcpkg_fixup_pkgconfig(SKIP_CHECK) ]]) -unit_test_pkgconfig_check_key("debug;release" "Libs:" [[ "-L${prefix}/lib" -laaa]]) - -# "Libs:" and "Libs.private:" -write_pkgconfig([[ -Libs: -L"${prefix}/lib" -l"aaa" -Libs.private: -l"bbb ccc" -]]) -unit_test_ensure_success([[ vcpkg_fixup_pkgconfig(SKIP_CHECK) ]]) -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - unit_test_pkgconfig_check_key("debug;release" "Libs:" [[ "-L${prefix}/lib" -laaa "-lbbb ccc"]]) - unit_test_pkgconfig_check_key("debug;release" "Libs.private:" "") -else() - unit_test_pkgconfig_check_key("debug;release" "Libs:" [[ "-L${prefix}/lib" -laaa]]) -endif() - -# line continuations -write_pkgconfig([[ -Libs.private: \ - -lbbb -Libs: -L"${prefix}/lib" \ - -l"aaa" -]]) -unit_test_ensure_success([[ vcpkg_fixup_pkgconfig(SKIP_CHECK) ]]) -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - unit_test_pkgconfig_check_key("debug;release" "Libs:" [[ "-L${prefix}/lib" -laaa -lbbb]]) - unit_test_pkgconfig_check_key("debug;release" "Libs.private:" "") -else() - unit_test_pkgconfig_check_key("debug;release" "Libs:" [[ "-L${prefix}/lib" -laaa]]) -endif() - -# Replace ';' with ' ' -write_pkgconfig([[ -Libs: -L${prefix}/lib\;-l"aaa" -Libs.private: -lbbb\;-l"ccc" -]]) -unit_test_ensure_success([[ vcpkg_fixup_pkgconfig(SKIP_CHECK) ]]) -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - unit_test_pkgconfig_check_key("debug;release" "Libs:" [[ "-L${prefix}/lib" -laaa -lbbb -lccc]]) - unit_test_pkgconfig_check_key("debug;release" "Libs.private:" "") -else() - unit_test_pkgconfig_check_key("debug;release" "Libs:" [[ "-L${prefix}/lib" -laaa]]) -endif() - -# invalid: ...-NOTFOUND -write_pkgconfig([[Libs: LIB-NOTFOUND]]) -# Only warning: unit_test_ensure_fatal_error([[ vcpkg_fixup_pkgconfig(SKIP_CHECK) # ...-NOTFOUND # ]]) - -# invalid: optimized/debug -write_pkgconfig([[Libs: -laaa -loptimized -lrel -ldebug -ldbg -lbbb]]) -unit_test_ensure_success([[ vcpkg_fixup_pkgconfig(SKIP_CHECK) ]]) -unit_test_pkgconfig_check_key("debug" "Libs:" [[ -laaa -ldbg -lbbb]]) -unit_test_pkgconfig_check_key("release" "Libs:" [[ -laaa -lrel -lbbb]]) - -write_pkgconfig([[Libs: -laaa -Loptimized -Lrel -Ldebug -Ldbg -lbbb]]) -unit_test_ensure_success([[ vcpkg_fixup_pkgconfig(SKIP_CHECK) ]]) -unit_test_pkgconfig_check_key("debug" "Libs:" [[ -laaa -Ldbg -lbbb]]) -unit_test_pkgconfig_check_key("release" "Libs:" [[ -laaa -Lrel -lbbb]]) - -write_pkgconfig([[Libs: optimized\;librel.a\;debug\;libdbg.a\;aaa.lib]]) -unit_test_ensure_success([[ vcpkg_fixup_pkgconfig(SKIP_CHECK) ]]) -unit_test_pkgconfig_check_key("debug" "Libs:" [[ libdbg.a aaa.lib]]) -unit_test_pkgconfig_check_key("release" "Libs:" [[ librel.a aaa.lib]]) - -write_pkgconfig([[Libs: aaa.lib\;optimized\;librel.a\;debug\;libdbg.a]]) -unit_test_ensure_success([[ vcpkg_fixup_pkgconfig(SKIP_CHECK) ]]) -unit_test_pkgconfig_check_key("debug" "Libs:" [[ aaa.lib libdbg.a]]) -unit_test_pkgconfig_check_key("release" "Libs:" [[ aaa.lib librel.a]]) - -write_pkgconfig([[Libs: aaa.lib optimized librel.a debug libdbg.a bbb.lib]]) -unit_test_ensure_success([[ vcpkg_fixup_pkgconfig(SKIP_CHECK) ]]) -unit_test_pkgconfig_check_key("debug" "Libs:" [[ aaa.lib libdbg.a bbb.lib]]) -unit_test_pkgconfig_check_key("release" "Libs:" [[ aaa.lib librel.a bbb.lib]]) - -# invalid: namespaced targets -write_pkgconfig([[Libs: -lAAA::aaa]]) -# Only warning: unit_test_ensure_fatal_error([[ vcpkg_fixup_pkgconfig(SKIP_CHECK) # namespaced target # ]]) - -# prefix -write_pkgconfig( -"prefix=${CURRENT_PACKAGES_DIR} -execprefix=\${prefix} -libdir=${CURRENT_PACKAGES_DIR}/lib -includedir=${CURRENT_PACKAGES_DIR}/include -datarootdir=${CURRENT_PACKAGES_DIR}/share -datadir=\${datarootdir}/${PORT} -") -unit_test_ensure_success([[ vcpkg_fixup_pkgconfig(SKIP_CHECK) ]]) -unit_test_pkgconfig_check_key("release" "prefix=" [[${pcfiledir}/../..]]) -unit_test_pkgconfig_check_key("release" "execprefix=" [[${prefix}]]) -unit_test_pkgconfig_check_key("release" "libdir=" [[${prefix}/lib]]) -unit_test_pkgconfig_check_key("release" "includedir=" [[${prefix}/include]]) -unit_test_pkgconfig_check_key("release" "datarootdir=" [[${prefix}/share]]) -unit_test_pkgconfig_check_key("release" "datadir=" [[${datarootdir}/unit-test-cmake]]) - -write_pkgconfig( -"prefix=${CURRENT_PACKAGES_DIR}/debug -execprefix=\${prefix} -libdir=${CURRENT_PACKAGES_DIR}/debug/lib -includedir=${CURRENT_PACKAGES_DIR}/include -datarootdir=${CURRENT_PACKAGES_DIR}/share -datadir=\${datarootdir}/${PORT} -") -unit_test_ensure_success([[ vcpkg_fixup_pkgconfig(SKIP_CHECK) ]]) -unit_test_pkgconfig_check_key("debug" "prefix=" [[${pcfiledir}/../..]]) -unit_test_pkgconfig_check_key("debug" "execprefix=" [[${prefix}]]) -unit_test_pkgconfig_check_key("debug" "libdir=" [[${prefix}/lib]]) -unit_test_pkgconfig_check_key("debug" "includedir=" [[${prefix}/../include]]) -unit_test_pkgconfig_check_key("debug" "datarootdir=" [[${prefix}/../share]]) -unit_test_pkgconfig_check_key("debug" "datadir=" [[${datarootdir}/unit-test-cmake]]) - -# -I, -l or -L with ${blah} in variables -write_pkgconfig([[blah_libs=-L${blah}/lib64 -l${blah}/libblah.a -I${blah}/include]]) -unit_test_ensure_success([[ vcpkg_fixup_pkgconfig(SKIP_CHECK) ]]) -unit_test_pkgconfig_check_key("debug;release" "blah_libs=" [["-L${blah}/lib64" "-l${blah}/libblah.a" "-I${blah}/include"]]) - -# plain vs. quoted items -write_pkgconfig([[Libs: ${blah} "${quoted}" plain "C:/Program Files/blah.lib"]]) -unit_test_ensure_success([[ vcpkg_fixup_pkgconfig(SKIP_CHECK) ]]) -unit_test_pkgconfig_check_key("debug;release" "Libs:" [[ ${blah} "${quoted}" plain "C:/Program Files/blah.lib"]]) - -# lib spec starting with optimized/debug/general -write_pkgconfig([[ -Libs: -L${prefix}/lib -ldebuginfod -]]) -unit_test_ensure_success([[ vcpkg_fixup_pkgconfig(SKIP_CHECK) ]]) -unit_test_pkgconfig_check_key("debug;release" "Libs:" [[ "-L${prefix}/lib" -ldebuginfod]]) - -write_pkgconfig([[ -Libs: -L${prefix}/lib -loptimizedinfod -]]) -unit_test_ensure_success([[ vcpkg_fixup_pkgconfig(SKIP_CHECK) ]]) -unit_test_pkgconfig_check_key("debug;release" "Libs:" [[ "-L${prefix}/lib" -loptimizedinfod]]) - -write_pkgconfig([[ -Libs: -L${prefix}/lib -lgeneralinfod -]]) -unit_test_ensure_success([[ vcpkg_fixup_pkgconfig(SKIP_CHECK) ]]) -unit_test_pkgconfig_check_key("debug;release" "Libs:" [[ "-L${prefix}/lib" -lgeneralinfod]]) +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") +set(pc_file_release "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/unit-test-cmake.pc") +if(NOT VCPKG_BUILD_TYPE) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") + set(pc_file_debug "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/unit-test-cmake.pc") +endif() +set(reload_pc_strings 0) + +function(write_pkgconfig) + file(WRITE "${pc_file_release}" ${ARGN}) + if(NOT VCPKG_BUILD_TYPE) + file(WRITE "${pc_file_debug}" ${ARGN}) + endif() + file(STRINGS "${pc_file_release}" pc_strings_input) + set(pc_strings_INPUT "${pc_strings_input}" PARENT_SCOPE) + set(reload_pc_strings 1 PARENT_SCOPE) +endfunction() + +function(unit_test_pkgconfig_check_key build_types field value) + if(NOT build_types) + message(SEND_ERROR "The build_type parameter must be list of debug;release.") + endif() + if(VCPKG_BUILD_TYPE) + list(REMOVE_ITEM build_types debug) + endif() + if(NOT build_types) + return() + endif() + if(reload_pc_strings) + file(STRINGS "${pc_file_release}" pc_strings_release) + set(pc_strings_release "${pc_strings_release}" PARENT_SCOPE) + if(NOT VCPKG_BUILD_TYPE) + file(STRINGS "${pc_file_debug}" pc_strings_debug) + set(pc_strings_debug "${pc_strings_debug}" PARENT_SCOPE) + endif() + set(reload_pc_strings 0 PARENT_SCOPE) + endif() + foreach(build_type IN LISTS build_types) + set(listname "pc_strings_${build_type}") + set(expected "${field}${value}") + list(FILTER ${listname} INCLUDE REGEX "^${field}") + if(NOT "${${listname}}" STREQUAL "${expected}" AND NOT "${${listname}}_is_empty" STREQUAL "${value}_is_empty") + string(REPLACE "\$" "\\\$" pc_strings_INPUT "${pc_strings_INPUT}") + string(REPLACE "\$" "\\\$" expected "${expected}") + string(REPLACE "\$" "\\\$" "${listname}" "${${listname}}") + message(SEND_ERROR "vcpkg_fixup_pkgconfig() resulted in a wrong value for ${build_type} builds; + input : [[${pc_strings_INPUT}]] + expected: [[${expected}]] + actual : [[${${listname}}]]") + set_has_error() + return() + endif() + endforeach() +endfunction() + +# "Libs:" only +write_pkgconfig([[ +Libs: -L${prefix}/lib -l"aaa" +]]) +unit_test_ensure_success([[ vcpkg_fixup_pkgconfig(SKIP_CHECK) ]]) +unit_test_pkgconfig_check_key("debug;release" "Libs:" [[ "-L${prefix}/lib" -laaa]]) + +# "Libs:" and "Libs.private:" +write_pkgconfig([[ +Libs: -L"${prefix}/lib" -l"aaa" +Libs.private: -l"bbb ccc" +]]) +unit_test_ensure_success([[ vcpkg_fixup_pkgconfig(SKIP_CHECK) ]]) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + unit_test_pkgconfig_check_key("debug;release" "Libs:" [[ "-L${prefix}/lib" -laaa "-lbbb ccc"]]) + unit_test_pkgconfig_check_key("debug;release" "Libs.private:" "") +else() + unit_test_pkgconfig_check_key("debug;release" "Libs:" [[ "-L${prefix}/lib" -laaa]]) +endif() + +# line continuations +write_pkgconfig([[ +Libs.private: \ + -lbbb +Libs: -L"${prefix}/lib" \ + -l"aaa" +]]) +unit_test_ensure_success([[ vcpkg_fixup_pkgconfig(SKIP_CHECK) ]]) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + unit_test_pkgconfig_check_key("debug;release" "Libs:" [[ "-L${prefix}/lib" -laaa -lbbb]]) + unit_test_pkgconfig_check_key("debug;release" "Libs.private:" "") +else() + unit_test_pkgconfig_check_key("debug;release" "Libs:" [[ "-L${prefix}/lib" -laaa]]) +endif() + +# Replace ';' with ' ' +write_pkgconfig([[ +Libs: -L${prefix}/lib\;-l"aaa" +Libs.private: -lbbb\;-l"ccc" +]]) +unit_test_ensure_success([[ vcpkg_fixup_pkgconfig(SKIP_CHECK) ]]) +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + unit_test_pkgconfig_check_key("debug;release" "Libs:" [[ "-L${prefix}/lib" -laaa -lbbb -lccc]]) + unit_test_pkgconfig_check_key("debug;release" "Libs.private:" "") +else() + unit_test_pkgconfig_check_key("debug;release" "Libs:" [[ "-L${prefix}/lib" -laaa]]) +endif() + +# invalid: ...-NOTFOUND +write_pkgconfig([[Libs: LIB-NOTFOUND]]) +# Only warning: unit_test_ensure_fatal_error([[ vcpkg_fixup_pkgconfig(SKIP_CHECK) # ...-NOTFOUND # ]]) + +# invalid: optimized/debug +write_pkgconfig([[Libs: -laaa -loptimized -lrel -ldebug -ldbg -lbbb]]) +unit_test_ensure_success([[ vcpkg_fixup_pkgconfig(SKIP_CHECK) ]]) +unit_test_pkgconfig_check_key("debug" "Libs:" [[ -laaa -ldbg -lbbb]]) +unit_test_pkgconfig_check_key("release" "Libs:" [[ -laaa -lrel -lbbb]]) + +write_pkgconfig([[Libs: -laaa -Loptimized -Lrel -Ldebug -Ldbg -lbbb]]) +unit_test_ensure_success([[ vcpkg_fixup_pkgconfig(SKIP_CHECK) ]]) +unit_test_pkgconfig_check_key("debug" "Libs:" [[ -laaa -Ldbg -lbbb]]) +unit_test_pkgconfig_check_key("release" "Libs:" [[ -laaa -Lrel -lbbb]]) + +write_pkgconfig([[Libs: optimized\;librel.a\;debug\;libdbg.a\;aaa.lib]]) +unit_test_ensure_success([[ vcpkg_fixup_pkgconfig(SKIP_CHECK) ]]) +unit_test_pkgconfig_check_key("debug" "Libs:" [[ libdbg.a aaa.lib]]) +unit_test_pkgconfig_check_key("release" "Libs:" [[ librel.a aaa.lib]]) + +write_pkgconfig([[Libs: aaa.lib\;optimized\;librel.a\;debug\;libdbg.a]]) +unit_test_ensure_success([[ vcpkg_fixup_pkgconfig(SKIP_CHECK) ]]) +unit_test_pkgconfig_check_key("debug" "Libs:" [[ aaa.lib libdbg.a]]) +unit_test_pkgconfig_check_key("release" "Libs:" [[ aaa.lib librel.a]]) + +write_pkgconfig([[Libs: aaa.lib optimized librel.a debug libdbg.a bbb.lib]]) +unit_test_ensure_success([[ vcpkg_fixup_pkgconfig(SKIP_CHECK) ]]) +unit_test_pkgconfig_check_key("debug" "Libs:" [[ aaa.lib libdbg.a bbb.lib]]) +unit_test_pkgconfig_check_key("release" "Libs:" [[ aaa.lib librel.a bbb.lib]]) + +# invalid: namespaced targets +write_pkgconfig([[Libs: -lAAA::aaa]]) +# Only warning: unit_test_ensure_fatal_error([[ vcpkg_fixup_pkgconfig(SKIP_CHECK) # namespaced target # ]]) + +# prefix +write_pkgconfig( +"prefix=${CURRENT_PACKAGES_DIR} +execprefix=\${prefix} +libdir=${CURRENT_PACKAGES_DIR}/lib +includedir=${CURRENT_PACKAGES_DIR}/include +datarootdir=${CURRENT_PACKAGES_DIR}/share +datadir=\${datarootdir}/${PORT} +") +unit_test_ensure_success([[ vcpkg_fixup_pkgconfig(SKIP_CHECK) ]]) +unit_test_pkgconfig_check_key("release" "prefix=" [[${pcfiledir}/../..]]) +unit_test_pkgconfig_check_key("release" "execprefix=" [[${prefix}]]) +unit_test_pkgconfig_check_key("release" "libdir=" [[${prefix}/lib]]) +unit_test_pkgconfig_check_key("release" "includedir=" [[${prefix}/include]]) +unit_test_pkgconfig_check_key("release" "datarootdir=" [[${prefix}/share]]) +unit_test_pkgconfig_check_key("release" "datadir=" [[${datarootdir}/unit-test-cmake]]) + +if(NOT VCPKG_BUILD_TYPE) + write_pkgconfig( +"prefix=${CURRENT_PACKAGES_DIR}/debug +execprefix=\${prefix} +libdir=${CURRENT_PACKAGES_DIR}/debug/lib +includedir=${CURRENT_PACKAGES_DIR}/include +datarootdir=${CURRENT_PACKAGES_DIR}/share +datadir=\${datarootdir}/${PORT} +") + unit_test_ensure_success([[ vcpkg_fixup_pkgconfig(SKIP_CHECK) ]]) + unit_test_pkgconfig_check_key("debug" "prefix=" [[${pcfiledir}/../..]]) + unit_test_pkgconfig_check_key("debug" "execprefix=" [[${prefix}]]) + unit_test_pkgconfig_check_key("debug" "libdir=" [[${prefix}/lib]]) + unit_test_pkgconfig_check_key("debug" "includedir=" [[${prefix}/../include]]) + unit_test_pkgconfig_check_key("debug" "datarootdir=" [[${prefix}/../share]]) + unit_test_pkgconfig_check_key("debug" "datadir=" [[${datarootdir}/unit-test-cmake]]) +endif() + +# -I, -l or -L with ${blah} in variables +write_pkgconfig([[blah_libs=-L${blah}/lib64 -l${blah}/libblah.a -I${blah}/include]]) +unit_test_ensure_success([[ vcpkg_fixup_pkgconfig(SKIP_CHECK) ]]) +unit_test_pkgconfig_check_key("debug;release" "blah_libs=" [["-L${blah}/lib64" "-l${blah}/libblah.a" "-I${blah}/include"]]) + +# plain vs. quoted items +write_pkgconfig([[Libs: ${blah} "${quoted}" plain "C:/Program Files/blah.lib"]]) +unit_test_ensure_success([[ vcpkg_fixup_pkgconfig(SKIP_CHECK) ]]) +unit_test_pkgconfig_check_key("debug;release" "Libs:" [[ ${blah} "${quoted}" plain "C:/Program Files/blah.lib"]]) + +# lib spec starting with optimized/debug/general +write_pkgconfig([[ +Libs: -L${prefix}/lib -ldebuginfod +]]) +unit_test_ensure_success([[ vcpkg_fixup_pkgconfig(SKIP_CHECK) ]]) +unit_test_pkgconfig_check_key("debug;release" "Libs:" [[ "-L${prefix}/lib" -ldebuginfod]]) + +write_pkgconfig([[ +Libs: -L${prefix}/lib -loptimizedinfod +]]) +unit_test_ensure_success([[ vcpkg_fixup_pkgconfig(SKIP_CHECK) ]]) +unit_test_pkgconfig_check_key("debug;release" "Libs:" [[ "-L${prefix}/lib" -loptimizedinfod]]) + +write_pkgconfig([[ +Libs: -L${prefix}/lib -lgeneralinfod +]]) +unit_test_ensure_success([[ vcpkg_fixup_pkgconfig(SKIP_CHECK) ]]) +unit_test_pkgconfig_check_key("debug;release" "Libs:" [[ "-L${prefix}/lib" -lgeneralinfod]]) diff --git a/triplets/community/x64-windows-release.cmake b/triplets/x64-windows-release.cmake similarity index 100% rename from triplets/community/x64-windows-release.cmake rename to triplets/x64-windows-release.cmake diff --git a/versions/baseline.json b/versions/baseline.json index 22ea5b5389..8dca19009a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7786,7 +7786,7 @@ }, "qtwebengine": { "baseline": "6.8.2", - "port-version": 0 + "port-version": 1 }, "qtwebsockets": { "baseline": "6.8.2", diff --git a/versions/q-/qtwebengine.json b/versions/q-/qtwebengine.json index 6a3f8f5fc9..e843ff125c 100644 --- a/versions/q-/qtwebengine.json +++ b/versions/q-/qtwebengine.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3381ad87b2390bdc8d9b69730c80a15ce966e8b0", + "version": "6.8.2", + "port-version": 1 + }, { "git-tree": "1b5fb8d12b758523a9c25316f9cd6b98154081f5", "version": "6.8.2",