add port vcpkg-tool-python2

ports/qt5-base/cmake/qt_build_submodule.cmake

@@ -3,10 +3,6 @@ function(qt_build_submodule SOURCE_PATH)
     # This fixes issues on machines with default codepages that are not ASCII compatible, such as some CJK encodings
     set(ENV{_CL_} "/utf-8")
 
-    vcpkg_find_acquire_program(PYTHON2)
-    get_filename_component(PYTHON2_EXE_PATH ${PYTHON2} DIRECTORY)
-    vcpkg_add_to_path("${PYTHON2_EXE_PATH}")
-
     vcpkg_configure_qmake(SOURCE_PATH ${SOURCE_PATH} ${ARGV})
 
     vcpkg_build_qmake(SKIP_MAKEFILES)

ports/qt5-base/vcpkg.json

@@ -1,6 +1,7 @@
 {
   "name": "qt5-base",
   "version": "5.15.3",
+  "port-version": 1,
   "description": "Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.",
   "homepage": "https://www.qt.io/",
   "license": null,

ports/qt5-webengine/portfile.cmake

@@ -15,6 +15,10 @@ if(NOT VCPKG_TARGET_IS_WINDOWS)
 endif()
 include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake)
 
+vcpkg_find_acquire_program(PYTHON2)
+get_filename_component(PYTHON2_EXE_PATH ${PYTHON2} DIRECTORY)
+vcpkg_add_to_path("${PYTHON2_EXE_PATH}")
+
 vcpkg_find_acquire_program(FLEX)
 vcpkg_find_acquire_program(BISON)
 vcpkg_find_acquire_program(GPERF)

ports/qt5-webengine/vcpkg.json

@@ -1,6 +1,7 @@
 {
   "name": "qt5-webengine",
   "version": "5.15.3",
+  "port-version": 1,
   "description": "Qt5 webengine Module;",
   "license": null,
   "supports": "!static",

ports/vcpkg-tool-lessmsi/portfile.cmake

@@ -0,0 +1,17 @@
+set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
+
+set(version v1.10.0)
+
+vcpkg_download_distfile(archive_path
+    URLS "https://github.com/activescott/lessmsi/releases/download/${version}/lessmsi-${version}.zip"
+    FILENAME "lessmsi-${version}"
+    SHA512 91be9363d75e8ca0129304008ddc26fe575cc4fd76d7f43ef0a6ff414855dc1c6e412f4e694b2950026e02cc3d31b18bd8c2e4c03e1ddce01477f3f2d2197479
+)
+
+file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
+
+vcpkg_execute_in_download_mode(
+                    COMMAND "${CMAKE_COMMAND}" -E tar xzf "${archive_path}"
+                    WORKING_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}"
+                )
+

ports/vcpkg-tool-lessmsi/vcpkg.json

@@ -0,0 +1,7 @@
+{
+  "name": "vcpkg-tool-lessmsi",
+  "version": "1.10.0",
+  "description": "This is a utility with a graphical user interface and a command line interface that can be used to view and extract the contents of an MSI file.",
+  "homepage": "https://github.com/activescott/lessmsi",
+  "supports": "native & windows"
+}

ports/vcpkg-tool-python2/portfile.cmake

