aboutsummaryrefslogtreecommitdiff
path: root/ports/capnproto
diff options
context:
space:
mode:
authorJack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>2020-09-27 17:54:12 -0700
committerGitHub <noreply@github.com>2020-09-27 17:54:12 -0700
commitb9be644f8b851c67a9fa42941331167d6da4b14c (patch)
tree77e236da2c67fa068c11ca20fdf8982e1a9f4a22 /ports/capnproto
parent8fcd02ddc190fe440a48f64035fb2508c7a157dc (diff)
downloadvcpkg-b9be644f8b851c67a9fa42941331167d6da4b14c.tar.gz
vcpkg-b9be644f8b851c67a9fa42941331167d6da4b14c.zip
[capnproto/check/cppgraphqlgen] Update version (#13677)
* [manyports] Update version 3 * move changes to other PRs * Remove unuse patch * Remove useless patch
Diffstat (limited to 'ports/capnproto')
-rw-r--r--ports/capnproto/0001-fix-capnpc-extension-handling-on-Windows.patch39
-rw-r--r--ports/capnproto/CONTROL2
-rw-r--r--ports/capnproto/portfile.cmake18
3 files changed, 6 insertions, 53 deletions
diff --git a/ports/capnproto/0001-fix-capnpc-extension-handling-on-Windows.patch b/ports/capnproto/0001-fix-capnpc-extension-handling-on-Windows.patch
deleted file mode 100644
index d0544c625..000000000
--- a/ports/capnproto/0001-fix-capnpc-extension-handling-on-Windows.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 6e142f270524d78689a119737660050561cf853e Mon Sep 17 00:00:00 2001
-From: Thomas Arcila <thomas.arcila@gmail.com>
-Date: Sat, 9 Mar 2019 19:00:24 -0500
-Subject: [PATCH] fix capnpc extension handling on Windows
-
----
- c++/src/capnp/CMakeLists.txt | 2 +-
- c++/src/capnp/compiler/capnp.c++ | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/c++/src/capnp/CMakeLists.txt b/c++/src/capnp/CMakeLists.txt
-index 11cbf5af..20b99ed3 100644
---- a/c++/src/capnp/CMakeLists.txt
-+++ b/c++/src/capnp/CMakeLists.txt
-@@ -182,7 +182,7 @@ if(NOT CAPNP_LITE)
- install(TARGETS capnp_tool capnpc_cpp capnpc_capnp ${INSTALL_TARGETS_DEFAULT_ARGS})
-
- # Symlink capnpc -> capnp
-- install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink capnp \"\$ENV{DESTDIR}${CMAKE_INSTALL_FULL_BINDIR}/capnpc\")")
-+ install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink capnp${CMAKE_EXECUTABLE_SUFFIX} \"\$ENV{DESTDIR}${CMAKE_INSTALL_FULL_BINDIR}/capnpc${CMAKE_EXECUTABLE_SUFFIX}\")")
- endif() # NOT CAPNP_LITE
-
- # Tests ========================================================================
-diff --git a/c++/src/capnp/compiler/capnp.c++ b/c++/src/capnp/compiler/capnp.c++
-index 8e8c459b..d252fb12 100644
---- a/c++/src/capnp/compiler/capnp.c++
-+++ b/c++/src/capnp/compiler/capnp.c++
-@@ -78,7 +78,7 @@ public:
- : context(context), disk(kj::newDiskFilesystem()), loader(*this) {}
-
- kj::MainFunc getMain() {
-- if (context.getProgramName().endsWith("capnpc")) {
-+ if (context.getProgramName().endsWith("capnpc") || context.getProgramName().endsWith("capnpc.exe")) {
- kj::MainBuilder builder(context, VERSION_STRING,
- "Compiles Cap'n Proto schema files and generates corresponding source code in one or "
- "more languages.");
---
-2.19.1
-
diff --git a/ports/capnproto/CONTROL b/ports/capnproto/CONTROL
index cb1258c97..73ac1b2b4 100644
--- a/ports/capnproto/CONTROL
+++ b/ports/capnproto/CONTROL
@@ -1,5 +1,5 @@
Source: capnproto
-Version: 0.7.0-3
+Version: 0.8.0
Description: Data interchange format and capability-based RPC system
Homepage: https://capnproto.org/
Build-Depends: zlib
diff --git a/ports/capnproto/portfile.cmake b/ports/capnproto/portfile.cmake
index 4e149a035..f352a5f6c 100644
--- a/ports/capnproto/portfile.cmake
+++ b/ports/capnproto/portfile.cmake
@@ -1,18 +1,13 @@
-if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL WindowsStore)
- message(FATAL_ERROR "Error: UWP build is not supported.")
-endif()
-
-include(vcpkg_common_functions)
+vcpkg_fail_port_install(ON_TARGET "UWP")
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO capnproto/capnproto
- REF v0.7.0
- SHA512 a3ea278ded6a866759c0517d16b99bd38ffea1c163ce63a3604b752d8bdaafbc38a600de94afe12db35e7f7f06e29cc94c911dc2e0ecec6fe1185452df2a2bd3
+ REF 57a4ca5af5a7f55b768a9d9d6655250bffb1257f # v0.8.0
+ SHA512 6550356a40a13d41fbeef3887027de1134c4bc37e4d79435e67da1f65665f3856f7cd663be392135cf4a08fffcfd4e171614026c20bfc5727adfd624b2d33e35
HEAD_REF master
- PATCHES "${CMAKE_CURRENT_LIST_DIR}/0001-fix-capnpc-extension-handling-on-Windows.patch"
)
vcpkg_configure_cmake(
@@ -24,9 +19,7 @@ vcpkg_install_cmake()
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/CapnProto)
-file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools")
-file(RENAME "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/tools/capnproto")
-vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/capnproto)
+vcpkg_copy_tools(TOOL_NAMES capnp capnpc-c++ capnpc-capnp AUTO_CLEAN)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin)
@@ -34,8 +27,7 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
# Handle copyright
-file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/capnproto)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/capnproto/LICENSE ${CURRENT_PACKAGES_DIR}/share/capnproto/copyright)
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
# Disabled for now, see #5630 and #5635
# vcpkg_test_cmake(PACKAGE_NAME CapnProto)