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

[libbson mongo-c-driver mongo-cxx-driver] upgrades to new revision (#6862)

Browse Source 
* [libbson mongo-c-driver mongo-cxx-driver] upgrades to new revision

* [mongo-cxx-driver] Minimize patch

* [mongo-c-driver] Fix dependencies on openssl and zlib
This commit is contained in:
Phoebe 2019-06-13 14:08:09 +08:00 committed by Robert Schumacher
parent 58e0d4029e
commit 08cbf0b3cd
7 changed files with 35 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/libbson/CONTROL
View File

@ -1,3 +1,3 @@
Source: libbson
Version: 1.13.0
Version: 1.14.0
Description: libbson is a library providing useful routines related to building, parsing, and iterating BSON documents.

6
ports/libbson/portfile.cmake
View File

@ -1,10 +1,11 @@
include(vcpkg_common_functions)
set(BUILD_VERSION 1.14.0)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO mongodb/mongo-c-driver
REF 1.13.0
SHA512 d2f5b04b3d2dbdeba4547ec1fe8a0da7bad5214de92fff480ef0ff7d97ea45d5e6347c11c249867d4905b1dd81b76c7cfbb9094a58df586dae881955ee246907
REF ${BUILD_VERSION}
SHA512 bf2bb835543dd2a445aac6cafa7bbbf90921ec41014534779924a5eb7cbd9fd532acd8146ce81dfcf1bcac33a78d8fce22b962ed7f776449e4357eccab8d6110
HEAD_REF master
PATCHES fix-uwp.patch
)
@ -24,6 +25,7 @@ vcpkg_configure_cmake(
-DENABLE_TESTS=OFF
-DENABLE_EXAMPLES=OFF
-DENABLE_STATIC=${ENABLE_STATIC}
-DBUILD_VERSION=${BUILD_VERSION}
)
vcpkg_install_cmake()

4
ports/mongo-c-driver/CONTROL
View File

@ -1,4 +1,4 @@
Source: mongo-c-driver
Version: 1.13.0
Build-Depends: libbson, openssl (uwp)
Version: 1.14.0-1
Build-Depends: libbson, openssl (!windows), zlib
Description: Client library written in C for MongoDB.

8
ports/mongo-c-driver/portfile.cmake
View File

@ -1,9 +1,11 @@
include(vcpkg_common_functions)
set(BUILD_VERSION 1.14.0)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO mongodb/mongo-c-driver
REF 1.13.0
SHA512 d2f5b04b3d2dbdeba4547ec1fe8a0da7bad5214de92fff480ef0ff7d97ea45d5e6347c11c249867d4905b1dd81b76c7cfbb9094a58df586dae881955ee246907
REF ${BUILD_VERSION}
SHA512 bf2bb835543dd2a445aac6cafa7bbbf90921ec41014534779924a5eb7cbd9fd532acd8146ce81dfcf1bcac33a78d8fce22b962ed7f776449e4357eccab8d6110
HEAD_REF master
PATCHES fix-uwp.patch
)
@ -30,7 +32,9 @@ vcpkg_configure_cmake(
-DENABLE_TESTS=OFF
-DENABLE_EXAMPLES=OFF
-DENABLE_SSL=${ENABLE_SSL}
-DENABLE_ZLIB=SYSTEM
-DENABLE_STATIC=${ENABLE_STATIC}
-DBUILD_VERSION=${BUILD_VERSION}
)
vcpkg_install_cmake()

2
ports/mongo-cxx-driver/CONTROL
View File

@ -1,5 +1,5 @@
Source: mongo-cxx-driver
Version: 3.2.0-2
Version: 3.4.0-1
Build-Depends: libbson, mongo-c-driver, boost-smart-ptr, boost-optional, boost-utility
Description: MongoDB C++ Driver.

145
ports/mongo-cxx-driver/disable_test_and_example.patch
View File

