microsoft · strega-nil-ms · Apr 14, 2022 · Apr 8, 2022 · Apr 8, 2022 · Apr 8, 2022
diff --git a/ports/qtinterfaceframework/49b44d4.diff b/ports/qtinterfaceframework/49b44d4.diff
@@ -0,0 +1,148 @@
+From 49b44d45c9eb5b5b98697f9ebb74204d45f0db38 Mon Sep 17 00:00:00 2001
+From: Dominik Holland <dominik.holland@qt.io>
+Date: Wed, 06 Apr 2022 15:43:23 +0200
+Subject: [PATCH] ifcodegen: Add a fallback mechanism for too recent python packages
+
+After the virtualenv is created the generator is now verified to be
+working correctly. In case the generator doesn't work, an error
+message is shown, which suggests to reconfigure with
+
+-DQT_USE_MINIMAL_QFACE_PACKAGES=TRUE
+
+The new option will install the minimum required dependencies for
+qface.
+
+Fixes: QTBUG-102348
+Pick-to: 6.2 6.3
+Change-Id: I59aca5848da8928e94c0d33a108735847d9260a2
+---
+
+diff --git a/src/tools/ifcodegen/CMakeLists.txt b/src/tools/ifcodegen/CMakeLists.txt
+index 2d9e3a4..317d77f 100644
+--- a/src/tools/ifcodegen/CMakeLists.txt
++++ b/src/tools/ifcodegen/CMakeLists.txt
+@@ -22,11 +22,13 @@
+     if ("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Windows")
+         set(VIRTUALENV_ACTIVATE ${VIRTUALENV_PATH}/Scripts/activate.bat)
+         set(VIRTUALENV_ACTIVATE_COMMAND ${VIRTUALENV_ACTIVATE})
++        set(VIRTUALENV_PYTHON ${VIRTUALENV_PATH}/Scripts/python.exe)
+         set(IFCODEGEN_BIN ${VIRTUALENV_PATH}/Scripts/qface.exe)
+         set(DEPLOY_VIRTUALENV ${CMAKE_CURRENT_SOURCE_DIR}/deploy-virtualenv.bat)
+     else()
+         set(VIRTUALENV_ACTIVATE ${VIRTUALENV_PATH}/bin/activate)
+         set(VIRTUALENV_ACTIVATE_COMMAND . ${VIRTUALENV_ACTIVATE})
++        set(VIRTUALENV_PYTHON ${VIRTUALENV_PATH}/bin/python)
+         set(IFCODEGEN_BIN ${VIRTUALENV_PATH}/bin/qface)
+         set(DEPLOY_VIRTUALENV ${CMAKE_CURRENT_SOURCE_DIR}/deploy-virtualenv.sh)
+     endif()
+@@ -63,6 +65,15 @@
+     # someone is working on the qface sources
+     file(GLOB_RECURSE IFCODEGEN_SOURCE_FILES ${IFCODEGEN_SOURCE_DIR}/*.py)
+
++    # If the upstream python packages introduce a regression this option can be used to install
++    # the minimum version for all required python package and produce a working setup
++    # Those packages might be outdated and may contain security holes, but they are known to be
++    # working.
++    set(INSTALL_MINIMAL_QFACE_PACKAGES_COMMAND)
++    if (QT_USE_MINIMAL_QFACE_PACKAGES)
++        set(INSTALL_MINIMAL_QFACE_PACKAGES_COMMAND COMMAND pip3 install -r ${IFCODEGEN_SOURCE_DIR}/requirements_minimal.txt)
++    endif()
++
+     # On the CI we use the special wheel folder when available to not download all packages again on each build
+     set(PYTHON3_WHEEL_CACHE "$ENV{PYTHON3_WHEEL_CACHE}" CACHE PATH "Python3 wheel cache")
+     if (EXISTS "${PYTHON3_WHEEL_CACHE}")
+@@ -74,6 +85,7 @@
+
+     add_custom_command(OUTPUT ${IFCODEGEN_BIN}
+                        COMMAND ${VIRTUALENV_ACTIVATE_COMMAND}
++                       ${INSTALL_MINIMAL_QFACE_PACKAGES_COMMAND}
+                        COMMAND ${PIP3_INSTALL_COMMAND}
+                        DEPENDS ${VIRTUALENV_ACTIVATE}
+                                ${IFCODEGEN_SOURCE_DIR}/requirements.txt
+@@ -82,16 +94,23 @@
+                        )
+
+     add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/.stamp-deploy_virtualenv
+-                              ${CMAKE_CURRENT_BINARY_DIR}/.stamp-cmake-rerun
+                        COMMAND ${DEPLOY_VIRTUALENV} qtif_qface_virtualenv
+                        COMMAND ${CMAKE_COMMAND} -E touch .stamp-deploy_virtualenv
+-                       COMMAND ${CMAKE_COMMAND} -E touch .stamp-cmake-rerun
+                        DEPENDS ${IFCODEGEN_BIN}
+                       )
+
++   add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/.stamp-generator-verified
++                             ${CMAKE_CURRENT_BINARY_DIR}/.stamp-cmake-rerun
++                      COMMAND ${VIRTUALENV_PYTHON} ${CMAKE_CURRENT_SOURCE_DIR}/verify_generator.py
++                      COMMAND ${CMAKE_COMMAND} -E touch .stamp-generator-verified
++                      COMMAND ${CMAKE_COMMAND} -E touch .stamp-cmake-rerun
++                      DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/.stamp-deploy_virtualenv
++                      COMMENT "Verifying generator"
++                      )
++
+     # main target which just relies on the stamp file to be uptodate
+     add_custom_target(ifcodegen ALL
+-                      DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/.stamp-deploy_virtualenv
++                      DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/.stamp-generator-verified
+                       DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/.stamp-cmake-rerun
+                       )
+     # Create the rerun cmake stamp file here to be able to add cmake configure dependency
+@@ -109,6 +128,7 @@
+     #####################################################################
+
+     set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_CLEAN_FILES
++        ${CMAKE_CURRENT_BINARY_DIR}/.stamp-generator-verified
+         ${CMAKE_CURRENT_BINARY_DIR}/.stamp-deploy_virtualenv
+         ${CMAKE_CURRENT_BINARY_DIR}/.stamp-cmake-rerun
+         ${VIRTUALENV_PATH}
+diff --git a/src/tools/ifcodegen/verify_generator.py b/src/tools/ifcodegen/verify_generator.py
+new file mode 100755
+index 0000000..c3f85d6
+--- /dev/null
++++ b/src/tools/ifcodegen/verify_generator.py
+@@ -0,0 +1,46 @@
++#!/usr/bin/env python3
++#############################################################################
++##
++## Copyright (C) 2022 The Qt Company Ltd.
++## Contact: https://www.qt.io/licensing/
++##
++## This file is part of the QtInterfaceFramework module of the Qt Toolkit.
++##
++## $QT_BEGIN_LICENSE:GPL-EXCEPT$
++## Commercial License Usage
++## Licensees holding valid commercial Qt licenses may use this file in
++## accordance with the commercial license agreement provided with the
++## Software or, alternatively, in accordance with the terms contained in
++## a written agreement between you and The Qt Company. For licensing terms
++## and conditions see https://www.qt.io/terms-conditions. For further
++## information use the contact form at https://www.qt.io/contact-us.
++##
++## GNU General Public License Usage
++## Alternatively, this file may be used under the terms of the GNU
++## General Public License version 3 as published by the Free Software
++## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
++## included in the packaging of this file. Please review the following
++## information to ensure the GNU General Public License requirements will
++## be met: https://www.gnu.org/licenses/gpl-3.0.html.
++##
++## $QT_END_LICENSE$
++##
++#############################################################################
++
++try:
++    import generate
++except Exception as e:
++    raise SystemExit("""
++          Verifying the generator failed!
++
++          This might be caused by a too recent python version or
++          too recent python packages. You can try installing older
++          python packages by running configure again with the the
++          following option:
++
++          -DQT_USE_MINIMAL_QFACE_PACKAGES=TRUE
++
++          The python error was:
++
++          {}
++          """.format(e))
diff --git a/ports/qtinterfaceframework/portfile.cmake b/ports/qtinterfaceframework/portfile.cmake
@@ -1,59 +1,8 @@
 set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase")
 include("${SCRIPT_PATH}/qt_install_submodule.cmake")
 
-function(vcpkg_get_python_package PYTHON_DIR ) # From mesa
-    cmake_parse_arguments(PARSE_ARGV 0 _vgpp "" "PYTHON_EXECUTABLE" "PACKAGES")
-
-    if(NOT _vgpp_PYTHON_EXECUTABLE)
-        message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} requires parameter PYTHON_EXECUTABLE!")
-    endif()
-    if(NOT _vgpp_PACKAGES)
-        message(FATAL_ERROR "${CMAKE_CURRENT_FUNCTION} requires parameter PACKAGES!")
-    endif()
-    if(NOT _vgpp_PYTHON_DIR)
-        get_filename_component(_vgpp_PYTHON_DIR "${_vgpp_PYTHON_EXECUTABLE}" DIRECTORY)
-    endif()
-
-    if (WIN32)
-        set(PYTHON_OPTION "")
-    else()
-        set(PYTHON_OPTION "--user")
-    endif()
-
-    if("${_vgpp_PYTHON_DIR}" MATCHES "${DOWNLOADS}") # inside vcpkg
-        if(NOT EXISTS "${_vgpp_PYTHON_DIR}/easy_install${VCPKG_HOST_EXECUTABLE_SUFFIX}")
-            if(NOT EXISTS "${_vgpp_PYTHON_DIR}/Scripts/pip${VCPKG_HOST_EXECUTABLE_SUFFIX}")
-                vcpkg_from_github(
-                    OUT_SOURCE_PATH PYFILE_PATH
-                    REPO pypa/get-pip
-                    REF 309a56c5fd94bd1134053a541cb4657a4e47e09d #2019-08-25
-                    SHA512 bb4b0745998a3205cd0f0963c04fb45f4614ba3b6fcbe97efe8f8614192f244b7ae62705483a5305943d6c8fedeca53b2e9905aed918d2c6106f8a9680184c7a
-                    HEAD_REF master
-                )
-                execute_process(COMMAND "${_vgpp_PYTHON_EXECUTABLE}" "${PYFILE_PATH}/get-pip.py" ${PYTHON_OPTION})
-            endif()
-            foreach(_package IN LISTS _vgpp_PACKAGES)
-                execute_process(COMMAND "${_vgpp_PYTHON_DIR}/Scripts/pip${VCPKG_HOST_EXECUTABLE_SUFFIX}" install ${_package} ${PYTHON_OPTION})
-            endforeach()
-        else()
-            foreach(_package IN LISTS _vgpp_PACKAGES)
-                execute_process(COMMAND "${_vgpp_PYTHON_DIR}/easy_install${VCPKG_HOST_EXECUTABLE_SUFFIX}" ${_package})
-            endforeach()
-        endif()
-        if(NOT VCPKG_TARGET_IS_WINDOWS)
-            execute_process(COMMAND pip3 install ${_vgpp_PACKAGES})
-        endif()
-    else() # outside vcpkg
-        foreach(_package IN LISTS _vgpp_PACKAGES)
-            execute_process(COMMAND ${_vgpp_PYTHON_EXECUTABLE} -c "import ${_package}" RESULT_VARIABLE HAS_ERROR)
-            if(HAS_ERROR)
-                message(FATAL_ERROR "Python package '${_package}' needs to be installed for port '${PORT}'.\nComplete list of required python packages: ${_vgpp_PACKAGES}")
-            endif()
-        endforeach()
-    endif()
-endfunction()
-
-set(${PORT}_PATCHES fix-taglib-search.patch) # Strictly this is only required if qt does not use pkg-config since it forces it to off. 
+set(${PORT}_PATCHES fix-taglib-search.patch # Strictly this is only required if qt does not use pkg-config since it forces it to off. 
+                    49b44d4.diff)
 set(TOOL_NAMES 
         ifmedia-simulation-server
         ifvehiclefunctions-simulation-server
@@ -73,8 +22,23 @@ vcpkg_find_acquire_program(PYTHON3)
 get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY )
 vcpkg_add_to_path(PREPEND "${PYTHON3_DIR}")
 vcpkg_add_to_path(PREPEND "${PYTHON3_DIR}/Scripts")
-vcpkg_get_python_package(PYTHON_EXECUTABLE "${PYTHON3}" PACKAGES virtualenv qface)
-
+x_vcpkg_get_python_packages(PYTHON_EXECUTABLE "${PYTHON3}" PACKAGES virtualenv 
+                                                                    Jinja2==2.10.3
+                                                                    antlr4-python3-runtime==4.7.1
+                                                                    argh==0.26.2
+                                                                    click==6.7
+                                                                    coloredlogs==10.0
+                                                                    humanfriendly==4.15.1
+                                                                    MarkupSafe==1.1
+                                                                    path.py==11.0.1
+                                                                    pathtools==0.1.2
+                                                                    PyYAML==5.1
+                                                                    six==1.11.0
+                                                                    watchdog==0.8.3
+                                                                    pytest==6.2.5
+                                                                    pytest-cov==2.8.1
+                                                                    qface==2.0.7)
+file(COPY "${CURRENT_PORT_DIR}/requirements_minimal.txt" DESTINATION "${SOURCE_PATH}/src/3rdparty/qface")
 if(VCPKG_CROSSCOMPILING)
     list(APPEND FEATURE_OPTIONS "-DVCPKG_HOST_TRIPLET=${_HOST_TRIPLET}")
 endif()
@@ -84,6 +48,7 @@ set(qt_qmldir ${QT6_DIRECTORY_PREFIX}qml)
 qt_cmake_configure(${_opt} 
                    OPTIONS ${FEATURE_OPTIONS}
                         "-DPython3_EXECUTABLE=${PYTHON3}" # Otherwise a VS installation might be found. 
+                        "-DQT_USE_MINIMAL_QFACE_PACKAGES=TRUE"
                    OPTIONS_DEBUG ${_qis_CONFIGURE_OPTIONS_DEBUG}
                    OPTIONS_RELEASE ${_qis_CONFIGURE_OPTIONS_RELEASE})
 

diff --git a/ports/qtinterfaceframework/requirements_minimal.txt b/ports/qtinterfaceframework/requirements_minimal.txt
@@ -0,0 +1,14 @@
+antlr4-python3-runtime==4.7.1
+argh==0.26.2
+click==6.7
+coloredlogs==10.0
+humanfriendly==4.15.1
+Jinja2==2.10.3
+MarkupSafe==1.1
+path.py==11.0.1
+pathtools==0.1.2
+PyYAML==5.1
+six==1.11.0
+watchdog==0.8.3
+pytest==5.3.5
+pytest-cov==2.8.1
diff --git a/ports/qtinterfaceframework/vcpkg.json b/ports/qtinterfaceframework/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "qtinterfaceframework",
   "version": "6.2.4",
+  "port-version": 1,
   "description": "Qt Interface Framework",
   "homepage": "https://www.qt.io/",
   "license": null,
@@ -18,6 +19,11 @@
       "host": true,
       "default-features": false
     },
+    {
+      "name": "vcpkg-get-python-packages",
+      "host": true,
+      "default-features": false
+    },
     {
       "name": "qtmultimedia",
       "default-features": false

diff --git a/ports/vcpkg-get-python-packages/portfile.cmake b/ports/vcpkg-get-python-packages/portfile.cmake
@@ -2,6 +2,7 @@ file(COPY
     "${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake"
     "${CMAKE_CURRENT_LIST_DIR}/copyright"
     "${CMAKE_CURRENT_LIST_DIR}/x_vcpkg_get_python_packages.cmake"
+    "${CMAKE_CURRENT_LIST_DIR}/python310._pth"
     DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 
 set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
diff --git a/ports/vcpkg-get-python-packages/python310._pth b/ports/vcpkg-get-python-packages/python310._pth
@@ -0,0 +1,7 @@
+python310.zip
+Lib
+Lib/site-packages
+.
+
+# Uncomment to run site.main() automatically
+#import site
diff --git a/ports/vcpkg-get-python-packages/x_vcpkg_get_python_packages.cmake b/ports/vcpkg-get-python-packages/x_vcpkg_get_python_packages.cmake
@@ -38,6 +38,7 @@ function(x_vcpkg_get_python_packages)
     get_filename_component(python_dir "${arg_PYTHON_EXECUTABLE}" DIRECTORY)
 
     if("${python_dir}" MATCHES "(${DOWNLOADS}|${CURRENT_HOST_INSTALLED_DIR})" AND CMAKE_HOST_WIN32) # inside vcpkg and windows host. 
+        file(COPY "${CURRENT_HOST_INSTALLED_DIR}/share/vcpkg-get-python-packages/python310._pth" DESTINATION "${python_dir}")
         if(NOT EXISTS "${python_dir}/easy_install${VCPKG_HOST_EXECUTABLE_SUFFIX}")
             if(NOT EXISTS "${python_dir}/Scripts/pip${VCPKG_HOST_EXECUTABLE_SUFFIX}")
                 vcpkg_from_github(
@@ -47,24 +48,41 @@ function(x_vcpkg_get_python_packages)
                     SHA512 bb4b0745998a3205cd0f0963c04fb45f4614ba3b6fcbe97efe8f8614192f244b7ae62705483a5305943d6c8fedeca53b2e9905aed918d2c6106f8a9680184c7a
                 )
                 vcpkg_execute_required_process(COMMAND "${arg_PYTHON_EXECUTABLE}" "${PYFILE_PATH}/get-pip.py"
-                                               WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}")
+                                               WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}"
+                                               LOGNAME "get-pip-${TARGET_TRIPLET}")
             endif()
-            foreach(_package IN LISTS arg_PACKAGES)
-                vcpkg_execute_required_process(COMMAND "${python_dir}/Scripts/pip${VCPKG_HOST_EXECUTABLE_SUFFIX}" install ${_package}
-                                               WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}")
-            endforeach()
+            vcpkg_execute_required_process(COMMAND "${python_dir}/Scripts/pip${VCPKG_HOST_EXECUTABLE_SUFFIX}" install virtualenv
+                                           WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}"
+                                           LOGNAME "pip-install-virtualenv-${TARGET_TRIPLET}")
         else()
-            foreach(_package IN LISTS arg_PACKAGES)
-                vcpkg_execute_required_process(COMMAND "${python_dir}/easy_install${VCPKG_HOST_EXECUTABLE_SUFFIX}" ${_package}
-                                               WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}")
-            endforeach()
+            vcpkg_execute_required_process(COMMAND "${python_dir}/easy_install${VCPKG_HOST_EXECUTABLE_SUFFIX}" virtualenv #${_package}
+                                           WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}"
+                                           LOGNAME "easy-install-virtualenv-${TARGET_TRIPLET}")
         endif()
-    else() # outside vcpkg
-        foreach(package IN LISTS arg_PACKAGES)
-            vcpkg_execute_in_download_mode(COMMAND ${arg_PYTHON_EXECUTABLE} -c "import ${package}" RESULT_VARIABLE HAS_ERROR)
-            if(HAS_ERROR)
-                message(FATAL_ERROR "Python package '${package}' needs to be installed for port '${PORT}'.\nComplete list of required python packages: ${arg_PACKAGES}")
-            endif()
-        endforeach()
+
+    #else() # outside vcpkg
+    #    foreach(package IN LISTS arg_PACKAGES)
+    #        string(REGEX REPLACE "[>=<]+.+" "" package_no_version "${package}") # Remove version constrins for testing
+    #        vcpkg_execute_in_download_mode(COMMAND ${arg_PYTHON_EXECUTABLE} -c "import ${package_no_version}" RESULT_VARIABLE HAS_ERROR)
+    #        if(HAS_ERROR)
+    #            message(FATAL_ERROR "Python package '${package}' needs to be installed for port '${PORT}'.\nComplete list of required python packages: ${arg_PACKAGES}")
+    #        endif()
+    #    endforeach()
     endif()
+
+    vcpkg_execute_required_process(COMMAND "${PYTHON3}" -m venv --symlinks "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-venv"
+                                   WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}" 
+                                   LOGNAME "prerequisites-venv-${TARGET_TRIPLET}")
+    vcpkg_add_to_path(PREPEND "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-venv/bin")
+    set(PYTHON3 "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-venv/bin/python3${VCPKG_HOST_EXECUTABLE_SUFFIX}")
+    set(ENV{VIRTUAL_ENV} "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-venv")
+    vcpkg_execute_required_process(COMMAND "${PYTHON3}" -c "import site; print(site.getusersitepackages())" 
+                                   WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}" 
+                                   LOGNAME "prerequisites-pypath-${TARGET_TRIPLET}" 
+                                   OUTPUT_VARIABLE PYTHON_LIB_PATH)
+    set(ENV{PYTHON_BIN_PATH} "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-venv/bin/")
+    set(ENV{PYTHON_LIB_PATH} "${PYTHON_LIB_PATH}")
+    vcpkg_execute_required_process(COMMAND "${PYTHON3}" -m pip install -U ${arg_PACKAGES} 
+                                   WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}" 
+                                   LOGNAME "prerequisites-pip-${TARGET_TRIPLET}")
 endfunction()
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
@@ -1015,9 +1015,6 @@ qt5-base:arm64-windows=fail
 # qtwebengine:x64-windows has an ICE in VS2022
 qtwebengine:x64-windows=fail
 
-# upstream bug, see https://github.com/microsoft/vcpkg/issues/23766
-qtinterfaceframework:x64-windows=skip
-
 # Skip deprecated Qt module
 # (remove after 1 year or longer due to vcpkg upgrade not handling removed ports correctly)
 qt5-canvas3d:x64-linux=skip