microsoft · BillyONeal · Nov 22, 2021 · Sep 20, 2021 · Sep 21, 2021 · Sep 21, 2021
diff --git a/ports/aws-c-auth/portfile.cmake b/ports/aws-c-auth/portfile.cmake
@@ -12,6 +12,7 @@ vcpkg_cmake_configure(
     PREFER_NINJA
     OPTIONS
         "-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files
+		-DBUILD_TESTING=FALSE
 )
 
 vcpkg_cmake_install()

diff --git a/ports/aws-c-auth/vcpkg.json b/ports/aws-c-auth/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "aws-c-auth",
   "version": "0.6.3",
+  "port-version": 1,
   "description": "C99 library implementation of AWS client-side authentication: standard credentials providers and signing.",
   "homepage": "https://github.com/awslabs/aws-c-auth",
   "supports": "!arm & !uwp",

diff --git a/ports/aws-c-cal/fix-cmake-target-path.patch → ...aws-c-cal/001-fix-cmake-target-path.patch b/ports/aws-c-cal/fix-cmake-target-path.patch → ...aws-c-cal/001-fix-cmake-target-path.patch
diff --git a/ports/aws-c-cal/002-no-exe-no-tests.patch b/ports/aws-c-cal/002-no-exe-no-tests.patch
@@ -0,0 +1,20 @@
+Index: CMakeLists.txt
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt	(revision aa89aa4950074babe84762413f39bd364ecaf944)
++++ b/CMakeLists.txt	(date 1632228755789)
+@@ -173,11 +173,3 @@
+ install(FILES ${EXPORT_MODULES}
+         DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/modules"
+         COMPONENT Development)
+-
+-if (NOT CMAKE_CROSSCOMPILING AND NOT BYO_CRYPTO)
+-    add_subdirectory(bin/sha256_profile)
+-    include(CTest)
+-    if (BUILD_TESTING)
+-        add_subdirectory(tests)
+-    endif()
+-endif()
diff --git a/ports/aws-c-cal/portfile.cmake b/ports/aws-c-cal/portfile.cmake
@@ -4,27 +4,25 @@ vcpkg_from_github(
     REF aa89aa4950074babe84762413f39bd364ecaf944 # v0.5.11
     SHA512 b92ae3cb14d26dfe48cb903df56f7df91a4dc0ab2e5ea4f095c72b0b7e0a2582f1324c73eb42c080bcb0a59a3dfc37cd2912037fc8e5f7df8433899749fca63c
     HEAD_REF master
-    PATCHES fix-cmake-target-path.patch
+    PATCHES
+		001-fix-cmake-target-path.patch
+		002-no-exe-no-tests.patch
 )
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     PREFER_NINJA
 	OPTIONS
         "-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files
+		-DBUILD_TESTING=FALSE
 )
 
 vcpkg_cmake_install()
 
 vcpkg_cmake_config_fixup(CONFIG_PATH lib/aws-c-cal/cmake)
 
