From d5efab05ba34a8677c75589f6e747ac4a9050b6c Mon Sep 17 00:00:00 2001 From: DengJun Date: Tue, 9 Feb 2021 17:09:56 +0800 Subject: [PATCH 1/8] add port srpc --- ports/srpc/portfile.cmake | 25 +++++++++++++++++++++++++ ports/srpc/vcpkg.json | 14 ++++++++++++++ versions/baseline.json | 4 ++++ versions/s-/srpc.json | 9 +++++++++ 4 files changed, 52 insertions(+) create mode 100644 ports/srpc/portfile.cmake create mode 100644 ports/srpc/vcpkg.json create mode 100644 versions/s-/srpc.json diff --git a/ports/srpc/portfile.cmake b/ports/srpc/portfile.cmake new file mode 100644 index 00000000000000..edc2da5f6f7579 --- /dev/null +++ b/ports/srpc/portfile.cmake @@ -0,0 +1,25 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO sogou/srpc + REF v0.9.3 + SHA512 e64cfec279f833ad24b1942ef2b572fc4bd3bfc5f9d623cd5d25b3c869d2ff9b35250cc814e8aaeb919ebed0929c44407eb9abb2e6793cfdc967708210f5f7e3 + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + DISABLE_PARALLEL_CONFIGURE +) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake TARGET_PATH share) +vcpkg_copy_pdbs() +vcpkg_copy_tools( + TOOL_NAMES srpc_generator + AUTO_CLEAN +) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/srpc RENAME copyright) diff --git a/ports/srpc/vcpkg.json b/ports/srpc/vcpkg.json new file mode 100644 index 00000000000000..60a5b082e1d396 --- /dev/null +++ b/ports/srpc/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "srpc", + "version": "0.9.3", + "description": "RPC based on Sogou C++ Workflow", + "homepage": "https://github.com/sogou/srpc", + "dependencies": [ + "lz4", + "openssl", + "protobuf", + "snappy", + "workflow", + "zlib" + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index a4cd4e99dae634..6a8790abe27a43 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6108,6 +6108,10 @@ "baseline": "0.6.4", "port-version": 0 }, + "srpc": { + "baseline": "0.9.3", + "port-version": 0 + }, "starlink-ast": { "baseline": "9.2.4", "port-version": 1 diff --git a/versions/s-/srpc.json b/versions/s-/srpc.json new file mode 100644 index 00000000000000..aaf6472503a223 --- /dev/null +++ b/versions/s-/srpc.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "b63f7b688a88865e15d06a03ae383ea0bcb9d4ff", + "version": "0.9.3", + "port-version": 0 + } + ] +} From c0de6b7eacc9dfb6a5fd81dcda62b6eadb867970 Mon Sep 17 00:00:00 2001 From: DengJun <65080805+dengjunplusplus@users.noreply.github.com> Date: Wed, 25 Aug 2021 10:12:58 +0800 Subject: [PATCH 2/8] Update ports/srpc/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- ports/srpc/portfile.cmake | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ports/srpc/portfile.cmake b/ports/srpc/portfile.cmake index edc2da5f6f7579..b2179e6726be9b 100644 --- a/ports/srpc/portfile.cmake +++ b/ports/srpc/portfile.cmake @@ -6,9 +6,8 @@ vcpkg_from_github( HEAD_REF master ) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA DISABLE_PARALLEL_CONFIGURE ) From 4a7745f5964f67b6ad469bf081a9e03d88d5f0da Mon Sep 17 00:00:00 2001 From: DengJun <65080805+dengjunplusplus@users.noreply.github.com> Date: Wed, 25 Aug 2021 10:13:08 +0800 Subject: [PATCH 3/8] Update ports/srpc/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- ports/srpc/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/srpc/portfile.cmake b/ports/srpc/portfile.cmake index b2179e6726be9b..fb76105babb69d 100644 --- a/ports/srpc/portfile.cmake +++ b/ports/srpc/portfile.cmake @@ -11,7 +11,7 @@ vcpkg_cmake_configure( DISABLE_PARALLEL_CONFIGURE ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake TARGET_PATH share) vcpkg_copy_pdbs() vcpkg_copy_tools( From 57a841cd609b1960143f1ac870835062a47cd90f Mon Sep 17 00:00:00 2001 From: DengJun <65080805+dengjunplusplus@users.noreply.github.com> Date: Wed, 25 Aug 2021 10:13:23 +0800 Subject: [PATCH 4/8] Update ports/srpc/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- ports/srpc/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/srpc/portfile.cmake b/ports/srpc/portfile.cmake index fb76105babb69d..a9186b1c2d7841 100644 --- a/ports/srpc/portfile.cmake +++ b/ports/srpc/portfile.cmake @@ -12,7 +12,7 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake TARGET_PATH share) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/srpc) vcpkg_copy_pdbs() vcpkg_copy_tools( TOOL_NAMES srpc_generator From 6a99d7864e434586dcf729ad370c5ed88f1e8aa9 Mon Sep 17 00:00:00 2001 From: DengJun <65080805+dengjunplusplus@users.noreply.github.com> Date: Wed, 25 Aug 2021 10:13:41 +0800 Subject: [PATCH 5/8] Update ports/srpc/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- ports/srpc/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/srpc/portfile.cmake b/ports/srpc/portfile.cmake index a9186b1c2d7841..5b5dbc81a8eb5d 100644 --- a/ports/srpc/portfile.cmake +++ b/ports/srpc/portfile.cmake @@ -21,4 +21,4 @@ vcpkg_copy_tools( file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/srpc RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) From 9845fbfeaf671c5792b6353ace8a497af8fb0342 Mon Sep 17 00:00:00 2001 From: DengJun <65080805+dengjunplusplus@users.noreply.github.com> Date: Wed, 25 Aug 2021 10:13:48 +0800 Subject: [PATCH 6/8] Update ports/srpc/vcpkg.json Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- ports/srpc/vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ports/srpc/vcpkg.json b/ports/srpc/vcpkg.json index 60a5b082e1d396..f53ff3e28d0892 100644 --- a/ports/srpc/vcpkg.json +++ b/ports/srpc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "srpc", - "version": "0.9.3", + "version-semver": "0.9.3", "description": "RPC based on Sogou C++ Workflow", "homepage": "https://github.com/sogou/srpc", "dependencies": [ From c5b8401b89aca3ee32d4ada44c15b77c3a7ea18a Mon Sep 17 00:00:00 2001 From: DengJun Date: Wed, 25 Aug 2021 10:19:06 +0800 Subject: [PATCH 7/8] add dependency --- ports/srpc/vcpkg.json | 8 ++++++++ versions/s-/srpc.json | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ports/srpc/vcpkg.json b/ports/srpc/vcpkg.json index f53ff3e28d0892..3b95d8da00f2f8 100644 --- a/ports/srpc/vcpkg.json +++ b/ports/srpc/vcpkg.json @@ -8,6 +8,14 @@ "openssl", "protobuf", "snappy", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "workflow", "zlib" ] diff --git a/versions/s-/srpc.json b/versions/s-/srpc.json index aaf6472503a223..45916893091ccd 100644 --- a/versions/s-/srpc.json +++ b/versions/s-/srpc.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "b63f7b688a88865e15d06a03ae383ea0bcb9d4ff", - "version": "0.9.3", + "git-tree": "a661dc3cfb7479653f6db0ca948bb5bda1588d63", + "version-semver": "0.9.3", "port-version": 0 } ] From 3b933c23ec4b29d39b53346f305159d146938ef1 Mon Sep 17 00:00:00 2001 From: DengJun <65080805+dengjunplusplus@users.noreply.github.com> Date: Wed, 25 Aug 2021 12:00:29 +0800 Subject: [PATCH 8/8] Update versions/s-/srpc.json Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- versions/s-/srpc.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/s-/srpc.json b/versions/s-/srpc.json index 45916893091ccd..01f29288d85606 100644 --- a/versions/s-/srpc.json +++ b/versions/s-/srpc.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "a661dc3cfb7479653f6db0ca948bb5bda1588d63", + "git-tree": "7f8e905bb42ba10b9076c4fca512933f4e3171e5", "version-semver": "0.9.3", "port-version": 0 }