Remove copying of libmongoc version file

Author: alcaeus

.evergreen/compile-unix.sh

@@ -72,11 +72,6 @@ if [ -n "$LIBMONGOC_VERSION" ]; then
    echo "Finding Python3 binary... done."
 
    php scripts/update-submodule-sources.php
-
-   # We invoke python manually as it may not be in the path
-   pushd src/libmongoc/
-   $PYTHON build/calc_release_version.py > ../LIBMONGOC_VERSION_CURRENT
-   popd
 fi
 
 phpize

.evergreen/config/functions.yml

@@ -140,7 +140,6 @@ functions:
              echo "Checking out libmongoc version: ${LIBMONGOC_VERSION}"
              git fetch
              git checkout ${LIBMONGOC_VERSION}
-             # Note: compile-unix.sh will run `make libmongoc-version-current`
           fi
     - command: subprocess.exec
       type: test

CONTRIBUTING.md

@@ -203,7 +203,7 @@ always refer to libmongoc.
 ```shell
 cd src/libmongoc
 git fetch
-git checkout 1.20.0
+git checkout 2.1.0
 ```
 
 During development, it may be necessary to temporarily point the submodule to a
@@ -218,24 +218,16 @@ git submodules set-url src/libmongoc https://github.com/<owner>/<repo>.git
 git submodules set-branch -b <branch> src/libmongoc
 ```
 
-#### Ensure version information is correct
+#### Ensure version information is correct (libmongocrypt only)
 
-Various build processes and tools rely on the version files to infer version
-information. This file can be regenerated using Makefile targets:
+For libmongocrypt, version information needs to be updated after updating to
+a newer submodule version. This can be done by running the corresponding make
+target:
 
 ```shell
-make libmongoc-version-current
+make libmongocrypt-version-current
 ```
 
-Alternatively, the `build/calc_release_version.py` script in the submodule can
-be executed directly.
-
-Note: If the submodule points to a non-release, non-master branch, the script
-may fail to correctly detect the version. This issue is being tracked in
-[CDRIVER-3315](https://jira.mongodb.org/browse/CDRIVER-3315) and can be safely ignored since this should only happen
-during development (any PHP driver release should point to a tagged submodule
-version).
-
 #### Update sources in build configurations
 
 The Autotools and Windows build configurations (`config.m4` and `config.w32`,
@@ -261,11 +253,11 @@ libmongoc and libbson.
 For example, the following lines might be updated for libmongoc:
 
 ```
-if $PKG_CONFIG libmongoc-1.0 --atleast-version 1.20.0; then
+if $PKG_CONFIG mongoc2 --atleast-version 2.1.0; then
 
 ...
 
-AC_MSG_ERROR(system libmongoc must be upgraded to version >= 1.20.0)
+AC_MSG_ERROR(system libmongoc must be upgraded to version >= 2.1.0)
 ```
 
 #### Update tested versions in Evergreen configuration (libmongoc only)
@@ -277,7 +269,7 @@ information about the build tasks and where they are used. In general, we test
 against two additional versions of libmongoc:
 
 - The upcoming patch release of the current libmongoc minor version (e.g. the
-  `r1.x` branch)
+  `r2.x` branch)
 - The upcoming minor release of libmongoc (e.g. the `master` branch)
 
 #### Update sources in PECL package generation script
@@ -307,5 +299,6 @@ test suite passes. Once done, commit the changes to all of the above
 files/paths. For example:
 
 ```shell
