3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-02 22:35:31 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1462 from chwarr/bond-6.0.0

Browse Source 
Upgrade Bond to 6.0.0
This commit is contained in:
Robert Schumacher 2017-07-14 16:23:43 -07:00 committed by GitHub
commit 5a74d30aab
4 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ports/bond/0001_boost_static_libs.patch
View File

@ -1,17 +1,17 @@
diff --git a/cmake/Config.cmake b/cmake/Config.cmake diff --git a/cmake/Config.cmake b/cmake/Config.cmake
index c6e2b40d..d8b4d689 100644 index d5125c70..a2eb536c 100644
--- a/cmake/Config.cmake --- a/cmake/Config.cmake
+++ b/cmake/Config.cmake +++ b/cmake/Config.cmake
@@ -35,7 +35,7 @@ if (MSVC) @@ -46,7 +46,7 @@ if (MSVC)
# Bond with MSVC CRT-specific code too much. More details at add_compile_options (/permissive-)
# https://msdn.microsoft.com/en-us/library/ms175759.aspx endif()
add_definitions (-D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1 -D_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1)
- set (Boost_USE_STATIC_LIBS ON) - set (Boost_USE_STATIC_LIBS ON)
+ set (Boost_USE_STATIC_LIBS OFF) + set (Boost_USE_STATIC_LIBS OFF)
endif (MSVC) endif (MSVC)
if (WIN32) if (WIN32)
@@ -106,9 +106,6 @@ if (DEFINED ENV{APPVEYOR} AND ("$ENV{BOND_BUILD}" STREQUAL "C++")) @@ -131,9 +131,6 @@ if (DEFINED ENV{APPVEYOR} AND ("$ENV{BOND_BUILD}" STREQUAL "C++"))
endif() endif()
endif() endif()

4
ports/bond/0002_omit_rapidjson.patch
View File

@ -1,8 +1,8 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt
index 72d62c5e..d7eb5cd4 100644 index fe0f629e..54b6d8ec 100644
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -39,7 +39,6 @@ install (DIRECTORY @@ -49,7 +49,6 @@ install (DIRECTORY
cpp/inc/bond cpp/inc/bond
cpp/generated/bond cpp/generated/bond
python/inc/bond python/inc/bond

2
ports/bond/CONTROL
View File

@ -1,5 +1,5 @@
Source: bond Source: bond
Maintainer: bond@microsoft.com Maintainer: bond@microsoft.com
Version: 5.3.1 Version: 6.0.0
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. <https://github.com/Microsoft/bond> 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. <https://github.com/Microsoft/bond>
Build-Depends: boost, rapidjson Build-Depends: boost, rapidjson

18
ports/bond/portfile.cmake
View File

@ -4,24 +4,24 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
endif() endif()
include(vcpkg_common_functions) include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/bond-5.3.1) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/bond-6.0.0)
vcpkg_download_distfile(ARCHIVE vcpkg_download_distfile(ARCHIVE
URLS "https://github.com/Microsoft/bond/archive/5.3.1.zip" URLS "https://github.com/Microsoft/bond/archive/6.0.0.zip"
FILENAME "bond-5.3.1.zip" FILENAME "bond-6.0.0.zip"
SHA512 aa1b3b6cbbbfbdb450306b59d0216c4b63b25ce2f5852387b42cb5c098e8fb6f90d8d1f688344fa4375244510009767d7d46a6a0b5f49c725b22cf3e9d73d1e5 SHA512 d585debabb7b74c1e85313278456bd6b63a388dbf64515c550b1d9739114b0963ffb1982d145fa4d3717747e8eba82e79ed2744a6c9e3cb1615d9a78b75b42bb
) )
vcpkg_download_distfile(GBC_ARCHIVE vcpkg_download_distfile(GBC_ARCHIVE
URLS "https://github.com/Microsoft/bond/releases/download/5.3.1/gbc-5.3.1-amd64.exe.zip" URLS "https://github.com/Microsoft/bond/releases/download/6.0.0/gbc-6.0.0-amd64.exe.zip"
FILENAME "gbc-5.3.1-amd64.zip" FILENAME "gbc-6.0.0-amd64.zip"
SHA512 fb1eff0b7bd34cba26fa6a0ffeba7789cff55976e95a695aa2cf6ae60b5c4e8b0dd15f0d7968599bd5b17c9b8b325aa29e3e13aca4854ec38ed50253d67038e4 SHA512 2aa4b5add478b952cb7733dcbf5c35634cde66812f1f1920d5fb1e2a52681a101ac6157bdba535a59316c4590fa37c74889b734106ca3e202a7a5ec0bcb1847f
) )
vcpkg_extract_source_archive(${ARCHIVE}) vcpkg_extract_source_archive(${ARCHIVE})
# Extract the precompiled gbc # Extract the precompiled gbc
vcpkg_extract_source_archive(${GBC_ARCHIVE} ${CURRENT_BUILDTREES_DIR}/tools/) vcpkg_extract_source_archive(${GBC_ARCHIVE} ${CURRENT_BUILDTREES_DIR}/tools/)
set(FETCHED_GBC_PATH ${CURRENT_BUILDTREES_DIR}/tools/gbc-5.3.1-amd64.exe) set(FETCHED_GBC_PATH ${CURRENT_BUILDTREES_DIR}/tools/gbc-6.0.0-amd64.exe)
if (NOT EXISTS ${FETCHED_GBC_PATH}) if (NOT EXISTS ${FETCHED_GBC_PATH})
message(FATAL_ERROR "Fetching GBC failed. Expected '${FETCHED_GBC_PATH}' to exists, but it doesn't.") message(FATAL_ERROR "Fetching GBC failed. Expected '${FETCHED_GBC_PATH}' to exists, but it doesn't.")
@ -43,6 +43,8 @@ vcpkg_configure_cmake(
OPTIONS OPTIONS
-DBOND_LIBRARIES_ONLY=TRUE -DBOND_LIBRARIES_ONLY=TRUE
-DBOND_GBC_PATH=${FETCHED_GBC_PATH} -DBOND_GBC_PATH=${FETCHED_GBC_PATH}
-DBOND_ENABLE_COMM=FALSE
-DBOND_ENABLE_GRPC=FALSE
) )
vcpkg_install_cmake() vcpkg_install_cmake()