Merge remote-tracking branch 'upstream/master'

microsoft · Oct 18, 2024 · f6a5627 · f6a5627
2 parents 75903a4 + da5024e
commit f6a5627
Show file tree

Hide file tree

Showing 333 changed files with 1,918 additions and 3,427 deletions.
diff --git a/ports/activemq-cpp/vcpkg.json b/ports/activemq-cpp/vcpkg.json
@@ -1,10 +1,10 @@
 {
   "name": "activemq-cpp",
   "version-semver": "3.9.5",
-  "port-version": 16,
+  "port-version": 17,
   "description": "Apache ActiveMQ is the most popular and powerful open source messaging and Integration Patterns server.",
   "license": "Apache-2.0",
-  "supports": "!(uwp | osx)",
+  "supports": "(windows & !uwp & (x86 | x64)) | (!windows & !osx)",
   "dependencies": [
     "apr",
     {

diff --git a/ports/apr/0100-add-host-tools-dir.diff b/ports/apr/0100-add-host-tools-dir.diff
@@ -0,0 +1,23 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d16eec6..92146f4 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -87,13 +87,17 @@ STRING(REGEX REPLACE ".*#define APR_PATCH_VERSION[ \t]+([0-9]+).*" "\\1" APR_PAT
+
+ CONFIGURE_FILE(include/apr.hwc
+                ${PROJECT_BINARY_DIR}/apr.h)
+
+ ADD_EXECUTABLE(gen_test_char tools/gen_test_char.c)
+
++set(UNOFFICIAL_APR_HOST_TOOLS_DIR "$<TARGET_FILE_DIR:gen_test_char>" CACHE STRING "")
++set(UNOFFICIAL_APR_HOST_EXECUTABLE_SUFFIX "$<TARGET_PROPERTY:gen_test_char,SUFFIX>" CACHE STRING "")
++install(TARGETS gen_test_char)
++
+ ADD_CUSTOM_COMMAND(
+   COMMENT "Generating character tables, apr_escape_test_char.h, for current locale"
+   DEPENDS gen_test_char
+-  COMMAND $<TARGET_FILE:gen_test_char> > ${PROJECT_BINARY_DIR}/apr_escape_test_char.h
++  COMMAND "${UNOFFICIAL_APR_HOST_TOOLS_DIR}/gen_test_char${UNOFFICIAL_APR_HOST_EXECUTABLE_SUFFIX}" > ${PROJECT_BINARY_DIR}/apr_escape_test_char.h
+   OUTPUT ${PROJECT_BINARY_DIR}/apr_escape_test_char.h
+ )
+ ADD_CUSTOM_TARGET(
diff --git a/ports/apr/portfile.cmake b/ports/apr/portfile.cmake
@@ -1,6 +1,3 @@
-
-set(VERSION 1.7.5)
-
 vcpkg_download_distfile(ARCHIVE
     URLS "https://archive.apache.org/dist/apr/apr-${VERSION}.tar.bz2"
     FILENAME "apr-${VERSION}.tar.bz2"
@@ -11,8 +8,19 @@ vcpkg_extract_source_archive(SOURCE_PATH
     ARCHIVE "${ARCHIVE}"
     PATCHES
         unglue.patch
+        0100-add-host-tools-dir.diff
 )
 
+set(CURRENT_HOST_TOOLS_DIR "${CURRENT_HOST_INSTALLED_DIR}/tools/${PORT}")
+
+set(CROSSCOMPILING_OPTIONS "")
+if(VCPKG_CROSSCOMPILING)
+    list(APPEND CROSSCOMPILING_OPTIONS
+        "-DUNOFFICIAL_APR_HOST_TOOLS_DIR=${CURRENT_HOST_TOOLS_DIR}"
+        "-DUNOFFICIAL_APR_HOST_EXECUTABLE_SUFFIX=${VCPKG_HOST_EXECUTABLE_SUFFIX}"
+    )
+endif()
+
 if (VCPKG_TARGET_IS_WINDOWS)
     vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
         FEATURES
@@ -32,6 +40,7 @@ if (VCPKG_TARGET_IS_WINDOWS)
             -DMIN_WINDOWS_VER=Windows7
             -DAPR_HAVE_IPV6=ON
             ${FEATURE_OPTIONS}
+            ${CROSSCOMPILING_OPTIONS}
     )
 
     vcpkg_cmake_install()
@@ -42,6 +51,7 @@ if (VCPKG_TARGET_IS_WINDOWS)
     )
     # There is no way to suppress installation of the headers in debug builds.
     file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+    vcpkg_copy_tools(TOOL_NAMES gen_test_char AUTO_CLEAN)
 
     vcpkg_copy_pdbs()
 

diff --git a/ports/apr/vcpkg.json b/ports/apr/vcpkg.json
@@ -1,12 +1,17 @@
 {
   "name": "apr",
   "version": "1.7.5",
-  "port-version": 1,
+  "port-version": 2,
   "description": "The Apache Portable Runtime (APR) is a C library that forms a system portability layer that covers many operating systems.",
   "homepage": "https://apr.apache.org/",
   "license": "Apache-2.0",
-  "supports": "!uwp",
+  "supports": "!uwp & !mingw",
   "dependencies": [
+    {
+      "name": "apr",
+      "host": true,
+      "platform": "windows"
+    },
     {
       "name": "vcpkg-cmake",
       "host": true,

diff --git a/ports/async-mqtt/portfile.cmake b/ports/async-mqtt/portfile.cmake
@@ -4,7 +4,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO redboltz/async_mqtt
     REF "${VERSION}"
-    SHA512 25aa9b5ceb32247025143531bb849ecb52a5d54dc671bf4739e99c2190082e497b857c97245bae5adbc62b3e0cedefab712a71ba422b992756a47eab9d192f9e
+    SHA512 cf76113f9fc3999c83781ca8213dbaa18edb5f4c081366b25ed1581cb955f8dfd562175bbd6ba5c127e560d5f9a0e013e42185211a4de77e76cdd44b279873a6
     HEAD_REF main
 )
 

diff --git a/ports/async-mqtt/vcpkg.json b/ports/async-mqtt/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "async-mqtt",
-  "version": "9.0.1",
+  "version": "9.0.2",
   "description": "Header-only Asynchronous MQTT communication library for C++17 based on Boost.Asio.",
   "homepage": "https://github.com/redboltz/async_mqtt",
   "license": "BSL-1.0",

diff --git a/ports/aurora-au/disable-googletest.patch b/ports/aurora-au/disable-googletest.patch
@@ -0,0 +1,41 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b18407f..f1be4c0 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -52,9 +52,6 @@ FetchContent_Declare(
+ # For Windows: Prevent overriding the parent project's compiler/linker settings
+ set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
+
+-FetchContent_MakeAvailable(googletest)
+-include(GoogleTest)
+-
+ add_subdirectory(au)
+
+ # Configure how Au will be installed.
+diff --git a/cmake/AuConfig.cmake.in b/cmake/AuConfig.cmake.in
+index b121f76..65da38a 100644
+--- a/cmake/AuConfig.cmake.in
++++ b/cmake/AuConfig.cmake.in
+@@ -14,9 +14,6 @@
+
+ @PACKAGE_INIT@
+
+-include(CMakeFindDependencyMacro)
+-find_dependency(googletest 1.12.1)
+-
+ include(${CMAKE_CURRENT_LIST_DIR}/AuHeaders.cmake)
+
+ check_required_components(Au)
+diff --git a/cmake/HeaderOnlyLibrary.cmake b/cmake/HeaderOnlyLibrary.cmake
+index 28daf00..f2bf389 100644
+--- a/cmake/HeaderOnlyLibrary.cmake
++++ b/cmake/HeaderOnlyLibrary.cmake
+@@ -75,7 +75,7 @@ function(header_only_library)
+   )
+
+   # Add the test, if requested.
+-  if (DEFINED ARG_GTEST_SRCS)
++  if (0)
+     add_executable("${ARG_NAME}_test")
+     target_sources("${ARG_NAME}_test" PRIVATE ${ARG_GTEST_SRCS})
+     target_link_libraries(
diff --git a/ports/aurora-au/portfile.cmake b/ports/aurora-au/portfile.cmake
@@ -0,0 +1,23 @@
+set(VCPKG_BUILD_TYPE release)  # header-only
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO aurora-opensource/au
+    REF "${VERSION}"
+    SHA512 4aa3282f6b76fbadd04ca572734f72c86b1b0b4e85fc21a03d1ab00b83d3aea319ab2dac3934361b5f6fa7c4a0dccece94fe0a57f3d73d208315b51b1950e374
+    HEAD_REF main
+    PATCHES 
+        disable-googletest.patch
+)
+
+vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}")
+vcpkg_cmake_install()
+
+vcpkg_cmake_config_fixup(
+    CONFIG_PATH lib/cmake/Au
+)
+
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")  # Remove empty directory
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/ports/aurora-au/usage b/ports/aurora-au/usage
@@ -0,0 +1,4 @@
+The package aurora-au provides CMake targets:
+
+    find_package(Au REQUIRED)
+    target_link_libraries(main PRIVATE Au::au)
diff --git a/ports/aurora-au/vcpkg.json b/ports/aurora-au/vcpkg.json
@@ -0,0 +1,19 @@
+{
+  "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
+  "name": "aurora-au",
+  "version-semver": "0.3.5",
+  "description": "A C++14-compatible physical units library with no dependencies and a single-file delivery option. Emphasis on safety, accessibility, performance, and developer experience.",
+  "homepage": "https://github.com/aurora-opensource/au",
+  "license": "Apache-2.0",
+  "supports": "!osx",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/ports/aws-c-common/portfile.cmake b/ports/aws-c-common/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO awslabs/aws-c-common
     REF "v${VERSION}"
-    SHA512 25da9356e36c87210bcdd95b007824288f36fd3ae4bdd757a1d3e88ef3cc8b65a0c1a31cbe338147949257c8e908c1721fc6297aeb0cbfe7cb89b4d7727dc2ad
+    SHA512 482bfeb5c7dac16486236417af0f5c0a20bc36c271aaf32088d188186861d61bf0b96c5da13a1c88853fdc6a1fb8b8db254a547c3648a659ec6e91177978dc9b
     HEAD_REF master
     PATCHES
         disable-internal-crt-option.patch # Disable internal crt option because vcpkg contains crt processing flow

diff --git a/ports/aws-c-common/vcpkg.json b/ports/aws-c-common/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "aws-c-common",
-  "version": "0.9.28",
+  "version": "0.9.30",
   "description": "AWS common library for C",
   "homepage": "https://github.com/awslabs/aws-c-common",
   "license": "Apache-2.0",

diff --git a/ports/aws-sdk-cpp/portfile.cmake b/ports/aws-sdk-cpp/portfile.cmake
@@ -4,7 +4,7 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO aws/aws-sdk-cpp
     REF "${VERSION}"
-    SHA512 d09d157566765239e42f404b2b70da807b7c089604f93ab81beb6b75269d95f666198005e076c88be0f9cc79aa236912cf3d2fe349c357d860035dea5203a5b6
+    SHA512 01579a7be61b70cee534bc3ada89f921e1849d2b7927107ad38ec3ab972f92dc24c9b18a2bec28033db498bf90f03f20e2ae8541b8cb0f8a47208d4c485b3bc5
     PATCHES
         fix-aws-root.patch
         lock-curl-http-and-tls-settings.patch

diff --git a/ports/aws-sdk-cpp/vcpkg.json b/ports/aws-sdk-cpp/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "$note": "Automatically generated by generateFeatures.ps1",
   "name": "aws-sdk-cpp",
-  "version": "1.11.420",
+  "version": "1.11.428",
   "description": "AWS SDK for C++",
   "homepage": "https://github.com/aws/aws-sdk-cpp",
   "license": "Apache-2.0",

diff --git a/ports/azure-core-amqp-cpp/portfile.cmake b/ports/azure-core-amqp-cpp/portfile.cmake
@@ -7,6 +7,8 @@ vcpkg_from_github(
     REF "azure-core-amqp_${VERSION}"
     SHA512 92d5648b832c38587c2ceccaf3293252a7f5b976df7f57fc475b8fcd396ba3bb7fd2c18e46b3b06f6c8776aed6df1c4a36ef2b8bc5f07f1f23c771ff476a7af7
     HEAD_REF main
+    PATCHES
+      set_version.patch
 )
 
 if(EXISTS "${SOURCE_PATH}/sdk/core/azure-core-amqp")

diff --git a/ports/azure-core-amqp-cpp/set_version.patch b/ports/azure-core-amqp-cpp/set_version.patch
@@ -0,0 +1,12 @@
+diff --git a/sdk/core/azure-core-amqp/CMakeLists.txt b/sdk/core/azure-core-amqp/CMakeLists.txt
+index 3ef7bf8d9..6d2829e84 100644
+--- a/sdk/core/azure-core-amqp/CMakeLists.txt
++++ b/sdk/core/azure-core-amqp/CMakeLists.txt
+@@ -177,6 +177,7 @@ target_link_libraries(azure-core-amqp PRIVATE
+     PUBLIC Azure::azure-core)
+
+ get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp")
++set_target_properties(azure-core-amqp PROPERTIES VERSION ${AZ_LIBRARY_VERSION})
+ generate_documentation(azure-core-amqp ${AZ_LIBRARY_VERSION})
+
+ az_vcpkg_export(
diff --git a/ports/azure-core-amqp-cpp/vcpkg.json b/ports/azure-core-amqp-cpp/vcpkg.json
@@ -5,6 +5,7 @@
   ],
   "name": "azure-core-amqp-cpp",
   "version-semver": "1.0.0-beta.11",
+  "port-version": 1,
   "description": [
     "Microsoft Azure AMQP SDK for C++",
     "This library provides AMQP functionality to Azure SDK services."

diff --git a/ports/azure-core-cpp/portfile.cmake b/ports/azure-core-cpp/portfile.cmake
@@ -9,6 +9,7 @@ vcpkg_from_github(
     HEAD_REF main
     PATCHES
       useragent.patch
+      set_version.patch
 )
 
 vcpkg_check_features(

diff --git a/ports/azure-core-cpp/set_version.patch b/ports/azure-core-cpp/set_version.patch
@@ -0,0 +1,12 @@
+diff --git a/sdk/core/azure-core/CMakeLists.txt b/sdk/core/azure-core/CMakeLists.txt
+index 87c5cfd9b..c7d29c3f2 100644
+--- a/sdk/core/azure-core/CMakeLists.txt
++++ b/sdk/core/azure-core/CMakeLists.txt
+@@ -192,6 +192,7 @@ if(BUILD_TRANSPORT_WINHTTP)
+ endif()
+
+ get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp")
++set_target_properties(azure-core PROPERTIES VERSION ${AZ_LIBRARY_VERSION})
+ generate_documentation(azure-core ${AZ_LIBRARY_VERSION})
+
+ az_vcpkg_export(
diff --git a/ports/azure-core-cpp/vcpkg.json b/ports/azure-core-cpp/vcpkg.json
@@ -5,6 +5,7 @@
   ],
   "name": "azure-core-cpp",
   "version-semver": "1.14.0",
+  "port-version": 1,
   "description": [
     "Microsoft Azure Core SDK for C++",
     "This library provides shared primitives, abstractions, and helpers for modern Azure SDK client libraries written in the C++."

diff --git a/ports/azure-core-tracing-opentelemetry-cpp/portfile.cmake b/ports/azure-core-tracing-opentelemetry-cpp/portfile.cmake
@@ -9,6 +9,7 @@ vcpkg_from_github(
     HEAD_REF main
     PATCHES
       useragent.patch
+      set_version.patch
 )
 
 if(EXISTS "${SOURCE_PATH}/sdk/core/azure-core-tracing-opentelemetry")

diff --git a/ports/azure-core-tracing-opentelemetry-cpp/set_version.patch b/ports/azure-core-tracing-opentelemetry-cpp/set_version.patch
@@ -0,0 +1,13 @@
+diff --git a/sdk/core/azure-core-tracing-opentelemetry/CMakeLists.txt b/sdk/core/azure-core-tracing-opentelemetry/CMakeLists.txt
+index 23cf7d143..a3c058874 100644
+--- a/sdk/core/azure-core-tracing-opentelemetry/CMakeLists.txt
++++ b/sdk/core/azure-core-tracing-opentelemetry/CMakeLists.txt
+@@ -83,6 +83,8 @@ get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp")
+ generate_documentation(azure-core-tracing-opentelemetry ${AZ_LIBRARY_VERSION})
+
+ if(BUILD_AZURE_CORE_TRACING_OPENTELEMETRY)
++  set_target_properties(azure-core-tracing-opentelemetry PROPERTIES VERSION ${AZ_LIBRARY_VERSION})
++
+   az_vcpkg_export(
+     azure-core-tracing-opentelemetry
+     CORE_TRACING_OPENTELEMETRY
diff --git a/ports/azure-core-tracing-opentelemetry-cpp/vcpkg.json b/ports/azure-core-tracing-opentelemetry-cpp/vcpkg.json
@@ -5,7 +5,7 @@
   ],
   "name": "azure-core-tracing-opentelemetry-cpp",
   "version-semver": "1.0.0-beta.4",
-  "port-version": 4,
+  "port-version": 5,
   "description": [
     "Microsoft Azure Core Tracing OpenTelemetry SDK for C++",
     "This library provides support for modern Azure SDK client libraries written in C++ to leverage OpenTelemetry APIs."

diff --git a/ports/azure-data-tables-cpp/portfile.cmake b/ports/azure-data-tables-cpp/portfile.cmake
@@ -7,6 +7,8 @@ vcpkg_from_github(
     REF "azure-data-tables_${VERSION}"
     SHA512 16d45e595b0ce2a16b8e65d1ac7ffd56d08ea3f51ca87592d9826a246690cda494d0b7aa20f3b59a0f3376be1bc724eb4b50330c5d7e93a484c866d0d349012f
     HEAD_REF main
+    PATCHES
+      set_version.patch
 )
 
 if(EXISTS "${SOURCE_PATH}/sdk/tables/azure-data-tables")

diff --git a/ports/azure-data-tables-cpp/set_version.patch b/ports/azure-data-tables-cpp/set_version.patch
@@ -0,0 +1,12 @@
+diff --git a/sdk/tables/azure-data-tables/CMakeLists.txt b/sdk/tables/azure-data-tables/CMakeLists.txt
+index 038e267d7..f3b5e679c 100644
+--- a/sdk/tables/azure-data-tables/CMakeLists.txt
++++ b/sdk/tables/azure-data-tables/CMakeLists.txt
+@@ -106,6 +106,7 @@ target_include_directories(
+ target_link_libraries(azure-data-tables PUBLIC Azure::azure-core)
+
+ get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp")
++set_target_properties(azure-data-tables PROPERTIES VERSION ${AZ_LIBRARY_VERSION})
+ generate_documentation(azure-data-tables ${AZ_LIBRARY_VERSION})
+
+ az_vcpkg_export(
diff --git a/ports/azure-data-tables-cpp/vcpkg.json b/ports/azure-data-tables-cpp/vcpkg.json
@@ -5,6 +5,7 @@
   ],
   "name": "azure-data-tables-cpp",
   "version-semver": "1.0.0-beta.4",
+  "port-version": 1,
   "description": [
     "Microsoft Azure Data Tables SDK for C++",
     "This library provides Azure Data Tables SDK."

diff --git a/ports/azure-identity-cpp/portfile.cmake b/ports/azure-identity-cpp/portfile.cmake
@@ -7,6 +7,8 @@ vcpkg_from_github(
     REF "azure-identity_${VERSION}"
     SHA512 129472704e740a62108400b0227d19ede14ea3a67bf66d6f34b52e0b8d6f7124240d96dc962c318f6b51d2e69c007036dae03f9390f5e3b5b615b63f0783dd2e
     HEAD_REF main
+    PATCHES
+      set_version.patch
 )
 
 if(EXISTS "${SOURCE_PATH}/sdk/identity/azure-identity")

diff --git a/ports/azure-identity-cpp/set_version.patch b/ports/azure-identity-cpp/set_version.patch
@@ -0,0 +1,12 @@
+diff --git a/sdk/identity/azure-identity/CMakeLists.txt b/sdk/identity/azure-identity/CMakeLists.txt
+index 57fe6bbc2..2cd8243ac 100644
+--- a/sdk/identity/azure-identity/CMakeLists.txt
++++ b/sdk/identity/azure-identity/CMakeLists.txt
+@@ -117,6 +117,7 @@ else()
+ endif()
+
+ get_az_version("${CMAKE_CURRENT_SOURCE_DIR}/src/private/package_version.hpp")
++set_target_properties(azure-identity PROPERTIES VERSION ${AZ_LIBRARY_VERSION})
+ generate_documentation(azure-identity ${AZ_LIBRARY_VERSION})
+
+ az_vcpkg_export(
diff --git a/ports/azure-identity-cpp/vcpkg.json b/ports/azure-identity-cpp/vcpkg.json
@@ -5,7 +5,7 @@
   ],
   "name": "azure-identity-cpp",
   "version-semver": "1.10.0",
-  "port-version": 1,
+  "port-version": 2,
   "description": [
     "Microsoft Azure Identity SDK for C++",
     "This library provides common authentication-related abstractions for Azure SDK."