[capnproto/check/cppgraphqlgen] Update version (#13677)

* [manyports] Update version 3

* move changes to other PRs

* Remove unuse patch

* Remove useless patch
This commit is contained in:
Jack·Boos·Yu 2020-09-27 17:54:12 -07:00 committed by GitHub
parent 8fcd02ddc1
commit b9be644f8b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 32 additions and 77 deletions

View File

@ -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

View File

@ -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

View File

@ -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)

View File

@ -1,4 +1,4 @@
Source: check
Version: 0.14.0
Version: 0.15.2
Homepage: https://github.com/libcheck/check
Description: A unit testing framework for C

View File

@ -13,10 +13,10 @@ index b5e211e..2a92a1a 100644
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/money.h DESTINATION include)
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index e6346dd..8f5762a 100644
index 38cbc53..d8a4272 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -70,3 +70,8 @@ set(HEADERS libcompat.h)
@@ -75,5 +75,11 @@ set(HEADERS libcompat.h)
add_library(compat STATIC ${SOURCES} ${HEADERS})
@ -25,19 +25,21 @@ index e6346dd..8f5762a 100644
+ LIBRARY DESTINATION lib/manual-link
+ ARCHIVE DESTINATION lib/manual-link
+)
\ No newline at end of file
+
# vim: shiftwidth=2:softtabstop=2:tabstop=2:expandtab:autoindent
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 37fcaf8..334fc9c 100644
index 4a02dbe..ade4cfd 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -180,8 +180,8 @@ target_include_directories(checkShared
install(TARGETS check checkShared
EXPORT check-targets
- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/manual-link
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/manual-link
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
)
@@ -191,8 +191,8 @@ if(NOT THIS_IS_SUBPROJECT)
install(TARGETS check checkShared
EXPORT check-targets
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/manual-link
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}/manual-link
PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
)
endif()

View File

@ -1,8 +1,8 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO libcheck/check
REF d86594e5b29d50ddbd6276ab2d2cf5c278f7656c # 0.14.0
SHA512 db9c27fdce5c238b6327dd43dec3aa0321e2a1af49d17218db8a7fb96e8f07750cbc51cf8a07504700d878d97334c1703b165a17da1c070d43aa2c15a67e977d
REF 11970a7e112dfe243a2e68773f014687df2900e8 # 0.15.2
SHA512 210c9617fa1c1ce16bef983b0e6cb587b1774c3f7ce27a53ca7799642dc7a14be8de567d69dc0e57845684c6f7991d772c73654f63c8755afda3b37a35c7156e
HEAD_REF master
PATCHES fix-lib-path.patch
)

View File

@ -1,5 +1,5 @@
Source: cppgraphqlgen
Version: 3.2.2
Version: 3.2.3
Build-Depends: boost-filesystem (!uwp&!windows), boost-program-options, pegtl, rapidjson
Description: C++ GraphQL schema service generator
Homepage: https://github.com/microsoft/cppgraphqlgen

View File

@ -1,8 +1,8 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO microsoft/cppgraphqlgen
REF v3.2.2
SHA512 69d29800935e36402b81fc2e379b7e6c2edb9ff5bf22cccb4a42cd2497576e5ca4a6e1b6179b8f3c188a0416d882fbc0e0ba72b5e78ee667a2f6847f5b806bf0
REF f43fbf4abe82cb598d34824210ec86b50e8c070c # v3.2.3
SHA512 e9d2df8aba1942847ef8d3eef75fe72d0b32ae9a47cd183391935d1d89ce30951fc4619f16512c0e0e56b873c9030db09424af6369f5145faaa2549084b983d8
HEAD_REF master
)
@ -22,6 +22,6 @@ vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/cppgraphqlgen)
vcpkg_copy_pdbs()
file(INSTALL ${SOURCE_PATH}/LICENSE
DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}
RENAME copyright)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)