CXX-2517 Use C Driver scripts to install libmongoc and libmongocrypt #950
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kkloberdanz
approved these changes
Apr 5, 2023
kevinAlbs
approved these changes
Apr 5, 2023
.evergreen/install_c_driver.sh
Outdated
| -DENABLE_EXTRA_ALIGNMENT=${ENABLE_EXTRA_ALIGNMENT} -DCMAKE_MACOSX_RPATH=ON | ||
| -DCMAKE_INSTALL_PREFIX=$PREFIX -DCMAKE_PREFIX_PATH=$PREFIX" | ||
| : "${mongoc_idir:?}" | ||
| : "${mongoc_install_idir}" |
There was a problem hiding this comment.
Assuming the intent is to error if this is unset.
Suggested change
| : "${mongoc_install_idir}" | |
| : "${mongoc_install_idir:?}" |
.evergreen/install_c_driver.sh
Outdated
| : "${mongoc_install_idir}" | ||
|
|
||
| echo "libmongoc version: ${mongoc_version}" | ||
| echo "libmongocrypt version: ${mongocrypt_version}" |
There was a problem hiding this comment.
Suggested change
| echo "libmongocrypt version: ${mongocrypt_version}" |
mongocrypt_version is no longer expected.
rcsanchez97
approved these changes
Apr 6, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This PR unblocks CXX-2517 and other CXX Driver work that depend on libmongocrypt 1.7.0. Verified by this patch.
Minimum C Driver Version
The minimum C Driver version was bumped to the current latest commit (mongodb/mongo-c-driver@9ef1cc9) in anticipation of upcoming CXX-2517 work. The minimum C Driver version should eventually be updated to be 1.24.0 once it is released (documented as a TODO comment).
EVG Config
The
add_expansions_to_envparameter is used to simplify theinstall_c_driverEVG function by removing redundant (re)definitions of EVG expansions as environment variables. The EVG function can now invoke the script directly without additional setup required.Building libmongocrypt and libmongoc
The
install_c_driver.shscript was refactored to use the new C Driver compile-libmongocrypt.sh script (introduced in mongodb/mongo-c-driver@c7e43c1) to satisfy the libmongocrypt dependency. This allowed deferring the libbson and libmongocrypt compile-and-install routine tocompile-libmongocrypt.sh.This also allowed removal of specifying minimum libmongocrypt version in the CXX Driver. Instead, the CXX Driver now transitively depends on the C Driver's minimum libmongocrypt version as defined within
compile-libmongocrypt.sh. This required slightly modifying theinstall_c_driver.shscript to generate aVERSION_CURRENTfile that is required when building libbson via libmongocrypt to specify/determine theBUILD_VERSION.This refactor also uses the C Driver's
find-cmake-latest.shscript to obtain a newer CMake version to satisfy libmongocrypt's CMake 3.12 requirement. This also allows the CXX Driver to use newer versions of C++ and corresponding compilers (i.e. VS 2019 and newer).