-git commit -m "Bump libmongoc to 1.20.0" config.m4 config.w32 src/libmongoc src/LIBMONGOC_VERSION_CURRENT sbom.json
+git commit -m "Bump libmongoc to 2.1.0" config.m4 config.w32 src/libmongoc sbom.
+json
 ```

Makefile.frag

@@ -1,4 +1,4 @@
-.PHONY: mv-coverage lcov-coveralls lcov-local coverage coveralls format format-changed format-check test-clean package package.xml libmongoc-version-current libmongocrypt-version-current generate-function-map
+.PHONY: mv-coverage lcov-coveralls lcov-local coverage coveralls format format-changed format-check test-clean package package.xml libmongocrypt-version-current generate-function-map
 
 ifneq (,$(realpath $(EXTENSION_DIR)/json.so))
 PHP_TEST_SHARED_EXTENSIONS := "-d" "extension=$(EXTENSION_DIR)/json.so" $(PHP_TEST_SHARED_EXTENSIONS)
@@ -63,9 +63,6 @@ package:
 package.xml:
 	php bin/prep-release.php $(MONGODB_VERSION) $(MONGODB_STABILITY) $(RELEASE_NOTES_FILE)
 
-libmongoc-version-current:
-	cp src/libmongoc/VERSION_CURRENT src/LIBMONGOC_VERSION_CURRENT
-
 libmongocrypt-version-current:
 	cd src/libmongocrypt/ && python etc/calc_release_version.py > ../LIBMONGOCRYPT_VERSION_CURRENT
 

bin/prep-release.php

@@ -39,7 +39,6 @@ function get_files() {
         "scripts/autotools/*/*.{m4}",
 
         "src/*.{c,h}",
-        "src/LIBMONGOC_VERSION_CURRENT",
         "src/LIBMONGOCRYPT_VERSION_CURRENT",
 
         "src/MongoDB/*.{c,h}",

config.w32

@@ -25,7 +25,7 @@ function mongodb_generate_header(inpath, outpath, replacements)
 
 function mongodb_parse_libmongoc_version_file(prefix)
 {
-  var infile = FSO.OpenTextFile(configure_module_dirname + "/src/LIBMONGOC_VERSION_CURRENT", 1);
+  var infile = FSO.OpenTextFile(configure_module_dirname + "/src/libmongoc/VERSION_CURRENT", 1);
   var version = infile.ReadLine();
   infile.Close();
 

scripts/autotools/libbson/Versions.m4

@@ -1,4 +1,4 @@
-BSON_CURRENT_FILE=[]PHP_EXT_SRCDIR(mongodb)[/src/LIBMONGOC_VERSION_CURRENT]
+BSON_CURRENT_FILE=[]PHP_EXT_SRCDIR(mongodb)[/src/libmongoc/VERSION_CURRENT]
 libbson_VERSION_FULL=$(cat $BSON_CURRENT_FILE)
 
 dnl Ensure newline for "cut" implementations that need it, e.g. HP-UX.

scripts/autotools/libmongoc/Versions.m4

@@ -1,4 +1,4 @@
-MONGOC_CURRENT_FILE=[]PHP_EXT_SRCDIR(mongodb)[/src/LIBMONGOC_VERSION_CURRENT]
+MONGOC_CURRENT_FILE=[]PHP_EXT_SRCDIR(mongodb)[/src/libmongoc/VERSION_CURRENT]
 libmongoc_VERSION_FULL=$(cat $MONGOC_CURRENT_FILE)
 
 dnl Ensure newline for "cut" implementations that need it, e.g. HP-UX.

scripts/update-sbom.sh

@@ -4,7 +4,7 @@ SCRIPT_DIR=$(dirname ${BASH_SOURCE[0]})
 ROOT_DIR=$(realpath "${SCRIPT_DIR}/../")
 PURLS_FILE="${ROOT_DIR}/purls.txt"
 
-LIBMONGOC_VERSION=$(cat ${ROOT_DIR}/src/LIBMONGOC_VERSION_CURRENT | tr -d '[:space:]')
+LIBMONGOC_VERSION=$(cat ${ROOT_DIR}/src/libmongoc/VERSION_CURRENT | tr -d '[:space:]')
 LIBMONGOCRYPT_VERSION=$(cat ${ROOT_DIR}/src/LIBMONGOCRYPT_VERSION_CURRENT | tr -d '[:space:]')
 
 # Generate purls file from stored versions