From ea3113a4f520f7cb6383df1c261138cc21abceb6 Mon Sep 17 00:00:00 2001 From: sdcb Date: Sun, 18 Dec 2016 16:26:12 +0800 Subject: [PATCH] [mongo-x-driver] upgrade to 1.51/3.10 --- ports/libbson/portfile.cmake | 102 +++++++-------- ports/mongo-c-driver/portfile.cmake | 92 +++++++------- ports/mongo-cxx-driver/portfile.cmake | 175 +++++++++++++------------- 3 files changed, 185 insertions(+), 184 deletions(-) diff --git a/ports/libbson/portfile.cmake b/ports/libbson/portfile.cmake index 7642c3437e..e6e5ff3529 100644 --- a/ports/libbson/portfile.cmake +++ b/ports/libbson/portfile.cmake @@ -1,52 +1,52 @@ -include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libbson-1.5.0-rc6) - -vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/mongodb/libbson/archive/1.5.0-rc6.tar.gz" - FILENAME "libbson-1.5.0-rc6.tar.gz" - SHA512 15cf590b488f7de8d614ddcc2c1536b05b607311f3cd3353418469c7a62177124fb4fb1c53f51b0de4c7491b21051c1ec47fbc12856cc69e37baebb3d65897c5 -) -vcpkg_extract_source_archive(${ARCHIVE}) - -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - OPTIONS - -DENABLE_TESTS=OFF - -DCMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP=ON -) - -vcpkg_install_cmake() - -file(RENAME - ${CURRENT_PACKAGES_DIR}/include/libbson-1.0 - ${CURRENT_PACKAGES_DIR}/temp) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include) -file(RENAME ${CURRENT_PACKAGES_DIR}/temp ${CURRENT_PACKAGES_DIR}/include) - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) - -if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin) - file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/bson-1.0.lib) - file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/bson-1.0.lib) - - file(RENAME - ${CURRENT_PACKAGES_DIR}/lib/bson-static-1.0.lib - ${CURRENT_PACKAGES_DIR}/lib/bson-1.0.lib) - file(RENAME - ${CURRENT_PACKAGES_DIR}/debug/lib/bson-static-1.0.lib - ${CURRENT_PACKAGES_DIR}/debug/lib/bson-1.0.lib) - - # drop the __declspec(dllimport) when building static - vcpkg_apply_patches( - SOURCE_PATH ${CURRENT_PACKAGES_DIR}/include - PATCHES - ${CMAKE_CURRENT_LIST_DIR}/static.patch - ) -else() - file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/bson-static-1.0.lib) - file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/bson-static-1.0.lib) -endif() - +include(vcpkg_common_functions) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/libbson-1.5.1) + +vcpkg_download_distfile(ARCHIVE + URLS "https://github.com/mongodb/libbson/archive/1.5.1.tar.gz" + FILENAME "libbson-1.5.1.tar.gz" + SHA512 b641e23ca041e532fe566167ad0292d12934e0fae2c110f81bf6ca3b71b5d01b651a604a7ce6da0d1b54b98cd95674ef331ef4e23c2dedfc706f371eac4efaec +) +vcpkg_extract_source_archive(${ARCHIVE}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DENABLE_TESTS=OFF + -DCMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP=ON +) + +vcpkg_install_cmake() + +file(RENAME + ${CURRENT_PACKAGES_DIR}/include/libbson-1.0 + ${CURRENT_PACKAGES_DIR}/temp) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include) +file(RENAME ${CURRENT_PACKAGES_DIR}/temp ${CURRENT_PACKAGES_DIR}/include) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +if (VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin) + file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/bson-1.0.lib) + file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/bson-1.0.lib) + + file(RENAME + ${CURRENT_PACKAGES_DIR}/lib/bson-static-1.0.lib + ${CURRENT_PACKAGES_DIR}/lib/bson-1.0.lib) + file(RENAME + ${CURRENT_PACKAGES_DIR}/debug/lib/bson-static-1.0.lib + ${CURRENT_PACKAGES_DIR}/debug/lib/bson-1.0.lib) + + # drop the __declspec(dllimport) when building static + vcpkg_apply_patches( + SOURCE_PATH ${CURRENT_PACKAGES_DIR}/include + PATCHES + ${CMAKE_CURRENT_LIST_DIR}/static.patch + ) +else() + file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/bson-static-1.0.lib) + file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/bson-static-1.0.lib) +endif() + file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libbson RENAME copyright) \ No newline at end of file diff --git a/ports/mongo-c-driver/portfile.cmake b/ports/mongo-c-driver/portfile.cmake index f9a247499a..c3b7a0817e 100644 --- a/ports/mongo-c-driver/portfile.cmake +++ b/ports/mongo-c-driver/portfile.cmake @@ -1,47 +1,47 @@ -include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/mongo-c-driver-1.5.0-rc6) - -vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/mongodb/mongo-c-driver/archive/1.5.0-rc6.tar.gz" - FILENAME "mongo-c-driver-1.5.0-rc6.tar.gz" - SHA512 708caf4e963bad97b4802456c6f5809a0ba8c24fe5faaf0e91aa889a0690df4324005f8d324b3bfc80ffc76f1594612a8d391d7421dd914c58369c24cf8cc965 -) -vcpkg_extract_source_archive(${ARCHIVE}) - -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - OPTIONS - -DBSON_ROOT_DIR=${CURRENT_INSTALLED_DIR} - -DENABLE_TESTS=OFF - -DENABLE_EXAMPLES=OFF - -DCMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP=ON -) - -vcpkg_install_cmake() - -file(RENAME - ${CURRENT_PACKAGES_DIR}/include/libmongoc-1.0 - ${CURRENT_PACKAGES_DIR}/temp) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include) -file(RENAME ${CURRENT_PACKAGES_DIR}/temp ${CURRENT_PACKAGES_DIR}/include) - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) - -if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin) - file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/mongoc-1.0.lib) - file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/mongoc-1.0.lib) - - file(RENAME - ${CURRENT_PACKAGES_DIR}/lib/mongoc-static-1.0.lib - ${CURRENT_PACKAGES_DIR}/lib/mongoc-1.0.lib) - file(RENAME - ${CURRENT_PACKAGES_DIR}/debug/lib/mongoc-static-1.0.lib - ${CURRENT_PACKAGES_DIR}/debug/lib/mongoc-1.0.lib) -else() - file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/mongoc-static-1.0.lib) - file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/mongoc-static-1.0.lib) -endif() - +include(vcpkg_common_functions) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/mongo-c-driver-1.5.1) + +vcpkg_download_distfile(ARCHIVE + URLS "https://github.com/mongodb/mongo-c-driver/archive/1.5.1.tar.gz" + FILENAME "mongo-c-driver-1.5.1.tar.gz" + SHA512 2977e6e1fb3c45256161d2c9bd711fea69b9f8c9ff15362fa636068e0a347c42e10d72fed5649504b552c8212f21cb1ae74d2dc8ca3d1388f49e63b2baf6e16d +) +vcpkg_extract_source_archive(${ARCHIVE}) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DBSON_ROOT_DIR=${CURRENT_INSTALLED_DIR} + -DENABLE_TESTS=OFF + -DENABLE_EXAMPLES=OFF + -DCMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP=ON +) + +vcpkg_install_cmake() + +file(RENAME + ${CURRENT_PACKAGES_DIR}/include/libmongoc-1.0 + ${CURRENT_PACKAGES_DIR}/temp) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include) +file(RENAME ${CURRENT_PACKAGES_DIR}/temp ${CURRENT_PACKAGES_DIR}/include) + +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) + +if (VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin) + file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/mongoc-1.0.lib) + file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/mongoc-1.0.lib) + + file(RENAME + ${CURRENT_PACKAGES_DIR}/lib/mongoc-static-1.0.lib + ${CURRENT_PACKAGES_DIR}/lib/mongoc-1.0.lib) + file(RENAME + ${CURRENT_PACKAGES_DIR}/debug/lib/mongoc-static-1.0.lib + ${CURRENT_PACKAGES_DIR}/debug/lib/mongoc-1.0.lib) +else() + file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/mongoc-static-1.0.lib) + file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/mongoc-static-1.0.lib) +endif() + file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/mongo-c-driver RENAME copyright) \ No newline at end of file diff --git a/ports/mongo-cxx-driver/portfile.cmake b/ports/mongo-cxx-driver/portfile.cmake index fa0549fd72..a6c97335c7 100644 --- a/ports/mongo-cxx-driver/portfile.cmake +++ b/ports/mongo-cxx-driver/portfile.cmake @@ -1,88 +1,89 @@ -include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/mongo-cxx-driver-r3.0.3) - -vcpkg_download_distfile(ARCHIVE - URLS "https://github.com/mongodb/mongo-cxx-driver/archive/r3.0.3.tar.gz" - FILENAME "mongo-cxx-driver-r3.0.3.tar.gz" - SHA512 29f7ae77dab160c4279eb2eba8e960b25afc7118bf82570d240f5c68e1e17b10dc99910c855888467c304d70399f2d02031463b0c168a95ad0b9323742ccfd35 -) -vcpkg_extract_source_archive(${ARCHIVE}) - -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES - ${CMAKE_CURRENT_LIST_DIR}/disable_test_and_example.patch - ${CMAKE_CURRENT_LIST_DIR}/disable_shared.patch -) - -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - OPTIONS - -DLIBBSON_DIR=${CURRENT_INSTALLED_DIR} - -DLIBMONGOC_DIR=${CURRENT_INSTALLED_DIR} - -DCMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP=ON -) - -vcpkg_install_cmake() - -file(RENAME - ${CURRENT_PACKAGES_DIR}/include/bsoncxx/v_noabi/bsoncxx - ${CURRENT_PACKAGES_DIR}/temp) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/bsoncxx) -file(RENAME ${CURRENT_PACKAGES_DIR}/temp ${CURRENT_PACKAGES_DIR}/include/bsoncxx) - -file(RENAME - ${CURRENT_PACKAGES_DIR}/include/mongocxx/v_noabi/mongocxx - ${CURRENT_PACKAGES_DIR}/temp) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/mongocxx) -file(RENAME ${CURRENT_PACKAGES_DIR}/temp ${CURRENT_PACKAGES_DIR}/include/mongocxx) - -file(REMOVE_RECURSE - ${CURRENT_PACKAGES_DIR}/lib/cmake - ${CURRENT_PACKAGES_DIR}/debug/lib/cmake - - ${CURRENT_PACKAGES_DIR}/include/bsoncxx/cmake - ${CURRENT_PACKAGES_DIR}/include/bsoncxx/config/private - ${CURRENT_PACKAGES_DIR}/include/bsoncxx/private - ${CURRENT_PACKAGES_DIR}/include/bsoncxx/test - ${CURRENT_PACKAGES_DIR}/include/bsoncxx/third_party - - ${CURRENT_PACKAGES_DIR}/include/mongocxx/cmake - ${CURRENT_PACKAGES_DIR}/include/mongocxx/config/private - ${CURRENT_PACKAGES_DIR}/include/mongocxx/test - ${CURRENT_PACKAGES_DIR}/include/mongocxx/test_util - ${CURRENT_PACKAGES_DIR}/include/mongocxx/private - ${CURRENT_PACKAGES_DIR}/include/mongocxx/exception/private - - ${CURRENT_PACKAGES_DIR}/debug/include) - - -if (VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin) - file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/bsoncxx.lib) - file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/bsoncxx.lib) - file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/mongocxx.lib) - file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/mongocxx.lib) - - file(RENAME - ${CURRENT_PACKAGES_DIR}/lib/libbsoncxx.lib - ${CURRENT_PACKAGES_DIR}/lib/bsoncxx.lib) - file(RENAME - ${CURRENT_PACKAGES_DIR}/debug/lib/libmongocxx.lib - ${CURRENT_PACKAGES_DIR}/debug/lib/mongocxx.lib) - - # define MONGOCXX_STATIC in config/export.hpp - vcpkg_apply_patches( - SOURCE_PATH ${CURRENT_PACKAGES_DIR}/include - PATCHES - ${CMAKE_CURRENT_LIST_DIR}/static.patch - ) -else() - file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/libbsoncxx.lib) - file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/libbsoncxx.lib) - file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/libmongocxx.lib) - file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/libmongocxx.lib) -endif() - +include(vcpkg_common_functions) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/mongo-cxx-driver-r3.1.0) + +vcpkg_download_distfile(ARCHIVE + URLS "https://github.com/mongodb/mongo-cxx-driver/archive/r3.1.0.tar.gz" + FILENAME "mongo-cxx-driver-r3.1.0.tar.gz" + SHA512 2c9323f5e28304057b6ed6fc8bf33aad14db1313e234eaa74a96fb4cf93e99d24fd8c7c3f20b4b29cda7b1fe5c58f08dcb5cddcffbf62259c08334312fda4fba +) +vcpkg_extract_source_archive(${ARCHIVE}) + +vcpkg_apply_patches( + SOURCE_PATH ${SOURCE_PATH} + PATCHES + ${CMAKE_CURRENT_LIST_DIR}/disable_test_and_example.patch + ${CMAKE_CURRENT_LIST_DIR}/disable_shared.patch +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DLIBBSON_DIR=${CURRENT_INSTALLED_DIR} + -DLIBMONGOC_DIR=${CURRENT_INSTALLED_DIR} + -DCMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP=ON +) + +vcpkg_install_cmake() + +file(RENAME + ${CURRENT_PACKAGES_DIR}/include/bsoncxx/v_noabi/bsoncxx + ${CURRENT_PACKAGES_DIR}/temp) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/bsoncxx) +file(RENAME ${CURRENT_PACKAGES_DIR}/temp ${CURRENT_PACKAGES_DIR}/include/bsoncxx) + +file(RENAME + ${CURRENT_PACKAGES_DIR}/include/mongocxx/v_noabi/mongocxx + ${CURRENT_PACKAGES_DIR}/temp) +file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/mongocxx) +file(RENAME ${CURRENT_PACKAGES_DIR}/temp ${CURRENT_PACKAGES_DIR}/include/mongocxx) + +file(REMOVE_RECURSE + ${CURRENT_PACKAGES_DIR}/lib/cmake + ${CURRENT_PACKAGES_DIR}/debug/lib/cmake + + ${CURRENT_PACKAGES_DIR}/include/bsoncxx/cmake + ${CURRENT_PACKAGES_DIR}/include/bsoncxx/config/private + ${CURRENT_PACKAGES_DIR}/include/bsoncxx/private + ${CURRENT_PACKAGES_DIR}/include/bsoncxx/test + ${CURRENT_PACKAGES_DIR}/include/bsoncxx/third_party + + ${CURRENT_PACKAGES_DIR}/include/mongocxx/cmake + ${CURRENT_PACKAGES_DIR}/include/mongocxx/config/private + ${CURRENT_PACKAGES_DIR}/include/mongocxx/test + ${CURRENT_PACKAGES_DIR}/include/mongocxx/test_util + ${CURRENT_PACKAGES_DIR}/include/mongocxx/private + ${CURRENT_PACKAGES_DIR}/include/mongocxx/exception/private + ${CURRENT_PACKAGES_DIR}/include/mongocxx/options + + ${CURRENT_PACKAGES_DIR}/debug/include) + + +if (VCPKG_LIBRARY_LINKAGE STREQUAL static) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin) + file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/bsoncxx.lib) + file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/bsoncxx.lib) + file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/mongocxx.lib) + file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/mongocxx.lib) + + file(RENAME + ${CURRENT_PACKAGES_DIR}/lib/libbsoncxx.lib + ${CURRENT_PACKAGES_DIR}/lib/bsoncxx.lib) + file(RENAME + ${CURRENT_PACKAGES_DIR}/debug/lib/libmongocxx.lib + ${CURRENT_PACKAGES_DIR}/debug/lib/mongocxx.lib) + + # define MONGOCXX_STATIC in config/export.hpp + vcpkg_apply_patches( + SOURCE_PATH ${CURRENT_PACKAGES_DIR}/include + PATCHES + ${CMAKE_CURRENT_LIST_DIR}/static.patch + ) +else() + file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/libbsoncxx.lib) + file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/libbsoncxx.lib) + file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/libmongocxx.lib) + file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/lib/libmongocxx.lib) +endif() + file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/mongo-cxx-driver RENAME copyright) \ No newline at end of file