Skip to content

Commit

Permalink
[aws-sdk-cpp] update to 1.9.96 (microsoft#20033)
Browse files Browse the repository at this point in the history
* [aws-c-common] Update to 0.6.9

* [aws-checksums] Update to 0.1.11

* [aws-c-event-stream] Upgrade to 0.2.7

* Add aws-c-cal port

* Add s2n port

* Add port aws-c-io

* [aws-c-event-stream] Update port to 0.2.7

* Update aws-sdk-cpp port

* Add aws-c-compression port

* Add aws-c-auth port

* Add aws-c-http port

* Add aws-c-mqtt port

* Add aws-c-s3 port

* Add aws-crt-cpp port

* [aws-sdk-cpp] Update port to 1.9.91 version

* Fix port issues.

* Upgrade aws-sdk-cpp to 1.9.96
Upgrade aws-crt-cpp to 0.15.1

* Support x64-windows

* Fix format issues

* Specify supported triplets for aws libs

* Specify platforms for more aws libs

* Support x64-windows-static triplet.

* Fix format issue for aws-c-common

* Update port versions file

* Use new vcpkg cmake methods and format

* Use new vcpkg cmake methods and format

* update version

* Fix s2n port typo

* Fix s2n port typo

Co-authored-by: Jonliu1993 <[email protected]>
Co-authored-by: Billy Robert O'Neal III <[email protected]>
  • Loading branch information
3 people authored Sep 15, 2021
1 parent 5395ad9 commit 92af1ff
Show file tree
Hide file tree
Showing 56 changed files with 1,069 additions and 199 deletions.
28 changes: 28 additions & 0 deletions ports/aws-c-auth/fix-cmake-target-path.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6a00afa..eba3d43 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -118,7 +118,7 @@ else()
endif()

install(EXPORT "${PROJECT_NAME}-targets"
- DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/${TARGET_DIR}/"
+ DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/"
NAMESPACE AWS::
COMPONENT Development)

diff --git a/cmake/aws-c-auth-config.cmake b/cmake/aws-c-auth-config.cmake
index 430c1d7..6adbe53 100644
--- a/cmake/aws-c-auth-config.cmake
+++ b/cmake/aws-c-auth-config.cmake
@@ -5,9 +5,5 @@ find_dependency(aws-c-cal)
find_dependency(aws-c-io)
find_dependency(aws-c-http)

-if (BUILD_SHARED_LIBS)
- include(${CMAKE_CURRENT_LIST_DIR}/shared/@[email protected])
-else()
- include(${CMAKE_CURRENT_LIST_DIR}/static/@[email protected])
-endif()
+include(${CMAKE_CURRENT_LIST_DIR}/@[email protected])

39 changes: 39 additions & 0 deletions ports/aws-c-auth/portfile.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO awslabs/aws-c-auth
REF 61b6524960ad5e0c7aa2e38b343425d5941781bf # v0.6.3
SHA512 b5dda92e4a8796f3f1b8e2d326f57979a673f57325c921cdbc9c44273ada2f2a8eb6723f0292d223175ba4cca24508d2b635fad2af5ec7dd9e7b06db9588ede6
HEAD_REF master
PATCHES fix-cmake-target-path.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
)

vcpkg_cmake_install()

vcpkg_cmake_config_fixup(CONFIG_PATH lib/aws-c-auth/cmake)

if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
file(REMOVE_RECURSE
"${CURRENT_PACKAGES_DIR}/bin"
"${CURRENT_PACKAGES_DIR}/debug/bin"
)
endif()

file(REMOVE_RECURSE
"${CURRENT_PACKAGES_DIR}/debug/include"
"${CURRENT_PACKAGES_DIR}/debug/lib/aws-c-auth"
"${CURRENT_PACKAGES_DIR}/lib/aws-c-auth"
)

vcpkg_copy_pdbs()

file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")

