@openziti/ziti-sdk-nodejs 0.16.0 → 0.18.0

package/vcpkg/ports/vcpkg-cmake-get-vars/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "vcpkg-cmake-get-vars",
-  "version-date": "2023-03-02",
+  "version-date": "2024-09-22",
   "documentation": "https://vcpkg.io/en/docs/README.html",
   "license": "MIT",
   "dependencies": [

package/vcpkg/ports/vcpkg-get-python/portfile.cmake

@@ -0,0 +1,7 @@
+
+file(INSTALL
+    "${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake"
+    DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+
+vcpkg_install_copyright(FILE_LIST "${VCPKG_ROOT_DIR}/LICENSE.txt")
+set(VCPKG_POLICY_CMAKE_HELPER_PORT enabled)

package/vcpkg/ports/vcpkg-get-python/vcpkg-port-config.cmake

@@ -0,0 +1,57 @@
+include_guard(GLOBAL)
+
+function(vcpkg_get_vcpkg_installed_python out_python)
+  if(NOT VCPKG_TARGET_IS_WINDOWS)
+    # vcpkg installed python on !windows works as normal python would work.
+    set(${out_python} "${CURRENT_HOST_INSTALLED_DIR}/tools/python3/python3" PARENT_SCOPE)
+    return()
+  endif()
+  if(DEFINED CACHE{z_vcpkg_get_vcpkg_installed_python})
+    set(${out_python} "${z_vcpkg_get_vcpkg_installed_python}" PARENT_SCOPE)
+    return()
+  endif()
+
+  # On windows python is unable to lookup DLLs, so a manual venv is created
+  set(python_home "${CURRENT_HOST_INSTALLED_DIR}/tools/python3")
+  set(python_base "${CURRENT_BUILDTREES_DIR}/python-${TARGET_TRIPLET}")
+
+  file(GLOB python_files LIST_DIRECTORIES false "${python_home}/*")
+  if(EXISTS "${CURRENT_HOST_INSTALLED_DIR}/tools/python3/DLLs")
+    file(COPY "${CURRENT_HOST_INSTALLED_DIR}/tools/python3/DLLs/" DESTINATION "${python_base}/DLLs")
+  endif()
+  file(COPY ${python_files} DESTINATION "${python_base}/Scripts")
+  file(MAKE_DIRECTORY "${python_base}/Lib/site-packages")
+
+  file(WRITE "${python_base}/pyvenv.cfg"
+"
+home = ${python_home}
+include-system-site-packages = false
+version = ${PYTHON3_VERSION}
+executable = ${python_home}/python.exe
+command = ${python_home}/python.exe -m venv ${python_base}
+"
+)
+
+  file(WRITE "${python_base}/Lib/site-packages/sitecustomize.py"
+"
+import os
+import sys
+from pathlib import Path
+
+import site
+#enable direct lookup of installed site-packages without the need to copy them
+site.addsitedir(sys.base_prefix + '/Lib/site-packages')
+
+vcpkg_bin_path = Path(sys.base_prefix + '/../../bin')
+if vcpkg_bin_path.is_dir():
+  os.add_dll_directory(vcpkg_bin_path)
+"
+)
+
+ file(COPY "${CURRENT_INSTALLED_DIR}/${PYTHON3_INCLUDE}/" DESTINATION "${python_base}/include")
+ set(suffix "PCBuild/AMD64") # TODO: ask python for the correct suffix.
+ file(COPY "${CURRENT_INSTALLED_DIR}/lib/python${PYTHON3_VERSION_MAJOR}${PYTHON3_VERSION_MINOR}.lib" DESTINATION "${python_base}/${suffix}")
+
+ set(${out_python} "${python_base}/Scripts/python.exe" PARENT_SCOPE)
+ set(z_vcpkg_get_vcpkg_installed_python "${python_base}/Scripts/python.exe" CACHE INTERNAL "")
+endfunction()

package/vcpkg/ports/vcpkg-get-python/vcpkg.json

@@ -0,0 +1,6 @@
+{
+  "name": "vcpkg-get-python",
+  "version-date": "2024-06-22",
+  "license": "MIT",
+  "supports": "native"
+}

package/vcpkg/ports/vcpkg-get-python-packages/vcpkg.json

@@ -1,7 +1,7 @@
 {
   "name": "vcpkg-get-python-packages",
-  "version-date": "2023-07-28",
-  "documentation": "https://vcpkg.io/en/docs/README.html",
+  "version-date": "2024-09-29",
+  "documentation": "https://learn.microsoft.com/en-us/vcpkg/maintainers/functions/vcpkg_get_python_packages",
   "license": "MIT",
   "supports": "native"
 }

package/vcpkg/ports/vcpkg-get-python-packages/x_vcpkg_get_python_packages.cmake

@@ -18,10 +18,6 @@ function(x_vcpkg_get_python_packages)
         endif()
     endif()
 
-    if(arg_PYTHON_VERSION STREQUAL "3")
-        set(PYTHON_VERSION_MINOR 11)
-    endif()
-
     if(NOT DEFINED arg_OUT_PYTHON_VAR)
         set(arg_OUT_PYTHON_VAR "PYTHON${arg_PYTHON_VERSION}")
     endif()
@@ -42,8 +38,8 @@ function(x_vcpkg_get_python_packages)
                     vcpkg_from_github(
                         OUT_SOURCE_PATH PYFILE_PATH
                         REPO pypa/get-pip
-                        REF 38e54e5de07c66e875c11a1ebbdb938854625dd8 #2022-03-07
-                        SHA512 431a9f66618a2f251db3a8c3311e7fc3af3ff7364ec1d14a99f1b9c237646b6146cef8b9471d83e1086dba2ed448bccc48d99b2bb375e4235d78e76d9970d3e5
+                        REF 24.2
+                        SHA512 7bcbc841564b7fc3cd2c109b9d3cfd34d853508edc9e040e9615fc0f9f18f74c7826d53671f65fa1abda3fd29a0a3f9f6114d9e9bdd6d120175ac207fd7ce321
                     )
                     vcpkg_execute_required_process(COMMAND "${arg_PYTHON_EXECUTABLE}" "${PYFILE_PATH}/public/get-pip.py" --no-warn-script-location
                                                    WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}"
@@ -75,8 +71,9 @@ function(x_vcpkg_get_python_packages)
         file(MAKE_DIRECTORY "${python_dir}/DLLs")
         set(python_sub_path /Scripts)
         set(python_venv virtualenv)
-        if(arg_PYTHON_VERSION STREQUAL 3)
-            file(COPY "${python_dir}/python3${PYTHON_VERSION_MINOR}.zip" DESTINATION "${venv_path}/Scripts")
+        file(GLOB python_zipped_stdlib "${python_dir}/python3*.zip")
+        if(python_zipped_stdlib)
+            file(COPY ${python_zipped_stdlib} DESTINATION "${venv_path}/Scripts")
         endif()
         set(python_venv_options "--app-data" "${venv_path}/data")
     else()
@@ -90,8 +87,8 @@ function(x_vcpkg_get_python_packages)
     endif()
 
     set(ENV{PYTHONNOUSERSITE} "1")
-    message(STATUS "Setting up python virtual environmnent...")
-    vcpkg_execute_required_process(COMMAND "${arg_PYTHON_EXECUTABLE}" -m "${python_venv}" ${python_venv_options} "${venv_path}"
+    message(STATUS "Setting up python virtual environment...")
+    vcpkg_execute_required_process(COMMAND "${arg_PYTHON_EXECUTABLE}" -I -m "${python_venv}" ${python_venv_options} "${venv_path}"
                                    WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}"
                                    LOGNAME "venv-setup-${TARGET_TRIPLET}")
     vcpkg_add_to_path(PREPEND "${venv_path}${python_sub_path}")
@@ -101,17 +98,17 @@ function(x_vcpkg_get_python_packages)
     unset(ENV{PYTHONPATH})
     if(DEFINED arg_REQUIREMENTS_FILE)
         message(STATUS "Installing requirements from: ${arg_REQUIREMENTS_FILE}")
-        vcpkg_execute_required_process(COMMAND "${${arg_OUT_PYTHON_VAR}}" -m pip install -r ${arg_REQUIREMENTS_FILE}
+        vcpkg_execute_required_process(COMMAND "${${arg_OUT_PYTHON_VAR}}" -I -m pip install -r ${arg_REQUIREMENTS_FILE}
                                        WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}"
                                        LOGNAME "pip-install-requirements-file-${TARGET_TRIPLET}")
     endif()
     if(DEFINED arg_PACKAGES)
         message(STATUS "Installing python packages: ${arg_PACKAGES}")
-        vcpkg_execute_required_process(COMMAND "${${arg_OUT_PYTHON_VAR}}" -m pip install ${arg_PACKAGES}
+        vcpkg_execute_required_process(COMMAND "${${arg_OUT_PYTHON_VAR}}" -I -m pip install ${arg_PACKAGES}
                                        WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}"
                                        LOGNAME "pip-install-packages-${TARGET_TRIPLET}")
     endif()
-    message(STATUS "Setting up python virtual environmnent...finished.")
-    set(${arg_OUT_PYTHON_VAR} "${PYTHON${arg_PYTHON_VERSION}}" PARENT_SCOPE)
-    set(${arg_OUT_PYTHON_VAR} "${PYTHON${arg_PYTHON_VERSION}}" CACHE PATH "" FORCE)
+    message(STATUS "Setting up python virtual environment... finished.")
+    set(${arg_OUT_PYTHON_VAR} "${${arg_OUT_PYTHON_VAR}}" PARENT_SCOPE)
+    set(${arg_OUT_PYTHON_VAR} "${${arg_OUT_PYTHON_VAR}}" CACHE PATH "" FORCE)
 endfunction()

package/vcpkg/ports/vcpkg-gn/portfile.cmake

@@ -8,5 +8,4 @@ file(INSTALL
     "${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake"
     "${CMAKE_CURRENT_LIST_DIR}/vcpkg_gn_configure.cmake"
     "${CMAKE_CURRENT_LIST_DIR}/vcpkg_gn_install.cmake"
-    "${CMAKE_CURRENT_LIST_DIR}/z_vcpkg_gn_fixup_path.cmake"
     DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")

package/vcpkg/ports/vcpkg-gn/vcpkg-port-config.cmake

@@ -1,3 +1,2 @@
 include("${CMAKE_CURRENT_LIST_DIR}/vcpkg_gn_configure.cmake")
 include("${CMAKE_CURRENT_LIST_DIR}/vcpkg_gn_install.cmake")
-include("${CMAKE_CURRENT_LIST_DIR}/z_vcpkg_gn_fixup_path.cmake")

package/vcpkg/ports/vcpkg-gn/vcpkg.json

@@ -1,9 +1,8 @@
 {
   "name": "vcpkg-gn",
-  "version-date": "2021-11-16",
-  "port-version": 3,
-  "description": "https://gn.googlesource.com/gn/+/4aa9bdfa05b688c58d3d7d3e496f3f18cbb3d89e",
-  "documentation": "https://vcpkg.io/en/docs/README.html",
+  "version-date": "2024-02-22",
+  "description": "GN is a meta-build system that generates build files for Ninja (GN is the build system for Chromium, Fuchsia, and related projects)",
+  "documentation": "https://gn.googlesource.com/gn/+/main/docs/reference.md",
   "license": "MIT",
   "supports": "native",
   "dependencies": [

package/vcpkg/ports/vcpkg-gn/vcpkg_gn_configure.cmake

@@ -1,5 +1,4 @@
 include_guard(GLOBAL)
-include("${CMAKE_CURRENT_LIST_DIR}/z_vcpkg_gn_fixup_path.cmake")
 
 function(z_vcpkg_gn_configure_generate)
     cmake_parse_arguments(PARSE_ARGV 0 "arg" "" "SOURCE_PATH;CONFIG;ARGS" "")
@@ -46,6 +45,4 @@ function(vcpkg_gn_configure)
             ARGS "--args=${arg_OPTIONS} ${arg_OPTIONS_RELEASE}"
         )
     endif()
-
-    z_vcpkg_gn_fixup_path()
 endfunction()

package/vcpkg/ports/vcpkg-pkgconfig-get-modules/portfile.cmake

@@ -1,14 +1,8 @@
-if(NOT TARGET_TRIPLET STREQUAL HOST_TRIPLET)
-    # make FATAL_ERROR in CI when issue #16773 fixed
-    message(WARNING "vcpkg-pkgconfig-get-modules is a host-only port; please mark it as a host port in your dependencies.")
-endif()
+set(VCPKG_POLICY_CMAKE_HELPER_PORT enabled)
 
 file(COPY
-    "${CMAKE_CURRENT_LIST_DIR}/vcpkg-port-config.cmake"
+    "${CURRENT_PORT_DIR}/vcpkg-port-config.cmake"
+    "${CURRENT_PORT_DIR}/x_vcpkg_pkgconfig_get_modules.cmake"
     DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
 
-file(INSTALL "${VCPKG_ROOT_DIR}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
-
-configure_file("${CMAKE_CURRENT_LIST_DIR}/x_vcpkg_pkgconfig_get_modules.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/x_vcpkg_pkgconfig_get_modules.cmake" @ONLY)
-
-set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
+vcpkg_install_copyright(FILE_LIST "${VCPKG_ROOT_DIR}/LICENSE.txt")

package/vcpkg/ports/vcpkg-pkgconfig-get-modules/vcpkg.json

@@ -1,13 +1,10 @@
 {
   "name": "vcpkg-pkgconfig-get-modules",
-  "version-date": "2023-09-06",
-  "documentation": "https://vcpkg.io/en/docs/README.html",
+  "version-date": "2024-04-03",
+  "documentation": "https://learn.microsoft.com/vcpkg/maintainers/functions/vcpkg_pkgconfig_get_modules",
   "license": "MIT",
+  "supports": "native",
   "dependencies": [
-    {
-      "name": "pkgconf",
-      "host": true,
-      "default-features": false
-    }
+    "pkgconf"
   ]
 }

package/vcpkg/ports/vcpkg-pkgconfig-get-modules/x_vcpkg_pkgconfig_get_modules.cmake

@@ -1,13 +1,17 @@
 include_guard(GLOBAL)
 
 function(x_vcpkg_pkgconfig_get_modules)
-    cmake_parse_arguments(PARSE_ARGV 0 "arg" "CFLAGS;LIBS;LIBRARIES;LIBRARIES_DIR;INCLUDE_DIRS;USE_MSVC_SYNTAX_ON_WINDOWS" "PREFIX" "MODULES")
+    cmake_parse_arguments(PARSE_ARGV 0 "arg" "CFLAGS;LIBS;LIBRARIES;LIBRARIES_DIR;LIBRARIES_DIRS;INCLUDE_DIRS;USE_MSVC_SYNTAX_ON_WINDOWS" "PREFIX" "MODULES")
     if(NOT DEFINED arg_PREFIX OR arg_PREFIX STREQUAL "")
         message(FATAL_ERROR "x_vcpkg_pkgconfig_get_modules requires parameter PREFIX!")
     endif()
     if(NOT DEFINED arg_MODULES OR arg_MODULES STREQUAL "")
         message(FATAL_ERROR "x_vcpkg_pkgconfig_get_modules requires parameter MODULES!")
     endif()
+    if(arg_LIBRARIES_DIR)
+        # Legacy. Remove in 2025.
+        message(WARNING "x_vcpkg_pkgconfig_get_modules parameter LIBRARIES_DIR is a no-op. Use LIBRARIES_DIRS instead.")
+    endif()
     if(DEFINED arg_UNPARSED_ARGUMENTS)
         message(FATAL_ERROR "extra arguments passed to x_vcpkg_pkgconfig_get_modules: ${arg_UNPARSED_ARGUMENTS}")
     endif()
@@ -16,7 +20,7 @@ function(x_vcpkg_pkgconfig_get_modules)
         set(msvc "--msvc-syntax")
     endif()
 
-    set(PKGCONFIG "${CURRENT_HOST_INSTALLED_DIR}/tools/pkgconf/pkgconf@VCPKG_HOST_EXECUTABLE_SUFFIX@")
+    set(PKGCONFIG "${CURRENT_HOST_INSTALLED_DIR}/tools/pkgconf/pkgconf${VCPKG_HOST_EXECUTABLE_SUFFIX}")
 
     set(backup_PKG_CONFIG_PATH "$ENV{PKG_CONFIG_PATH}")
 

package/vcpkg/ports/vcpkg-qmake/vcpkg.json

@@ -1,6 +1,7 @@
 {
   "name": "vcpkg-qmake",
   "version-date": "2023-03-22",
+  "port-version": 3,
   "documentation": "https://vcpkg.io/en/docs/README.html",
   "license": "MIT",
   "supports": "native",

package/vcpkg/ports/vcpkg-qmake/vcpkg_qmake_configure.cmake

@@ -146,7 +146,6 @@ function(vcpkg_qmake_configure)
         vcpkg_host_path_list(PREPEND PKG_CONFIG_PATH "${prefix}/lib/pkgconfig" "${CURRENT_INSTALLED_DIR}/share/pkgconfig")
 
         message(STATUS "Configuring ${config_triplet}")
-        file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${config_triplet}")
         if(DEFINED arg_OPTIONS OR DEFINED arg_OPTIONS_${buildtype})
             set(options -- ${arg_OPTIONS} ${arg_OPTIONS_${buildtype}})
         endif()

package/vcpkg/ports/vcpkg-qmake/z_vcpkg_qmake_fix_makefiles.cmake

@@ -4,7 +4,7 @@ function(z_vcpkg_qmake_fix_makefiles BUILD_DIR)
     file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}" NATIVE_INSTALLED_DIR)
     file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}" NATIVE_PACKAGES_DIR)
     
-    if(WIN32)
+    if(CMAKE_HOST_WIN32)
         string(SUBSTRING "${NATIVE_INSTALLED_DIR}" 2 -1 INSTALLED_DIR_WITHOUT_DRIVE)
         string(SUBSTRING "${NATIVE_PACKAGES_DIR}" 2 -1 PACKAGES_DIR_WITHOUT_DRIVE)
         string(SUBSTRING "${NATIVE_INSTALLED_DIR}" 0 2 INSTALLED_DRIVE)
@@ -22,7 +22,8 @@ function(z_vcpkg_qmake_fix_makefiles BUILD_DIR)
         #Set the correct install directory to packages
         vcpkg_replace_string("${MAKEFILE}"
             "${INSTALLED_DRIVE}$(INSTALL_ROOT)${INSTALLED_DIR_WITHOUT_DRIVE}"
-            "${PACKAGES_DRIVE}$(INSTALL_ROOT)${PACKAGES_DIR_WITHOUT_DRIVE}")
+            "${PACKAGES_DRIVE}$(INSTALL_ROOT)${PACKAGES_DIR_WITHOUT_DRIVE}"
+            IGNORE_UNCHANGED)
     endforeach()
 
 endfunction()

package/vcpkg/ports/vcpkg-tool-castxml/portfile.cmake

@@ -0,0 +1,79 @@
+set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
+
+set(key NOTFOUND)
+if(VCPKG_CMAKE_SYSTEM_NAME)
+    set(key "${VCPKG_CMAKE_SYSTEM_NAME}-${VCPKG_TARGET_ARCHITECTURE}")
+elseif(VCPKG_TARGET_IS_WINDOWS)
+    set(key "Windows-${VCPKG_TARGET_ARCHITECTURE}")
+endif()
+
+set(archive_path NOTFOUND)
+# For convenient updates, use 
+# vcpkg install vcpkg-tool-castxml --cmake-args=-DVCPKG_CASTXML_UPDATE=1
+if(key STREQUAL "Linux-arm64" OR VCPKG_CASTXML_UPDATE)
+    set(filename "castxml-${VERSION}-linux-aarch64.tar.gz")
+    vcpkg_download_distfile(archive_path
+		URLS "https://github.com/CastXML/CastXMLSuperbuild/releases/download/v${VERSION}/castxml-linux-aarch64.tar.gz"
+		FILENAME "${filename}"
+		SHA512 229d5339e217660f09dd87e2e639d666921a8c4e6c328a754dcae4290bba6bcac9d3b8e953814314ecdbf908d5d8e0d7dacbf1fdf6040a2e20d7acb98fb32f7d
+	)
+endif()
+if(key STREQUAL "Linux-x64" OR VCPKG_CASTXML_UPDATE)
+    set(filename "castxml-${VERSION}-linux.tar.gz")
+    vcpkg_download_distfile(archive_path
+		URLS "https://github.com/CastXML/CastXMLSuperbuild/releases/download/v${VERSION}/castxml-linux.tar.gz"
+		FILENAME "${filename}"
+		SHA512 592fcb6c7f85b6a1670cef7e0692ec6d1c9ba2e250825032ed6dcf9581aa169540eded608510aa1208ea1174df48c16390ee7daf7a17c7114d93a83a8a8e109b
+	)
+endif()
+if(key STREQUAL "Darwin-arm64" OR VCPKG_CASTXML_UPDATE)
+    set(filename "castxml-${VERSION}-macos-arm.tar.gz")
+    vcpkg_download_distfile(archive_path
+		URLS "https://github.com/CastXML/CastXMLSuperbuild/releases/download/v${VERSION}/castxml-macos-arm.tar.gz"
+		FILENAME "${filename}"
+		SHA512 4c8c969f7e53cd758b516bada449b322d37ad19d6d46602660d83ece20ce07f3d55462493382a1c422048928962fd33f9704638e2e41637d1147473562a55f94
+	)
+    # Avoid breaking the code signature.
+    set(VCPKG_FIXUP_MACHO_RPATH OFF)
+endif()
+if(key STREQUAL "Darwin-x64" OR VCPKG_CASTXML_UPDATE)
+    set(filename "castxml-${VERSION}-macosx.tar.gz")
+    vcpkg_download_distfile(archive_path
+		URLS "https://github.com/CastXML/CastXMLSuperbuild/releases/download/v${VERSION}/castxml-macosx.tar.gz"
+		FILENAME "${filename}"
+		SHA512 c6986a796ab9a4f4deaf569534d628cc584088aa8b0e56026ea5ba19550b8ceeb41c34f46a85566a21205d6bb529717ee8944cfa9a9c7c27edb0504eece5544a
+	)
+    # Avoid breaking the code signature.
+    set(VCPKG_FIXUP_MACHO_RPATH OFF)
+endif()
+if(key STREQUAL "Windows-x64" OR VCPKG_CASTXML_UPDATE)
+    set(filename "castxml-${VERSION}-windows.zip")
+    vcpkg_download_distfile(archive_path
+		URLS "https://github.com/CastXML/CastXMLSuperbuild/releases/download/v${VERSION}/castxml-windows.zip"
+		FILENAME "${filename}"
+		SHA512 7c1970ad6f2e5f06a8704606db92df3400c4cd9716f88cac604924430c7e6865f8256a67282d28005714f0ed0a42f7f6e386f24ce80fb075371902d35674c6cc
+	)
+endif()
+if(NOT archive_path)
+	message(FATAL_ERROR "Unsupported platform '${key}'. Please implement me!")
+endif()
+
+if(VCPKG_CASTXML_UPDATE)
+	message(STATUS "All downloads are up-to-date.")
+	message(FATAL_ERROR "Stopping due to VCPKG_CASTXML_UPDATE being enabled.")
+endif()
+
+message(STATUS "archive_path: '${archive_path}'")
+
+file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools")
+vcpkg_execute_in_download_mode(
+    COMMAND "${CMAKE_COMMAND}" -E tar xzf "${archive_path}"
+    WORKING_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools"
+)
+
+vcpkg_install_copyright(
+    FILE_LIST
+        "${CURRENT_PACKAGES_DIR}/tools/castxml/share/doc/castxml/NOTICE"
+        "${CURRENT_PACKAGES_DIR}/tools/castxml/share/doc/castxml/LICENSE"
+)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools/castxml/share/doc")

package/vcpkg/ports/vcpkg-tool-castxml/vcpkg.json

@@ -0,0 +1,8 @@
+{
+  "name": "vcpkg-tool-castxml",
+  "version": "0.6.5",
+  "description": "CastXML is a C-family abstract syntax tree XML output tool.",
+  "homepage": "https://github.com/CastXML/CastXML",
+  "license": "Apache-2.0",
+  "supports": "native"
+}

package/vcpkg/ports/vcpkg-tool-gn/portfile.cmake

@@ -8,36 +8,30 @@ set(cipd_download_gn "https://chrome-infra-packages.appspot.com/dl/gn/gn")
 if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux")
     EXEC_PROGRAM(uname ARGS -m OUTPUT_VARIABLE HOST_ARCH OUTPUT_STRIP_TRAILING_WHITESPACE)
     if(HOST_ARCH STREQUAL "aarch64")
-        set(program_version "GkfFAfAUyE-qfeWkdUMaeM1Ov64Fk3SjSj9pwKqZX7gC")
+        set(program_version "3bH3TSyghUqRj8To2aE9yy4D_k_zCkymWkbwzaeEk34C")
         set(gn_platform "linux-arm64")
-        set(download_sha512 "E88201309A12C00CE60137261B8E1A759780C81D1925B819583B16D2095A16A7D32EFB2AF36C1E1D6EAA142BF6A6A811847D3140E4E94967EE28F4ADF6373E4B")
+        set(download_sha512 "36604e7ca146f21a80c9a2463dcf09caa0c03c05507d93497884cb28da3582b9a695008d01be814e523e4a4982300ee7c717c2aa7fddbc8156736ec6b4251f9c")
     else()
-        set(program_version "Fv1ENXodhXmEXy_xpZr2gQkVJh57w_IsbsrEJOU0_EoC")
+        set(program_version "5v1Aw5ofON_P9Ds3nj1TzasiNIkS9eebfC3xe1lgCakC")
         set(gn_platform "linux-amd64")
-        set(download_sha512 "A7A5CD5633C5547EC1B1A95958486DDAAC91F1A65881EDC0AD8F74DF44E82F08BA74358E9A72DFCDDE6F534A6B9C9A430D3E16ACE2E4346C4D2E9113F7654B3F")
+        set(download_sha512 "325d9066e3c5f4e18b5489aaa060ea89f384d00ddc3d87fa329c455097c1b28f67f6e3baee2eaa54cd7f6c463cee3a4d473d0e69cd3390be91af91cbec347db1")
     endif()
 elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin")
     set(supported_on_unix ON)
     EXEC_PROGRAM(uname ARGS -m OUTPUT_VARIABLE HOST_ARCH OUTPUT_STRIP_TRAILING_WHITESPACE)
     if(HOST_ARCH STREQUAL "arm64")
-        set(program_version "qMPtGq7xZlpb-lHjP-SK27ftT4X71WIvguuyx6X14DEC")
+        set(program_version "K29J_UnVaLzu0yYgA1orjyvrHXdkxoOSIPPPqZxN1IcC")
         set(gn_platform "mac-arm64")
-        set(download_sha512 "D096FB958D017807427911089AB5A7655AED117F6851C0491AC8063CEDB544423122EF64DF4264ECA86C20A2BDE9E64D7B72DA7ED8C95C2BA79A68B8247D36B8")
+        set(download_sha512 "5f8529eacf4ccd55de1060ade9da39145750516f983aaa1a53ebd6036565d0b638480327366f42c47a6eb3471c95842de0a2623c647f1a0d93cedd0907729208")
     else()
-        set(program_version "0x2juPLNfP9603GIyZrUfflxK6LiMcppLAoxEpYuIYoC")
+        set(program_version "oz5BCDwbV-uvEuigRPInDwZGFUGCTGFlCZBBn1AuZaQC")
         set(gn_platform "mac-amd64")
-        set(download_sha512 "2696ECE7B2C8008CABDDF10024017E2ECF875F8679424E77052252BDDC83A2096DF3C61D89CD25120EF27E0458C8914BEEED9D418593BDBC4F6ED33A8D4C3DC5")
+        set(download_sha512 "2f48b0f1f091e3ee424da4beb800a68f5d84b6b31ee633f3a32324508c2b96ecd2dcf0908353331eb100d11e2b1c6cfe7961cf53811de8f9951e36e88aff5272")
     endif()
 else()
-    if($ENV{PROCESSOR_ARCHITECTURE} STREQUAL "ARM64")
-        set(program_version "q5ExVHmXyD34Q_Tzb-aRxsPipO-e37-csVRhVM7IJh0C")
-        set(gn_platform "windows-amd64")
-        set(download_sha512 "FA764AA44EB6F48ED50E855B4DC1DD1ABE35E45FD4AAC7F059A35293A14894C1B591215E34FB0CE9362E646EA9463BA3B489EFB7EBBAA2693D14238B50E4E686")
-    else() # AMD64
-        set(program_version "q5ExVHmXyD34Q_Tzb-aRxsPipO-e37-csVRhVM7IJh0C")
-        set(gn_platform "windows-amd64")
-        set(download_sha512 "FA764AA44EB6F48ED50E855B4DC1DD1ABE35E45FD4AAC7F059A35293A14894C1B591215E34FB0CE9362E646EA9463BA3B489EFB7EBBAA2693D14238B50E4E686")
-    endif()
+    set(program_version "gHozLqIHcmwMq96qzOqcgcOOK2XXE-W4nXQcchHFqKYC")
+    set(gn_platform "windows-amd64")
+    set(download_sha512 "2f471d4fa5f56cd72c43c5f2824f37a1baff3f26cd6c1ed43fe106153d0e654a4fb1460b01794ca3dae3104dfade81420fe1da04473e782eebab47909c9a566b")
 endif()
 
 set(download_urls "${cipd_download_gn}/${gn_platform}/+/${program_version}")

package/vcpkg/ports/vcpkg-tool-gn/vcpkg.json

@@ -1,7 +1,6 @@
 {
   "name": "vcpkg-tool-gn",
-  "version-date": "2022-04-16",
-  "port-version": 1,
+  "version-date": "2024-02-22",
   "description": "GN build system",
   "homepage": "https://gn.googlesource.com/gn/",
   "license": null,

package/vcpkg/ports/vcpkg-tool-meson/adjust-args.patch

@@ -0,0 +1,13 @@
+diff --git a/mesonbuild/cmake/toolchain.py b/mesonbuild/cmake/toolchain.py
+index 7d73a7c..564e6de 100644
+--- a/mesonbuild/cmake/toolchain.py
++++ b/mesonbuild/cmake/toolchain.py
+@@ -196,7 +196,7 @@ class CMakeToolchain:
+     @staticmethod
+     def is_cmdline_option(compiler: 'Compiler', arg: str) -> bool:
+         if compiler.get_argument_syntax() == 'msvc':
+-            return arg.startswith('/')
++            return arg.startswith(('/','-'))
+         else:
+             if compiler.exelist[0] == 'zig' and arg in {'ar', 'cc', 'c++', 'dlltool', 'lib', 'ranlib', 'objcopy', 'rc'}:
+                 return True

package/vcpkg/ports/vcpkg-tool-meson/adjust-python-dep.patch

@@ -0,0 +1,45 @@
+diff --git a/mesonbuild/dependencies/python.py b/mesonbuild/dependencies/python.py
+index 883a29a..d9a82af 100644
+--- a/mesonbuild/dependencies/python.py
++++ b/mesonbuild/dependencies/python.py
+@@ -232,8 +232,10 @@ class _PythonDependencyBase(_Base):
+                 else:
+                     if self.is_freethreaded:
+                         libpath = Path('libs') / f'python{vernum}t.lib'
++                        libpath = Path('libs') / f'..' / f'..' / f'..' / f'lib' / f'python{vernum}t.lib'
+                     else:
+                         libpath = Path('libs') / f'python{vernum}.lib'
++                        libpath = Path('libs') / f'..' / f'..' / f'..' / f'lib' / f'python{vernum}.lib'
+                     # For a debug build, pyconfig.h may force linking with
+                     # pythonX_d.lib (see meson#10776). This cannot be avoided
+                     # and won't work unless we also have a debug build of
+@@ -250,6 +252,8 @@ class _PythonDependencyBase(_Base):
+                         vscrt = self.env.coredata.optstore.get_value('b_vscrt')
+                         if vscrt in {'mdd', 'mtd', 'from_buildtype', 'static_from_buildtype'}:
+                             vscrt_debug = True
++                    if is_debug_build:
++                       libpath = Path('libs') / f'..' / f'..' / f'..' / f'debug/lib' / f'python{vernum}_d.lib'
+                     if is_debug_build and vscrt_debug and not self.variables.get('Py_DEBUG'):
+                         mlog.warning(textwrap.dedent('''\
+                             Using a debug build type with MSVC or an MSVC-compatible compiler
+@@ -350,9 +354,10 @@ class PythonSystemDependency(SystemDependency, _PythonDependencyBase):
+             self.is_found = True
+ 
+         # compile args
++        verdot = self.variables.get('py_version_short')
+         inc_paths = mesonlib.OrderedSet([
+             self.variables.get('INCLUDEPY'),
+-            self.paths.get('include'),
++            self.paths.get('include') + f'/../../../include/python${verdot}',
+             self.paths.get('platinclude')])
+ 
+         self.compile_args += ['-I' + path for path in inc_paths if path]
+@@ -416,7 +421,7 @@ def python_factory(env: 'Environment', for_machine: 'MachineChoice',
+             candidates.append(functools.partial(wrap_in_pythons_pc_dir, pkg_name, env, kwargs, installation))
+             # We only need to check both, if a python install has a LIBPC. It might point to the wrong location,
+             # e.g. relocated / cross compilation, but the presence of LIBPC indicates we should definitely look for something.
+-            if pkg_libdir is not None:
++            if True or pkg_libdir is not None:
+                 candidates.append(functools.partial(PythonPkgConfigDependency, pkg_name, env, kwargs, installation))
+         else:
+             candidates.append(functools.partial(PkgConfigDependency, 'python3', env, kwargs))

package/vcpkg/ports/vcpkg-tool-meson/install.cmake

@@ -0,0 +1,5 @@
+file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/meson")
+file(INSTALL "${SOURCE_PATH}/meson.py"
+             "${SOURCE_PATH}/mesonbuild"
+    DESTINATION "${CURRENT_PACKAGES_DIR}/tools/meson"
+)

package/vcpkg/ports/vcpkg-tool-meson/meson-intl.patch

@@ -1,10 +1,9 @@
-diff --git a/tools/meson/mesonbuild/dependencies/misc.py b/tools/meson/mesonbuild/dependencies/misc.py
-index 537af1f89..43d7febf2 100644
---- a/tools/meson/mesonbuild/dependencies/misc.py
-+++ b/tools/meson/mesonbuild/dependencies/misc.py
-@@ -610,7 +610,8 @@ iconv_factory = DependencyFactory(
+diff --git a/mesonbuild/dependencies/misc.py b/mesonbuild/dependencies/misc.py
+--- a/mesonbuild/dependencies/misc.py
++++ b/mesonbuild/dependencies/misc.py
+@@ -593,7 +593,8 @@ iconv_factory = DependencyFactory(
  
- intl_factory = DependencyFactory(
+ packages['intl'] = intl_factory = DependencyFactory(
      'intl',
 +    [DependencyMethods.BUILTIN, DependencyMethods.SYSTEM, DependencyMethods.CMAKE],
 +    cmake_name='Intl',

package/vcpkg/ports/vcpkg-tool-meson/meson.template.in

@@ -0,0 +1,43 @@
+[binaries]
+cmake = ['@CMAKE_COMMAND@']
+ninja = ['@NINJA@']
+pkg-config = ['@PKGCONFIG@']
+@MESON_MT@
+@MESON_AR@
+@MESON_RC@
+@MESON_C@
+@MESON_C_LD@
+@MESON_CXX@
+@MESON_CXX_LD@
+@MESON_OBJC@
+@MESON_OBJC_LD@
+@MESON_OBJCPP@
+@MESON_OBJCPP_LD@
+@MESON_FC@
+@MESON_FC_LD@
+@MESON_WINDRES@
+@MESON_ADDITIONAL_BINARIES@
+[properties]
+cmake_toolchain_file  = '@SCRIPTS@/buildsystems/vcpkg.cmake'
+@MESON_ADDITIONAL_PROPERTIES@
+[cmake]
+CMAKE_BUILD_TYPE = '@MESON_CMAKE_BUILD_TYPE@'
+VCPKG_TARGET_TRIPLET = '@TARGET_TRIPLET@'
+VCPKG_HOST_TRIPLET = '@_HOST_TRIPLET@'
+VCPKG_CHAINLOAD_TOOLCHAIN_FILE = '@VCPKG_CHAINLOAD_TOOLCHAIN_FILE@'
+VCPKG_CRT_LINKAGE = '@VCPKG_CRT_LINKAGE@'
+_VCPKG_INSTALLED_DIR = '@_VCPKG_INSTALLED_DIR@'
+@MESON_HOST_MACHINE@
+@MESON_BUILD_MACHINE@
+[built-in options]
+default_library = '@MESON_DEFAULT_LIBRARY@'
+werror = false
+@MESON_CFLAGS@
+@MESON_CXXFLAGS@
+@MESON_FCFLAGS@
+@MESON_OBJCFLAGS@
+@MESON_OBJCPPFLAGS@
+# b_vscrt
+@MESON_VSCRT_LINKAGE@
+# c_winlibs/cpp_winlibs
+@MESON_WINLIBS@