@ -1,151 +1,42 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 27cf3b6b8..896eee19a 100644
index c6f56e4..5601f90 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -87,68 +87,68 @@ endif()
@@ -89,6 +89,8 @@ endif()
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
-add_custom_target(hugo_dir
- COMMAND ${CMAKE_COMMAND} -E make_directory hugo
-)
-
-add_custom_target(hugo
- DEPENDS hugo_dir
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/docs
- COMMAND hugo
- VERBATIM
-)
-
-add_custom_target(hugo-deploy
- DEPENDS hugo
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- COMMAND etc/deploy-to-ghpages.pl --hugo git@github.com:mongodb/mongo-cxx-driver
- VERBATIM
-)
-
-add_custom_target(docs_dir_current
- COMMAND ${CMAKE_COMMAND} -E make_directory docs/api/current
-)
-
-add_custom_target(doxygen-current
- DEPENDS docs_dir_current
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- COMMAND doxygen ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile
- VERBATIM
-)
-
-add_custom_target(doxygen-all
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- COMMAND etc/generate-all-apidocs.pl
- VERBATIM
-)
-
-add_custom_target(doxygen-deploy
- DEPENDS doxygen-all
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
- COMMAND etc/deploy-to-ghpages.pl --doxygen git@github.com:mongodb/mongo-cxx-driver
- VERBATIM
-)
-
-add_custom_target(format
- python ${CMAKE_SOURCE_DIR}/etc/clang_format.py format
- VERBATIM
-)
-
-add_custom_target(format-lint
- python ${CMAKE_SOURCE_DIR}/etc/clang_format.py lint
- VERBATIM
-)
-
-add_custom_target(docs
- DEPENDS hugo doxygen-current
-)
-
-set(THIRD_PARTY_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/third_party)
+# add_custom_target(hugo_dir
+# COMMAND ${CMAKE_COMMAND} -E make_directory hugo
+# )
+if(0)
+
+# add_custom_target(hugo
+# DEPENDS hugo_dir
+# WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/docs
+# COMMAND hugo
+# VERBATIM
+# )
+
+# add_custom_target(hugo-deploy
+# DEPENDS hugo
+# WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+# COMMAND etc/deploy-to-ghpages.pl --hugo git@github.com:mongodb/mongo-cxx-driver
+# VERBATIM
+# )
+
+# add_custom_target(docs_dir_current
+# COMMAND ${CMAKE_COMMAND} -E make_directory docs/api/current
+# )
+
+# add_custom_target(doxygen-current
+# DEPENDS docs_dir_current
+# WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+# COMMAND doxygen ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile
+# VERBATIM
+# )
+
+# add_custom_target(doxygen-all
+# WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+# COMMAND etc/generate-all-apidocs.pl
+# VERBATIM
+# )
+
+# add_custom_target(doxygen-deploy
+# DEPENDS doxygen-all
+# WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+# COMMAND etc/deploy-to-ghpages.pl --doxygen git@github.com:mongodb/mongo-cxx-driver
+# VERBATIM
+# )
+
+# add_custom_target(format
+# python ${CMAKE_SOURCE_DIR}/etc/clang_format.py format
+# VERBATIM
+# )
+
+# add_custom_target(format-lint
+# python ${CMAKE_SOURCE_DIR}/etc/clang_format.py lint
+# VERBATIM
+# )
+
+# add_custom_target(docs
+# DEPENDS hugo doxygen-current
+# )
+
+# set(THIRD_PARTY_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/third_party)
add_custom_target(hugo_dir
COMMAND ${CMAKE_COMMAND} -E make_directory hugo
)
@@ -147,6 +149,8 @@ add_custom_target(docs
set(THIRD_PARTY_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/third_party)
+endif()
+
enable_testing()
add_subdirectory(src)
-add_subdirectory(examples EXCLUDE_FROM_ALL)
+#add_subdirectory(examples EXCLUDE_FROM_ALL)
add_subdirectory(benchmark EXCLUDE_FROM_ALL)
diff --git a/src/bsoncxx/CMakeLists.txt b/src/bsoncxx/CMakeLists.txt
index bd6e40662..d6054b022 100644
index 50085d0..5966d21 100644
--- a/src/bsoncxx/CMakeLists.txt
+++ b/src/bsoncxx/CMakeLists.txt
@@ -249,4 +249,4 @@ install(
DESTINATION lib/cmake/${PKG}-${BSONCXX_VERSION}
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PKG}-${BSONCXX_VERSION}
)
-add_subdirectory(test)
+#add_subdirectory(test)
+# add_subdirectory(test)
diff --git a/src/mongocxx/CMakeLists.txt b/src/mongocxx/CMakeLists.txt
index a05021228..3dd7c1224 100644
index 3cba62d..64ff936 100644
--- a/src/mongocxx/CMakeLists.txt
+++ b/src/mongocxx/CMakeLists.txt
@@ -238,4 +238,4 @@ install(
DESTINATION lib/cmake/${PKG}-${MONGOCXX_VERSION}
@@ -259,4 +259,4 @@ install(
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PKG}-${MONGOCXX_VERSION}
)
-add_subdirectory(test)
+#add_subdirectory(test)
+# add_subdirectory(test)

6
ports/mongo-cxx-driver/portfile.cmake
View File

@ -1,7 +1,7 @@
include(vcpkg_common_functions)
set(VERSION_MAJOR 3)
set(VERSION_MINOR 2)
set(VERSION_MINOR 4)
set(VERSION_PATCH 0)
set(VERSION_FULL ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
@ -9,12 +9,12 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO mongodb/mongo-cxx-driver
REF r${VERSION_FULL}
SHA512 cad8dd6e9fd75aa3aee15321c9b3df21d43c346f5b0b3dd75c86f9117d3376ad83fcda0c4a333c0a23d555e76d79432016623dd5f860ffef9964a6e8046e84b5
SHA512 28c052904f1b456b92482097166238eae1ad50c3ed207496f09366b46f2c9465c7e98c7219f4f10314e4d8fdd01c36b70a2221891bb75231adcc1edf013d43ce
HEAD_REF master
PATCHES
disable_test_and_example.patch
fix-uwp.patch
disable-c2338-mongo-cxx-driver.patch
disable_test_and_example.patch
)
if ("mnmlstc" IN_LIST FEATURES)