-vcpkg_copy_tools(
-    TOOL_NAMES sha256_profile
-    AUTO_CLEAN
-)
-
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    file(REMOVE_RECURSE 
+    file(REMOVE_RECURSE
         "${CURRENT_PACKAGES_DIR}/bin"
         "${CURRENT_PACKAGES_DIR}/debug/bin"
     )

diff --git a/ports/aws-c-cal/vcpkg.json b/ports/aws-c-cal/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "aws-c-cal",
   "version": "0.5.11",
+  "port-version": 1,
   "description": "C99 wrapper for cryptography primitives.",
   "homepage": "https://github.com/awslabs/aws-c-cal",
   "supports": "!arm & !uwp",

diff --git a/ports/aws-c-common/portfile.cmake b/ports/aws-c-common/portfile.cmake
@@ -12,6 +12,8 @@ vcpkg_from_github(
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     PREFER_NINJA
+    OPTIONS
+        -DBUILD_TESTING=FALSE
 )
 
 vcpkg_cmake_install()

diff --git a/ports/aws-c-common/vcpkg.json b/ports/aws-c-common/vcpkg.json
@@ -1,10 +1,12 @@
 {
   "name": "aws-c-common",
   "version": "0.6.9",
+  "port-version": 1,
   "description": "AWS common library for C",
   "homepage": "https://github.com/awslabs/aws-c-common",
   "supports": "!arm & !uwp",
   "dependencies": [
+    "openssl",
     {
       "name": "vcpkg-cmake",
       "host": true

diff --git a/ports/aws-c-compression/portfile.cmake b/ports/aws-c-compression/portfile.cmake
@@ -12,6 +12,7 @@ vcpkg_cmake_configure(
     PREFER_NINJA
     OPTIONS
         "-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files
+		-DBUILD_TESTING=FALSE
 )
 
 vcpkg_cmake_install()

diff --git a/ports/aws-c-compression/vcpkg.json b/ports/aws-c-compression/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "aws-c-compression",
   "version": "0.2.14",
+  "port-version": 1,
   "description": "C99 implementation of huffman encoding/decoding",
   "homepage": "https://github.com/awslabs/aws-c-compression",
   "supports": "!arm & !uwp",

diff --git a/ports/aws-c-event-stream/portfile.cmake b/ports/aws-c-event-stream/portfile.cmake
@@ -12,6 +12,7 @@ vcpkg_cmake_configure(
     PREFER_NINJA
 	OPTIONS
 		"-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common"
+		-DBUILD_TESTING=FALSE
 )
 
 vcpkg_cmake_install()

diff --git a/ports/aws-c-event-stream/vcpkg.json b/ports/aws-c-event-stream/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "aws-c-event-stream",
   "version": "0.2.7",
+  "port-version": 1,
   "description": "C99 implementation of the vnd.amazon.event-stream content-type.",
   "homepage": "https://github.com/awslabs/aws-c-event-stream",
   "supports": "!arm & !uwp",

diff --git a/ports/aws-c-http/portfile.cmake b/ports/aws-c-http/portfile.cmake
@@ -12,17 +12,13 @@ vcpkg_cmake_configure(
     PREFER_NINJA
     OPTIONS
         "-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files
+		-DBUILD_TESTING=FALSE
 )
 
 vcpkg_cmake_install()
 
 vcpkg_cmake_config_fixup(CONFIG_PATH lib/aws-c-http/cmake)
 
-vcpkg_copy_tools(
-    TOOL_NAMES elasticurl
-    AUTO_CLEAN
-)
-
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     file(REMOVE_RECURSE 
         "${CURRENT_PACKAGES_DIR}/bin"

diff --git a/ports/aws-c-http/vcpkg.json b/ports/aws-c-http/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "aws-c-http",
   "version": "0.6.5",
+  "port-version": 1,
   "description": "C99 implementation of the HTTP/1.1 and HTTP/2 specifications",
   "homepage": "https://github.com/awslabs/aws-c-http",
   "supports": "!arm & !uwp",

diff --git a/ports/aws-c-io/portfile.cmake b/ports/aws-c-io/portfile.cmake
@@ -12,6 +12,7 @@ vcpkg_cmake_configure(
     PREFER_NINJA
 	OPTIONS
         "-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files
+		-DBUILD_TESTING=FALSE
 )
 
 vcpkg_cmake_install()

diff --git a/ports/aws-c-io/vcpkg.json b/ports/aws-c-io/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "aws-c-io",
   "version": "0.10.7",
+  "port-version": 1,
   "description": "Handles all IO and TLS work for application protocols.",
   "homepage": "https://github.com/awslabs/aws-c-io",
   "supports": "!arm & !uwp",

diff --git a/ports/aws-c-mqtt/portfile.cmake b/ports/aws-c-mqtt/portfile.cmake
@@ -12,17 +12,13 @@ vcpkg_cmake_configure(
     PREFER_NINJA
     OPTIONS
         "-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files
+		-DBUILD_TESTING=FALSE
 )
 
 vcpkg_cmake_install()
 
 vcpkg_cmake_config_fixup(CONFIG_PATH lib/aws-c-mqtt/cmake)
 
-vcpkg_copy_tools(
-    TOOL_NAMES elastipubsub
-    AUTO_CLEAN
-)
-
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     file(REMOVE_RECURSE 
         "${CURRENT_PACKAGES_DIR}/bin"

diff --git a/ports/aws-c-mqtt/vcpkg.json b/ports/aws-c-mqtt/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "aws-c-mqtt",
   "version": "0.7.6",
+  "port-version": 1,
   "description": "C99 implementation of the MQTT 3.1.1 specification.",
   "homepage": "https://github.com/awslabs/aws-c-mqtt",
   "supports": "!arm & !uwp",

diff --git a/ports/aws-c-s3/portfile.cmake b/ports/aws-c-s3/portfile.cmake
@@ -12,6 +12,7 @@ vcpkg_cmake_configure(
     PREFER_NINJA
     OPTIONS
         "-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files
+		-DBUILD_TESTING=FALSE
 )
 
 vcpkg_cmake_install()

diff --git a/ports/aws-c-s3/vcpkg.json b/ports/aws-c-s3/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "aws-c-s3",
   "version": "0.1.25",
+  "port-version": 1,
   "description": "C99 library implementation for communicating with the S3 service, designed for maximizing throughput on high bandwidth EC2 instances.",
   "homepage": "https://github.com/awslabs/aws-c-s3",
   "supports": "!arm & !uwp",

diff --git a/ports/aws-checksums/portfile.cmake b/ports/aws-checksums/portfile.cmake
@@ -19,6 +19,7 @@ vcpkg_cmake_configure(
     OPTIONS
         "-DSTATIC_CRT=${STATIC_CRT_LNK}"
         "-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files
+		-DBUILD_TESTING=FALSE
 )
 
 vcpkg_cmake_install()

diff --git a/ports/aws-checksums/vcpkg.json b/ports/aws-checksums/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "aws-checksums",
   "version": "0.1.11",
+  "port-version": 1,
   "description": "Cross-Platform HW accelerated CRC32c and CRC32 with fallback to efficient SW implementations.",
   "homepage": "https://github.com/awslabs/aws-checksums",
   "supports": "!arm & !windows",

diff --git a/ports/aws-crt-cpp/portfile.cmake b/ports/aws-crt-cpp/portfile.cmake
@@ -7,26 +7,26 @@ vcpkg_from_github(
         fix-cmake-target-path.patch
 )
 
-string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATIC_CRT)
+if(MSVC)
+    string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATIC_CRT)
+
+    set(EXTRA_ARGS "-DSTATIC_CRT=${STATIC_CRT}")
+endif()
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     DISABLE_PARALLEL_CONFIGURE
     OPTIONS
-        "-DSTATIC_CRT=${STATIC_CRT}"
+        ${EXTRA_ARGS}
         "-DBUILD_DEPS=OFF"
         "-DCMAKE_MODULE_PATH=${CURRENT_INSTALLED_DIR}/share/aws-c-common" # use extra cmake files
+        -DBUILD_TESTING=FALSE
 )
 
 vcpkg_cmake_install()
 
 vcpkg_cmake_config_fixup(CONFIG_PATH lib/aws-crt-cpp/cmake)
 
-vcpkg_copy_tools(
-    TOOL_NAMES elasticurl_cpp
-    AUTO_CLEAN
-)
-
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     file(REMOVE_RECURSE 
         "${CURRENT_PACKAGES_DIR}/bin"

diff --git a/ports/aws-crt-cpp/vcpkg.json b/ports/aws-crt-cpp/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "aws-crt-cpp",
   "version": "0.15.1",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Cross-Platform HW accelerated CRC32c and CRC32 with fallback to efficient SW implementations.",
   "homepage": "https://github.com/awslabs/aws-crt-cpp",
   "supports": "!arm & !uwp",

diff --git a/ports/aws-sdk-cpp/portfile.cmake b/ports/aws-sdk-cpp/portfile.cmake
@@ -12,14 +12,16 @@ vcpkg_from_github(
 string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" FORCE_SHARED_CRT)
 
 set(EXTRA_ARGS)
-if(VCPKG_TARGET_IS_OSX OR VCPKG_TARGET_IS_IOS)
+if(APPLE)
     set(rpath "@loader_path")
-    set(EXTRA_ARGS
-            "-DCURL_HAS_H2_EXITCODE=0"
-            "-DCURL_HAS_H2_EXITCODE__TRYRUN_OUTPUT=\"\""
-            "-DCURL_HAS_TLS_PROXY_EXITCODE=0"
-            "-DCURL_HAS_TLS_PROXY_EXITCODE__TRYRUN_OUTPUT=\"\""
-            )
+    if(VCPKG_TARGET_IS_IOS)
+        set(EXTRA_ARGS
+                "-DCURL_HAS_H2_EXITCODE=0"
+                "-DCURL_HAS_H2_EXITCODE__TRYRUN_OUTPUT=\"\""
+                "-DCURL_HAS_TLS_PROXY_EXITCODE=0"
+                "-DCURL_HAS_TLS_PROXY_EXITCODE__TRYRUN_OUTPUT=\"\""
+                )
+    endif()
 elseif (VCPKG_TARGET_IS_ANDROID)
     set(EXTRA_ARGS "-DTARGET_ARCH=ANDROID"
             "-DGIT_EXECUTABLE=--invalid-git-executable--"
@@ -28,11 +30,6 @@ elseif (VCPKG_TARGET_IS_ANDROID)
             "-DANDROID_BUILD_ZLIB=FALSE"
             "-DANDROID_BUILD_CURL=FALSE"
             "-DANDROID_BUILD_OPENSSL=FALSE"
-            "-DENABLE_HW_OPTIMIZATION=OFF"
-            "-DCURL_HAS_H2_EXITCODE=0"
-            "-DCURL_HAS_H2_EXITCODE__TRYRUN_OUTPUT=\"\""
-            "-DCURL_HAS_TLS_PROXY_EXITCODE=0"
-            "-DCURL_HAS_TLS_PROXY_EXITCODE__TRYRUN_OUTPUT=\"\""
             )
 else()
     set(rpath "\$ORIGIN")

diff --git a/ports/aws-sdk-cpp/vcpkg.json b/ports/aws-sdk-cpp/vcpkg.json
@@ -2,7 +2,7 @@
   "$note": "Automatically generated by generateFeatures.ps1",
   "name": "aws-sdk-cpp",
   "version": "1.9.96",
-  "port-version": 2,
+  "port-version": 3,
   "description": "AWS SDK for C++",
   "homepage": "https://github.com/aws/aws-sdk-cpp",
   "supports": "!arm & !uwp",

diff --git a/ports/kubernetes/001-fix-destination.patch b/ports/kubernetes/001-fix-destination.patch
@@ -0,0 +1,12 @@
+diff --git a/kubernetes/CMakeLists.txt b/kubernetes/CMakeLists.txt
+--- a/kubernetes/CMakeLists.txt	(revision 6b98698c92c59d8c63815f74ed4183fc36cde37b)
++++ b/kubernetes/CMakeLists.txt	(date 1632055519986)
+@@ -1563,7 +1563,7 @@
+     install(TARGETS ${pkgName} DESTINATION ${CMAKE_INSTALL_PREFIX})
+ else()
+     include(GNUInstallDirs)
+-    install(TARGETS ${pkgName} DESTINATION ${CMAKE_INSTALL_PREFIX} EXPORT ${pkgName}Targets)
++    install(TARGETS ${pkgName} EXPORT ${pkgName}Targets)
+
+     foreach(HDR_FILE ${HDRS})
+         get_filename_component(HDR_DIRECTORY ${HDR_FILE} DIRECTORY)
diff --git a/ports/kubernetes/portfile.cmake b/ports/kubernetes/portfile.cmake
@@ -0,0 +1,27 @@
+vcpkg_fail_port_install(ON_TARGET "UWP")
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO kubernetes-client/c
+    REF f6465c8fb099f2c8fcf1f84edd5e880610600f10
+    SHA512 e95a843028a352b1db881be483de5838d8795491e3125598432c4fcc10650aa9c733f96f6a63ec7fe0b1612274df46241b05cc59d0aa569a6c46b7c9db56221c
+    HEAD_REF master
+    PATCHES
+        001-fix-destination.patch
+)
+
+vcpkg_cmake_configure(
+    SOURCE_PATH ${SOURCE_PATH}/kubernetes
+    PREFER_NINJA)
+
+vcpkg_cmake_install()
+
+if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL debug)
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+endif()
+
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT})
+
+vcpkg_copy_pdbs()
+
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/kubernetes/vcpkg.json b/ports/kubernetes/vcpkg.json
@@ -0,0 +1,20 @@
+{
+  "name": "kubernetes",
+  "version-string": "0.0.1",
+  "description": "Kubernetes C client",
+  "homepage": "https://github.com/kubernetes-client/c/",
+  "dependencies": [
+    "curl",
+    "libwebsockets",
+    "libyaml",
+    "openssl",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}
diff --git a/ports/openssl/unix/portfile.cmake b/ports/openssl/unix/portfile.cmake
@@ -27,8 +27,6 @@ vcpkg_configure_cmake(
         -DPERL=${PERL}
         -DMAKE=${MAKE}
         -DVCPKG_CONCURRENCY=${VCPKG_CONCURRENCY}
-    OPTIONS_RELEASE
-        -DINSTALL_HEADERS=ON
 )
 
 vcpkg_install_cmake()