@@ -0,0 +1,49 @@
+set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
+
+if(VCPKG_TARGET_IS_WINDOWS)
+    set(program_name python)
+    set(program_version 2.7.18)
+    if (VCPKG_TARGET_ARCHITECTURE STREQUAL x86)
+        set(tool_subdirectory "python-${program_version}-x86")
+        set(download_urls "https://www.python.org/ftp/python/${program_version}/python-${program_version}.msi")
+        set(download_filename "python-${program_version}.msi")
+        set(download_sha512 2c112733c777ddbf189b0a54047a9d5851ebce0564cc38b9687d79ce6c7a09006109dbad8627fb1a60c3ad55e261db850d9dfa454af0533b460b2afc316fe115)
+    else()
+        set(tool_subdirectory "python-${program_version}-x64")
+        set(download_urls "https://www.python.org/ftp/python/${program_version}/python-${program_version}.amd64.msi")
+        set(download_filename "python-${program_version}.amd64.msi")
+        set(download_sha512 6a81a413b80fd39893e7444fd47efa455d240cbb77a456c9d12f7cf64962b38c08cfa244cd9c50a65947c40f936c6c8c5782f7236d7b92445ab3dd01e82af23e)
+    endif()
+    set(paths_to_search "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
+
+    vcpkg_download_distfile(archive_path
+        URLS ${download_urls}
+        SHA512 "${download_sha512}"
+        FILENAME "${download_filename}"
+    )
+    set(output_path "${CURRENT_PACKAGES_DIR}/tools")
+    file(MAKE_DIRECTORY "${output_path}")
+    cmake_path(NATIVE_PATH archive_path archive_path_native) # lessmsi is a bit picky about path formats.
+    message(STATUS "Extracting Python2 ...")
+    vcpkg_execute_in_download_mode(
+                    COMMAND "${CURRENT_INSTALLED_DIR}/tools/vcpkg-tool-lessmsi/lessmsi.exe" x "${archive_path_native}" # Using output_path here does not work in bash
+                    WORKING_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools" 
+                    OUTPUT_FILE "lessmsi-${arg_FILENAME}-out.log"
+                    ERROR_FILE "lessmsi-${arg_FILENAME}-err.log"
+                    RESULT_VARIABLE error_code
+                )
+    if(error_code)
+        message(FATAL_ERROR "Couldn't extract Python2 with lessmsi!")
+    endif()
+    message(STATUS "Extracting Python2 ... finished!")
+    file(RENAME "${CURRENT_PACKAGES_DIR}/tools/python-2.7.18.amd64/SourceDir/" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/")
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools/python-2.7.18.amd64")
+    z_vcpkg_find_acquire_program_find_internal("${program}"
+        INTERPRETER "${interpreter}"
+        PATHS ${paths_to_search}
+        NAMES ${search_names}
+    )
+    message(STATUS "Using python2: ${PYTHON2}")
+    file(WRITE "${CURRENT_PACKAGES_DIR}/share/${PORT}/version.txt" "${program_version}") # For vcpkg_find_acquire_program
+endif()
+

ports/vcpkg-tool-python2/vcpkg.json

@@ -0,0 +1,14 @@
+{
+  "name": "vcpkg-tool-python2",
+  "version": "2.7.18",
+  "description": "Python 2",
+  "homepage": "https://www.python.org/download/releases/2.0/",
+  "supports": "native",
+  "dependencies": [
+    {
+      "name": "vcpkg-tool-lessmsi",
+      "host": true,
+      "platform": "windows"
+    }
+  ]
+}

scripts/cmake/vcpkg_find_acquire_program.cmake

@@ -270,18 +270,23 @@ function(vcpkg_find_acquire_program program)
         if(CMAKE_HOST_WIN32)
             set(program_name python)
             set(program_version 2.7.18)
-            if (VCPKG_TARGET_ARCHITECTURE STREQUAL x86)
-                set(tool_subdirectory "python-${program_version}-x86")
-                set(download_urls "https://www.python.org/ftp/python/${program_version}/python-${program_version}.msi")
-                set(download_filename "python-${program_version}.msi")
-                set(download_sha512 2c112733c777ddbf189b0a54047a9d5851ebce0564cc38b9687d79ce6c7a09006109dbad8627fb1a60c3ad55e261db850d9dfa454af0533b460b2afc316fe115)
-            else()
-                set(tool_subdirectory "python-${program_version}-x64")
-                set(download_urls "https://www.python.org/ftp/python/${program_version}/python-${program_version}.amd64.msi")
-                set(download_filename "python-${program_version}.amd64.msi")
-                set(download_sha512 6a81a413b80fd39893e7444fd47efa455d240cbb77a456c9d12f7cf64962b38c08cfa244cd9c50a65947c40f936c6c8c5782f7236d7b92445ab3dd01e82af23e)
+            if(EXISTS "${CURRENT_HOST_INSTALLED_DIR}/share/vcpkg-tool-python2/version.txt")
+                file(READ "${CURRENT_HOST_INSTALLED_DIR}/share/vcpkg-tool-python2/version.txt" program_version)
+                set(paths_to_search "${CURRENT_HOST_INSTALLED_DIR}/tools/vcpkg-tool-python2")
+            else() # Old behavior
+                if (VCPKG_TARGET_ARCHITECTURE STREQUAL x86)
+                    set(tool_subdirectory "python-${program_version}-x86")
+                    set(download_urls "https://www.python.org/ftp/python/${program_version}/python-${program_version}.msi")
+                    set(download_filename "python-${program_version}.msi")
+                    set(download_sha512 2c112733c777ddbf189b0a54047a9d5851ebce0564cc38b9687d79ce6c7a09006109dbad8627fb1a60c3ad55e261db850d9dfa454af0533b460b2afc316fe115)
+                else()
+                    set(tool_subdirectory "python-${program_version}-x64")
+                    set(download_urls "https://www.python.org/ftp/python/${program_version}/python-${program_version}.amd64.msi")
+                    set(download_filename "python-${program_version}.amd64.msi")
+                    set(download_sha512 6a81a413b80fd39893e7444fd47efa455d240cbb77a456c9d12f7cf64962b38c08cfa244cd9c50a65947c40f936c6c8c5782f7236d7b92445ab3dd01e82af23e)
+                endif()
+                set(paths_to_search "${DOWNLOADS}/tools/python/${tool_subdirectory}")
             endif()
-            set(paths_to_search "${DOWNLOADS}/tools/python/${tool_subdirectory}")
         elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin")
             # macOS includes Python 2.7 built-in as `python`
             set(program_name python)