[asio] update to version 1.18.0 (#14095) (#14167)

microsoft · Oct 30, 2020 · 416bb1c · 416bb1c
1 parent 20b665e
commit 416bb1c
Show file tree

Hide file tree

Showing 15 changed files with 268 additions and 280 deletions.
diff --git a/ports/asio/CONTROL b/ports/asio/CONTROL
diff --git a/ports/asio/portfile.cmake b/ports/asio/portfile.cmake
@@ -1,16 +1,15 @@
 #header-only library
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO chriskohlhoff/asio
-    REF asio-1-12-2
-    SHA512 7c2e213ff154bb2e5776b37906d437a62206f973316c94706e6d42e3c2f0866e7d97f3e40225ab5f28bf2c4a33fa0b38a4b75421aef86ddf9f2da0811caa2d00
+    REF asio-1-18-0
+    SHA512 c79529d16a51f40c9faff8549ef7dd7074aaf2574c8c338a8885aa04b3bb261a493f57498d1bd271cfcb4083e561344e286f784c77ea20e355bf86f7a39cfb39
     HEAD_REF master
 )
 
 # Always use "ASIO_STANDALONE" to avoid boost dependency
-file(READ "${SOURCE_PATH}/asio/include/asio/detail/config.hpp" _contents)
-string(REPLACE "defined(ASIO_STANDALONE)" "!defined(VCPKG_DISABLE_ASIO_STANDALONE)" _contents "${_contents}")
-file(WRITE "${SOURCE_PATH}/asio/include/asio/detail/config.hpp" "${_contents}")
+vcpkg_replace_string("${SOURCE_PATH}/asio/include/asio/detail/config.hpp" "defined(ASIO_STANDALONE)" "!defined(VCPKG_DISABLE_ASIO_STANDALONE)")
 
 # CMake install
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
@@ -23,7 +22,7 @@ vcpkg_install_cmake()
 vcpkg_fixup_cmake_targets(CONFIG_PATH "share/asio")
 file(INSTALL
     ${CMAKE_CURRENT_LIST_DIR}/asio-config.cmake
-    DESTINATION ${CURRENT_PACKAGES_DIR}/share/asio/
+    DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}
 )
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug)
 

diff --git a/ports/asio/vcpkg.json b/ports/asio/vcpkg.json
@@ -0,0 +1,27 @@
+{
+  "name": "asio",
+  "version-string": "1.18.0",
+  "description": "Asio is a cross-platform C++ library for network and low-level I/O programming that provides developers with a consistent asynchronous model using a modern C++ approach.",
+  "homepage": "https://github.com/chriskohlhoff/asio",
+  "documentation": "https://think-async.com/Asio/asio-1.18.0/doc/",
+  "features": {
+    "coroutine": {
+      "description": "Boost.Coroutine (optional) if you use spawn() to launch coroutines",
+      "dependencies": [
+        "boost-coroutine"
+      ]
+    },
+    "openssl": {
+      "description": "OpenSSL (optional) if you use Asio's SSL support.",
+      "dependencies": [
+        "openssl"
+      ]
+    },
+    "regex": {
+      "description": "Boost.Regex (optional) if you use any of the read_until() or async_read_until() overloads that take a boost::regex parameter.",
+      "dependencies": [
+        "boost-regex"
+      ]
+    }
+  }
+}
diff --git a/ports/opendnp3/CONTROL b/ports/opendnp3/CONTROL
diff --git a/ports/opendnp3/export-cmake.patch b/ports/opendnp3/export-cmake.patch
diff --git a/ports/opendnp3/portfile.cmake b/ports/opendnp3/portfile.cmake
@@ -9,10 +9,9 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" STATICLIBS)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO dnp3/opendnp3
-    REF 2.3.2
-    SHA512 41686b5c32234088a5af3c71769b0193deb10a95d623579508cc740f126f35c18796f761093cec12ead469f0088839a680cc7d137b2f762a80c1736d71c3d90a
+    REF 3.1.0
+    SHA512 838a816a8d65d3c99dc489e0e3e4d25f0acdbe0f6f3cc21a6fdbaea11f84f7b1f54958097763d0eae8e1860ba209da4e5377cd3ea6ab08a48a25429860063179
     HEAD_REF master
-    PATCHES export-cmake.patch
 )
 
 file(COPY ${CURRENT_PORT_DIR}/opendnp3-config.cmake.in DESTINATION ${SOURCE_PATH})
@@ -27,11 +26,8 @@ vcpkg_install_cmake()
 
 vcpkg_copy_pdbs()
 
-vcpkg_fixup_cmake_targets(CONFIG_PATH share/asiodnp3 TARGET_PATH share/asiodnp3)
-vcpkg_fixup_cmake_targets(CONFIG_PATH share/asiopal TARGET_PATH share/asiopal)
-vcpkg_fixup_cmake_targets(CONFIG_PATH share/opendnp3 TARGET_PATH share/opendnp3)
-vcpkg_fixup_cmake_targets(CONFIG_PATH share/openpal TARGET_PATH share/openpal)
-
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake TARGET_PATH share/opendnp3)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
-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)
diff --git a/ports/opendnp3/vcpkg.json b/ports/opendnp3/vcpkg.json
@@ -0,0 +1,10 @@
+{
+  "name": "opendnp3",
+  "version-string": "3.1.0",
+  "description": "DNP3 (IEEE-1815) protocol stack. Modern C++ with bindings for .NET and Java.",
+  "homepage": "https://github.com/dnp3/opendnp3/",
+  "dependencies": [
+    "asio",
+    "openssl"
+  ]
+}
diff --git a/ports/restbed/CONTROL b/ports/restbed/CONTROL
diff --git a/ports/restbed/add_openssl_support.patch b/ports/restbed/add_openssl_support.patch