Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[protobuf-c] Update to 1.4.0 #21418

Merged
merged 7 commits into from
Nov 17, 2021
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 0 additions & 62 deletions ports/protobuf-c/fix-features.patch

This file was deleted.

36 changes: 0 additions & 36 deletions ports/protobuf-c/fix-usage-issue.patch

This file was deleted.

38 changes: 23 additions & 15 deletions ports/protobuf-c/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,32 +1,40 @@
vcpkg_fail_port_install(MESSAGE "${PORT} currently only supports Linux platform" ON_TARGET "Windows")

vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO protobuf-c/protobuf-c
REF 1390409f4ee4e26d0635310995b516eb702c3f9e #1.3.2
SHA512 5c60883c4ef064c641875bfe7f89bf255a29dd20b5e0be5878cbaec03f2efd1f926c3e40dc0090cb172b8eef227fddafe86051f08edb3e1c26d0bd6aca673e41
REF v1.4.0
SHA512 cba4c6116c0f2ebb034236e8455d493bfaa2517733befcd87b6f8d6d3df0c0149b17fcbf59cd1763fa2318119c664d0dae3d2d3a46ebfe2a0fec3ef4719b033b
HEAD_REF master
PATCHES
fix-features.patch
fix-usage-issue.patch
)

vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
tools WITH_TOOLS
test WITH_TEST
FEATURES
tools BUILD_PROTOC
test BUILD_TESTS
)

vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}/build-cmake
PREFER_NINJA
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}/build-cmake"
DISABLE_PARALLEL_CONFIGURE
OPTIONS ${FEATURE_OPTIONS}
)

vcpkg_install_cmake()
vcpkg_cmake_install(ADD_BIN_TO_PATH)
vcpkg_fixup_pkgconfig()
vcpkg_copy_pdbs()

if("tools" IN_LIST FEATURES)
vcpkg_copy_tools(
TOOL_NAMES protoc-gen-c
AUTO_CLEAN
)
endif()

# Include files should not be duplicated into the /debug/include directory.
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")

# Remove duplicate PDB files (vcpkg_copy_pdbs already copied them to "bin")
file(REMOVE "${CURRENT_PACKAGES_DIR}/lib/protobuf-c.pdb")
file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/lib/protobuf-c.pdb")

# Handle copyright
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)
13 changes: 8 additions & 5 deletions ports/protobuf-c/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
{
"name": "protobuf-c",
"version-string": "1.3.2",
"port-version": 3,
"version-semver": "1.4.0",
NancyLi1013 marked this conversation as resolved.
Show resolved Hide resolved
"description": "This is protobuf-c, a C implementation of the Google Protocol Buffers data serialization format.",
"homepage": "https://github.com/protobuf-c/protobuf-c",
"dependencies": [
"protobuf"
"protobuf",
{
"name": "vcpkg-cmake",
"host": true
}
],
"features": {
"test": {
"description": "build test project.",
"description": "Build test project.",
"dependencies": [
{
"name": "protobuf-c",
Expand All @@ -20,7 +23,7 @@
]
},
"tools": {
"description": "build tools."
"description": "Build tools (protoc-gen-c)."
}
}
}
7 changes: 0 additions & 7 deletions scripts/ci.baseline.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1193,13 +1193,6 @@ poppler:arm64-windows=fail
portable-snippets:arm-uwp=fail
pqp:arm-uwp=fail
pqp:x64-uwp=fail
protobuf-c:x86-windows=fail
protobuf-c:x64-windows=fail
protobuf-c:x64-windows-static=fail
protobuf-c:x64-windows-static-md=fail
protobuf-c:x64-uwp=fail
protobuf-c:arm64-windows=fail
protobuf-c:arm-uwp=fail
python2:arm64-windows=fail
python2:arm-uwp=fail
python2:x64-uwp=fail
Expand Down
4 changes: 2 additions & 2 deletions versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -5377,8 +5377,8 @@
"port-version": 0
},
"protobuf-c": {
"baseline": "1.3.2",
"port-version": 3
"baseline": "1.4.0",
"port-version": 0
},
"protopuf": {
"baseline": "2.1.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/p-/protobuf-c.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "7694ae901baa567336d843221749212ff0c76f80",
"version-semver": "1.4.0",
"port-version": 0
},
{
"git-tree": "7786538f69991494262bd14f710e2dd8c6062bea",
"version-string": "1.3.2",
Expand Down