From 5da825f1512cdb76e47f1ee471011c3a0923f68d Mon Sep 17 00:00:00 2001 From: Frank <65999885+FrankXie05@users.noreply.github.com> Date: Thu, 16 May 2024 21:48:28 +0000 Subject: [PATCH] [rest-rpc] Update version to 0.12 (#38721) Fix https://github.com/microsoft/vcpkg/issues/38705 No feature need to test. - [x] Changes comply with the [maintainer guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md). - [x] SHA512s are updated for each updated download. - [ ] ~~The "supports" clause reflects platforms that may be fixed by this new version.~~ - [ ] ~~Any fixed [CI baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt) entries are removed from that file.~~ - [ ] ~~Any patches that are no longer applied are deleted from the port's directory.~~ - [x] The version database is fixed by rerunning `./vcpkg x-add-version --all` and committing the result. - [x] Only one version is added to each modified port's versions file. --- ports/rest-rpc/portfile.cmake | 13 ++++++------- ports/rest-rpc/usage | 4 ++++ ports/rest-rpc/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/r-/rest-rpc.json | 5 +++++ 5 files changed, 18 insertions(+), 11 deletions(-) create mode 100644 ports/rest-rpc/usage diff --git a/ports/rest-rpc/portfile.cmake b/ports/rest-rpc/portfile.cmake index 551ff14288..3fc5a90337 100644 --- a/ports/rest-rpc/portfile.cmake +++ b/ports/rest-rpc/portfile.cmake @@ -3,20 +3,17 @@ if (EXISTS ${CURRENT_INSTALLED_DIR}/include/msgpack/pack.h) endif() # header-only library -set(RESTRPC_VERSION V0.07) -set(RESTRPC_HASH 148152776c8c4f16e404c62ab3f46618e1817c0b4b186dbcc399c859efd110ed5a207bf56e961c312f80844f696f597068e0abc00e426409d50a2889d30c6d8e) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/rest-rpc-${RESTRPC_VERSION}) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO qicosmos/rest_rpc - REF ${RESTRPC_VERSION} - SHA512 ${RESTRPC_HASH} + REF "v${VERSION}" + SHA512 1d88085acc6c4f913901631725acd08a688a079878677d064d441c3c89167275c5eed371d24e370feb88879ac06270e9316b91c67ea41e350523fe670406ecc1 HEAD_REF master ) file(INSTALL ${SOURCE_PATH}/include/ DESTINATION ${CURRENT_PACKAGES_DIR}/include) -file(INSTALL ${SOURCE_PATH}/third/msgpack/include/ DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(INSTALL ${SOURCE_PATH}/thirdparty/msgpack-c/include/ DESTINATION ${CURRENT_PACKAGES_DIR}/include) vcpkg_replace_string( "${CURRENT_PACKAGES_DIR}/include/rest_rpc.hpp" @@ -24,5 +21,7 @@ vcpkg_replace_string( "#define ASIO_STANDALONE\n#include \"rest_rpc/rpc_server.h\"" ) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + # # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/rest-rpc/usage b/ports/rest-rpc/usage new file mode 100644 index 0000000000..bac307d8ee --- /dev/null +++ b/ports/rest-rpc/usage @@ -0,0 +1,4 @@ +rest-rpc is header-only and can be used from CMake via: + + find_path(REST_RPC_INCLUDE_DIRS "rest_rpc.hpp") + target_include_directories(main PRIVATE ${REST_RPC_INCLUDE_DIRS}) diff --git a/ports/rest-rpc/vcpkg.json b/ports/rest-rpc/vcpkg.json index 478198e722..c335ac1ef3 100644 --- a/ports/rest-rpc/vcpkg.json +++ b/ports/rest-rpc/vcpkg.json @@ -1,7 +1,6 @@ { "name": "rest-rpc", - "version-string": "0.07", - "port-version": 2, + "version": "0.12", "description": "c++11, high performance, cross platform, easy to use rpc framework", "homepage": "https://github.com/qicosmos/rest_rpc", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index c0ef6101eb..c3c7a957d2 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7681,8 +7681,8 @@ "port-version": 2 }, "rest-rpc": { - "baseline": "0.07", - "port-version": 2 + "baseline": "0.12", + "port-version": 0 }, "restbed": { "baseline": "4.8", diff --git a/versions/r-/rest-rpc.json b/versions/r-/rest-rpc.json index 8c2be0be3e..0fcee3c4f1 100644 --- a/versions/r-/rest-rpc.json +++ b/versions/r-/rest-rpc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0ae642ae2a86dcfcf77e4c027ab0c4267987020e", + "version": "0.12", + "port-version": 0 + }, { "git-tree": "05fad9e9e4a1d76707fbcb7da2d06338eb9ff8ce", "version-string": "0.07",