# Handle copyright
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
23 changes: 23 additions & 0 deletions ports/aws-c-auth/vcpkg.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"name": "aws-c-auth",
"version": "0.6.3",
"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",
"dependencies": [
"aws-c-common",
"aws-c-http",
{
"name": "s2n",
"platform": "!uwp & !windows"
},
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
]
}
28 changes: 28 additions & 0 deletions ports/aws-c-cal/fix-cmake-target-path.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6039819..b74b65c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -158,7 +158,7 @@ else()
endif()

install(EXPORT "${PROJECT_NAME}-targets"
- DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/${TARGET_DIR}/"
+ DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/"
NAMESPACE AWS::
COMPONENT Development)

diff --git a/cmake/aws-c-cal-config.cmake b/cmake/aws-c-cal-config.cmake
index 73e7311..e87c43a 100644
--- a/cmake/aws-c-cal-config.cmake
+++ b/cmake/aws-c-cal-config.cmake
@@ -7,9 +7,5 @@ if (NOT BYO_CRYPTO AND NOT WIN32 AND NOT APPLE)
find_dependency(LibCrypto)
endif()

-if (BUILD_SHARED_LIBS)
- include(${CMAKE_CURRENT_LIST_DIR}/shared/@[email protected])
-else()
- include(${CMAKE_CURRENT_LIST_DIR}/static/@[email protected])
-endif()
+include(${CMAKE_CURRENT_LIST_DIR}/@[email protected])

44 changes: 44 additions & 0 deletions ports/aws-c-cal/portfile.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO awslabs/aws-c-cal
REF aa89aa4950074babe84762413f39bd364ecaf944 # v0.5.11
SHA512 b92ae3cb14d26dfe48cb903df56f7df91a4dc0ab2e5ea4f095c72b0b7e0a2582f1324c73eb42c080bcb0a59a3dfc37cd2912037fc8e5f7df8433899749fca63c
HEAD_REF master
PATCHES fix-cmake-target-path.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
)

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
"${CURRENT_PACKAGES_DIR}/bin"
"${CURRENT_PACKAGES_DIR}/debug/bin"
)
endif()

file(REMOVE_RECURSE
"${CURRENT_PACKAGES_DIR}/debug/include"
"${CURRENT_PACKAGES_DIR}/debug/lib/aws-c-cal"
"${CURRENT_PACKAGES_DIR}/lib/aws-c-cal"
)

vcpkg_copy_pdbs()

file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")

# Handle copyright
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
18 changes: 18 additions & 0 deletions ports/aws-c-cal/vcpkg.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"name": "aws-c-cal",
"version": "0.5.11",
"description": "C99 wrapper for cryptography primitives.",
"homepage": "https://github.com/awslabs/aws-c-cal",
"supports": "!arm & !uwp",
"dependencies": [
"aws-c-common",
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
]
}
15 changes: 0 additions & 15 deletions ports/aws-c-common/disable-error-4068.patch

This file was deleted.

18 changes: 0 additions & 18 deletions ports/aws-c-common/disable_outline_atomics.patch

This file was deleted.

12 changes: 0 additions & 12 deletions ports/aws-c-common/disable_warnings_as_errors.patch

This file was deleted.

27 changes: 12 additions & 15 deletions ports/aws-c-common/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,36 +1,33 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO awslabs/aws-c-common
REF 4a21a1c0757083a16497fea27886f5f20ccdf334 # v0.4.56
SHA512 68898a8ac15d5490f45676eabfbe0df9e45370a74c543a28909fd0d85fed48dfcf4bcd6ea2d01d1a036dd352e2e4e0b08c48c63ab2a2b477fe150b46a827136e
REF fdd4a10243903260f412f587cc748f0ac79629b4 # v0.6.9
SHA512 969c9b85af58fc144480f6548e78126cf3fe758951ecbdffb579163b9a505a7ea58c32430390102ff620e828bf241dd24c0167f205306949d36dcf4504efa09a
HEAD_REF master
PATCHES
disable-error-4068.patch # This patch fixes dependency port compilation failure
disable_warnings_as_errors.patch # Ref https://github.com/awslabs/aws-c-common/pull/798
disable-internal-crt-option.patch # Disable internal crt option because vcpkg contains crt processing flow
fix-cmake-target-path.patch # Shared libraries and static libraries are not built at the same time
disable_outline_atomics.patch # Disables -moutline-atomics flag which is not supported for wasm32 and Android
)

vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
PREFER_NINJA
)

vcpkg_install_cmake()
vcpkg_cmake_install()

vcpkg_fixup_cmake_targets(CONFIG_PATH lib/aws-c-common/cmake)
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake)
vcpkg_cmake_config_fixup(CONFIG_PATH lib/aws-c-common/cmake)
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake)

file(REMOVE_RECURSE
${CURRENT_PACKAGES_DIR}/debug/include
${CURRENT_PACKAGES_DIR}/debug/lib/aws-c-common
${CURRENT_PACKAGES_DIR}/lib/aws-c-common
"${CURRENT_PACKAGES_DIR}/debug/include"
"${CURRENT_PACKAGES_DIR}/debug/lib/aws-c-common"
"${CURRENT_PACKAGES_DIR}/lib/aws-c-common"
)

vcpkg_copy_pdbs()

file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")

# Handle copyright
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
15 changes: 12 additions & 3 deletions ports/aws-c-common/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,17 @@
{
"name": "aws-c-common",
"version-string": "0.4.56",
"port-version": 2,
"version": "0.6.9",
"description": "AWS common library for C",
"homepage": "https://github.com/awslabs/aws-c-common",
"supports": "!(arm | uwp)"
"supports": "!arm & !uwp",
"dependencies": [
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
]
}
28 changes: 28 additions & 0 deletions ports/aws-c-compression/fix-cmake-target-path.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e70e013..0639229 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -88,7 +88,7 @@ else()
endif()

install(EXPORT "${PROJECT_NAME}-targets"
- DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/${TARGET_DIR}"
+ DESTINATION "${LIBRARY_DIRECTORY}/${PROJECT_NAME}/cmake/"
NAMESPACE AWS::
COMPONENT Development)

diff --git a/cmake/aws-c-compression-config.cmake b/cmake/aws-c-compression-config.cmake
index d919e90..707ce3a 100644
--- a/cmake/aws-c-compression-config.cmake
+++ b/cmake/aws-c-compression-config.cmake
@@ -2,9 +2,5 @@ include(CMakeFindDependencyMacro)

find_dependency(aws-c-common)

-if (BUILD_SHARED_LIBS)
- include(${CMAKE_CURRENT_LIST_DIR}/shared/@[email protected])
-else()
- include(${CMAKE_CURRENT_LIST_DIR}/static/@[email protected])
-endif()
+include(${CMAKE_CURRENT_LIST_DIR}/@[email protected])

32 changes: 32 additions & 0 deletions ports/aws-c-compression/portfile.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO awslabs/aws-c-compression
REF 5fab8bc5ab5321d86f6d153b06062419080820ec # v0.2.14
SHA512 0063d0d644824d858211840115c17a33bfc2b67799e886c530ea8a42071b7bfc67bb6cf8135c538a292b8a7a6276b1d24bb7649f37ce335bc16938f2fca5cb7d
HEAD_REF master
PATCHES fix-cmake-target-path.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
)

vcpkg_cmake_install()

vcpkg_cmake_config_fixup(CONFIG_PATH lib/aws-c-compression/cmake)

file(REMOVE_RECURSE
"${CURRENT_PACKAGES_DIR}/debug/include"
"${CURRENT_PACKAGES_DIR}/debug/lib/aws-c-compression"
"${CURRENT_PACKAGES_DIR}/lib/aws-c-compression"
)

vcpkg_copy_pdbs()

file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")

# Handle copyright
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
18 changes: 18 additions & 0 deletions ports/aws-c-compression/vcpkg.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"name": "aws-c-compression",
"version": "0.2.14",
"description": "C99 implementation of huffman encoding/decoding",
"homepage": "https://github.com/awslabs/aws-c-compression",
"supports": "!arm & !uwp",
"dependencies": [
"aws-c-common",
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
]
}
Loading

0 comments on commit 92af1ff

Please sign in to comment.