mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-28 00:49:01 +08:00
[bond] Update Bond port to v. 11.0.1 (#39559)
This commit is contained in:
parent
c247b81088
commit
8494f45567
@ -1,17 +1,17 @@
|
|||||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||||
index f2f8eaa..1b0c01c 100644
|
index 7b22038a..400421c7 100644
|
||||||
--- a/CMakeLists.txt
|
--- a/CMakeLists.txt
|
||||||
+++ b/CMakeLists.txt
|
+++ b/CMakeLists.txt
|
||||||
@@ -23,7 +23,7 @@ set (BOND_FIND_RAPIDJSON
|
@@ -16,7 +16,7 @@ set (BOND_FIND_RAPIDJSON
|
||||||
# settings so that we don't apply our settings to third-party code.
|
"FALSE"
|
||||||
add_subdirectory (thirdparty)
|
CACHE BOOL "If FALSE, then use and install rapidjson from the /thirdparty subdirectory")
|
||||||
|
|
||||||
-enable_testing()
|
-enable_testing()
|
||||||
+#enable_testing()
|
+#enable_testing()
|
||||||
|
|
||||||
set (BOND_IDL ${CMAKE_CURRENT_SOURCE_DIR}/idl)
|
set (BOND_IDL ${CMAKE_CURRENT_SOURCE_DIR}/idl)
|
||||||
set (BOND_INCLUDE ${CMAKE_CURRENT_SOURCE_DIR}/cpp/inc)
|
set (BOND_INCLUDE ${CMAKE_CURRENT_SOURCE_DIR}/cpp/inc)
|
||||||
@@ -85,6 +85,6 @@ if (BOND_GBC_PATH)
|
@@ -78,6 +78,6 @@ if (BOND_GBC_PATH)
|
||||||
|
|
||||||
install (
|
install (
|
||||||
FILES ${BOND_GBC_PATH}
|
FILES ${BOND_GBC_PATH}
|
||||||
@ -20,10 +20,10 @@ index f2f8eaa..1b0c01c 100644
|
|||||||
RENAME ${INSTALLED_GBC_NAME})
|
RENAME ${INSTALLED_GBC_NAME})
|
||||||
endif()
|
endif()
|
||||||
diff --git a/compiler/CMakeLists.txt b/compiler/CMakeLists.txt
|
diff --git a/compiler/CMakeLists.txt b/compiler/CMakeLists.txt
|
||||||
index 1dff9d0..9a11575 100644
|
index c8d06afd..6440e9fd 100644
|
||||||
--- a/compiler/CMakeLists.txt
|
--- a/compiler/CMakeLists.txt
|
||||||
+++ b/compiler/CMakeLists.txt
|
+++ b/compiler/CMakeLists.txt
|
||||||
@@ -108,7 +108,7 @@ set (test_sources
|
@@ -107,7 +107,7 @@ set (test_sources
|
||||||
tests/TestMain.hs
|
tests/TestMain.hs
|
||||||
${tests})
|
${tests})
|
||||||
|
|
||||||
@ -32,7 +32,7 @@ index 1dff9d0..9a11575 100644
|
|||||||
set (completion ${CMAKE_CURRENT_BINARY_DIR}/gbc.comp)
|
set (completion ${CMAKE_CURRENT_BINARY_DIR}/gbc.comp)
|
||||||
set (output ${CMAKE_CURRENT_BINARY_DIR}/build/gbc/gbc${CMAKE_EXECUTABLE_SUFFIX})
|
set (output ${CMAKE_CURRENT_BINARY_DIR}/build/gbc/gbc${CMAKE_EXECUTABLE_SUFFIX})
|
||||||
set (GBC_EXECUTABLE ${output} PARENT_SCOPE)
|
set (GBC_EXECUTABLE ${output} PARENT_SCOPE)
|
||||||
@@ -130,7 +130,7 @@ endif()
|
@@ -129,7 +129,7 @@ endif()
|
||||||
|
|
||||||
install (FILES ${output}
|
install (FILES ${output}
|
||||||
PERMISSIONS OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
|
PERMISSIONS OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
|
||||||
@ -42,10 +42,10 @@ index 1dff9d0..9a11575 100644
|
|||||||
install (FILES ${completion}
|
install (FILES ${completion}
|
||||||
RENAME gbc
|
RENAME gbc
|
||||||
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
|
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
|
||||||
index b45078e..1eebe9c 100644
|
index 15203f66..c15becd5 100644
|
||||||
--- a/cpp/CMakeLists.txt
|
--- a/cpp/CMakeLists.txt
|
||||||
+++ b/cpp/CMakeLists.txt
|
+++ b/cpp/CMakeLists.txt
|
||||||
@@ -110,7 +110,7 @@ target_include_directories (bond_apply BEFORE PRIVATE
|
@@ -91,7 +91,7 @@ target_include_directories (bond_apply BEFORE PRIVATE
|
||||||
|
|
||||||
install (TARGETS bond bond_apply
|
install (TARGETS bond bond_apply
|
||||||
EXPORT bond
|
EXPORT bond
|
||||||
|
@ -4,11 +4,10 @@ vcpkg_from_github(
|
|||||||
OUT_SOURCE_PATH SOURCE_PATH
|
OUT_SOURCE_PATH SOURCE_PATH
|
||||||
REPO microsoft/bond
|
REPO microsoft/bond
|
||||||
REF "${VERSION}"
|
REF "${VERSION}"
|
||||||
SHA512 a5475d3f988928fc3d03b69fc34b33ada35bd790138a0f4a733642558c72945e79c5dcde88b656cbc1cafbc3cb2dd4ba28031e09e507d730056876148ef65014
|
SHA512 54316e955ce130ec8bb3795b45222fe38c6079cb29e4b5612a97bed8dd9876d378009af3ab0c554c0ded49ca5fde4544e87e3dc8a8c5f176947d439d73c662ee
|
||||||
HEAD_REF master
|
HEAD_REF master
|
||||||
PATCHES
|
PATCHES
|
||||||
fix-install-path.patch
|
fix-install-path.patch
|
||||||
skip-grpc-compilation.patch
|
|
||||||
fix-msc-ver.patch
|
fix-msc-ver.patch
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -16,7 +15,7 @@ if (VCPKG_TARGET_IS_WINDOWS)
|
|||||||
vcpkg_download_distfile(GBC_ARCHIVE
|
vcpkg_download_distfile(GBC_ARCHIVE
|
||||||
URLS "https://github.com/microsoft/bond/releases/download/${VERSION}/gbc-${VERSION}-amd64.zip"
|
URLS "https://github.com/microsoft/bond/releases/download/${VERSION}/gbc-${VERSION}-amd64.zip"
|
||||||
FILENAME "gbc-${VERSION}-amd64.zip"
|
FILENAME "gbc-${VERSION}-amd64.zip"
|
||||||
SHA512 590b051aa47ad161f8a8a5f782e22d2201ad536e0772c9e528f98df1d1fd2b154723d21587d35c8b948805ab229dfb3b515273ae37d05028554fd49b39dc5418
|
SHA512 fde9dc862b71c843278dcbb90137b86e23869d79036367008f01165f22b11b067bd78d21eff8385ab0e96d80fa3194380bdd661199c44a8552252bcc4c9e18c0
|
||||||
)
|
)
|
||||||
|
|
||||||
# Clear the generator to prevent it from updating
|
# Clear the generator to prevent it from updating
|
||||||
@ -36,11 +35,6 @@ else()
|
|||||||
message("\nA recent version of Haskell Tool Stack is required to build.\n For information on how to install see https://docs.haskellstack.org/en/stable/README/\n")
|
message("\nA recent version of Haskell Tool Stack is required to build.\n For information on how to install see https://docs.haskellstack.org/en/stable/README/\n")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
|
||||||
FEATURES
|
|
||||||
bond-over-grpc BOND_ENABLE_GRPC
|
|
||||||
)
|
|
||||||
|
|
||||||
set(ENV{STACK_ROOT} "${CURRENT_BUILDTREES_DIR}/stack")
|
set(ENV{STACK_ROOT} "${CURRENT_BUILDTREES_DIR}/stack")
|
||||||
|
|
||||||
vcpkg_cmake_configure(
|
vcpkg_cmake_configure(
|
||||||
|
@ -1,15 +0,0 @@
|
|||||||
diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt
|
|
||||||
index 8c1f368..8b13789 100644
|
|
||||||
--- a/thirdparty/CMakeLists.txt
|
|
||||||
+++ b/thirdparty/CMakeLists.txt
|
|
||||||
@@ -1,10 +1 @@
|
|
||||||
-include (Compiler)
|
|
||||||
|
|
||||||
-if (BOND_ENABLE_GRPC)
|
|
||||||
- if (BOND_FIND_GRPC)
|
|
||||||
- find_package(grpc CONFIG REQUIRED)
|
|
||||||
- else ()
|
|
||||||
- cxx_add_compile_options(Clang -Wno-unused-value)
|
|
||||||
- add_subdirectory(grpc)
|
|
||||||
- endif ()
|
|
||||||
-endif ()
|
|
@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "bond",
|
"name": "bond",
|
||||||
"version": "10.0.0",
|
"version": "11.0.1",
|
||||||
"port-version": 3,
|
"port-version": 4,
|
||||||
"description": "Bond is a cross-platform framework for working with schematized data. It supports cross-language de/serialization and powerful generic mechanisms for efficiently manipulating data. Bond is broadly used at Microsoft in high scale services.",
|
"description": "Bond is a cross-platform framework for working with schematized data. It supports cross-language de/serialization and powerful generic mechanisms for efficiently manipulating data. Bond is broadly used at Microsoft in high scale services.",
|
||||||
"homepage": "https://github.com/Microsoft/bond",
|
"homepage": "https://github.com/Microsoft/bond",
|
||||||
"dependencies": [
|
"dependencies": [
|
||||||
@ -18,13 +18,5 @@
|
|||||||
"name": "vcpkg-cmake-config",
|
"name": "vcpkg-cmake-config",
|
||||||
"host": true
|
"host": true
|
||||||
}
|
}
|
||||||
],
|
|
||||||
"features": {
|
|
||||||
"bond-over-grpc": {
|
|
||||||
"description": "Bond-over-gRPC provides code generation from Bond IDL service definitions to send Bond objects via gRPC.",
|
|
||||||
"dependencies": [
|
|
||||||
"grpc"
|
|
||||||
]
|
]
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,10 @@
|
|||||||
{
|
{
|
||||||
"versions": [
|
"versions": [
|
||||||
|
{
|
||||||
|
"git-tree": "509a47415e454dad381998007ac964af4a288bb1",
|
||||||
|
"version": "11.0.1",
|
||||||
|
"port-version": 4
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"git-tree": "529159c6aff85949b583f7f2a577f7a1447ed38c",
|
"git-tree": "529159c6aff85949b583f7f2a577f7a1447ed38c",
|
||||||
"version": "10.0.0",
|
"version": "10.0.0",
|
||||||
|
@ -705,8 +705,8 @@
|
|||||||
"port-version": 0
|
"port-version": 0
|
||||||
},
|
},
|
||||||
"bond": {
|
"bond": {
|
||||||
"baseline": "10.0.0",
|
"baseline": "11.0.1",
|
||||||
"port-version": 3
|
"port-version": 4
|
||||||
},
|
},
|
||||||
"boolinq": {
|
"boolinq": {
|
||||||
"baseline": "3.0.4",
|
"baseline": "3.0.4",
|
||||||
|
Loading…
Reference in New Issue
Block a user