CDRIVER-6064 Restore cmake_policy, fix uninstall checks, and use Ninja with mingw-w64 (#2070)

* Remove obsolete ENABLE_AUTOMATIC_INIT_AND_CLEANUP config variable
* Restore cmake_policy() in GenerateUninstaller.cmake
* Improve Batch script error-handling behavior
* Use Ninja generator for mingw-w64 compilation
* Fix simple HTTP server port number
* Move uninstall checks into std-matrix
* Avoid using ls --almost-all for MacOS compatibility
* Add NEWS entries

Author: eramongodb

.evergreen/config_generator/etc/distros.py

@@ -221,6 +221,12 @@ def compiler_to_vars(compiler):
                 'CMAKE_GENERATOR_PLATFORM': to_platform(vs),
             }
 
+        case _, ['mingw', *rest]:
+            return {
+                'CC': '-'.join(['gcc'] + rest),
+                'CXX': '-'.join(['g++'] + rest),
+            }
+
         case compiler, _:
             return {
                 'CC': compiler,

.evergreen/generated_configs/legacy-config.yml

@@ -797,57 +797,6 @@ tasks:
         sudo rm -rf ../build ../mock-result ../rpm.tar.gz
         export MOCK_TARGET_CONFIG=rocky+epel-8-aarch64
         .evergreen/scripts/build_snapshot_rpm.sh
-- name: install-uninstall-check-mingw
-  commands:
-  - func: find-cmake-latest
-  - command: shell.exec
-    type: test
-    params:
-      working_dir: mongoc
-      include_expansions_in_env:
-      - distro_id
-      shell: bash
-      script: |-
-        set -o errexit
-        . .evergreen/scripts/find-cmake-latest.sh
-        export CMAKE="$(find_cmake_latest)"
-        export CC="C:/mingw-w64/x86_64-4.9.1-posix-seh-rt_v3-rev1/mingw64/bin/gcc.exe"
-        BSON_ONLY=1 cmd.exe /c .\\.evergreen\\scripts\\install-uninstall-check-windows.cmd
-        cmd.exe /c .\\.evergreen\\scripts\\install-uninstall-check-windows.cmd
-- name: install-uninstall-check-msvc
-  commands:
-  - func: find-cmake-latest
-  - command: shell.exec
-    type: test
-    params:
-      working_dir: mongoc
-      include_expansions_in_env:
-      - distro_id
-      shell: bash
-      script: |-
-        set -o errexit
-        . .evergreen/scripts/find-cmake-latest.sh
-        export CMAKE="$(find_cmake_latest)"
-        export CC="Visual Studio 14 2015 Win64"
-        BSON_ONLY=1 cmd.exe /c .\\.evergreen\\scripts\\install-uninstall-check-windows.cmd
-        cmd.exe /c .\\.evergreen\\scripts\\install-uninstall-check-windows.cmd
-- name: install-uninstall-check
-  commands:
-  - func: find-cmake-latest
-  - command: shell.exec
-    type: test
-    params:
-      working_dir: mongoc
-      include_expansions_in_env:
-      - distro_id
-      shell: bash
-      script: |-
-        set -o errexit
-        . .evergreen/scripts/find-cmake-latest.sh
-        export CMAKE="$(find_cmake_latest)"
-        DESTDIR="$(pwd)/dest" .evergreen/scripts/install-uninstall-check.sh
-        BSON_ONLY=1 .evergreen/scripts/install-uninstall-check.sh
-        .evergreen/scripts/install-uninstall-check.sh
 - name: debug-compile-with-warnings
   commands:
   - func: find-cmake-latest
@@ -16284,13 +16233,6 @@ buildvariants:
     distros:
     - windows-vsCurrent-large
   - check-headers
-  - install-uninstall-check
-  - name: install-uninstall-check-mingw
-    distros:
-    - windows-vsCurrent-large
-  - name: install-uninstall-check-msvc
-    distros:
-    - windows-vsCurrent-large
   - debug-compile-with-warnings
   - name: build-and-test-with-toolchain
     distros:

.evergreen/generated_configs/tasks.yml

@@ -5181,8 +5181,8 @@ tasks:
       - func: find-cmake-latest
       - func: sasl-sspi-winssl-compile
         vars:
-          CC: mingw
-          CXX: mingw
+          CC: gcc
+          CXX: g++
       - func: upload-build
   - name: sasl-sspi-winssl-windows-2019-mingw-test-8.0-server-auth
     run_on: windows-vsCurrent-small
@@ -5195,8 +5195,8 @@ tasks:
       - command: expansions.update
         params:
           updates:
-            - { key: CC, value: mingw }
-            - { key: CXX, value: mingw }
+            - { key: CC, value: gcc }
+            - { key: CXX, value: g++ }
             - { key: AUTH, value: auth }
             - { key: MONGODB_VERSION, value: "8.0" }
             - { key: TOPOLOGY, value: server }
@@ -5216,8 +5216,8 @@ tasks:
       - command: expansions.update
         params:
           updates:
-            - { key: CC, value: mingw }
-            - { key: CXX, value: mingw }
+            - { key: CC, value: gcc }
+            - { key: CXX, value: g++ }
             - { key: AUTH, value: auth }
             - { key: MONGODB_VERSION, value: latest }
             - { key: TOPOLOGY, value: server }

.evergreen/legacy_config_generator/evergreen_config_lib/tasks.py

@@ -279,51 +279,6 @@ def __init__(
             shell_mongoc("sudo rm -rf ../build ../mock-result ../rpm.tar.gz\n" "export MOCK_TARGET_CONFIG=rocky+epel-8-aarch64\n" ".evergreen/scripts/build_snapshot_rpm.sh"),
         ],
     ),
-    NamedTask(
-        "install-uninstall-check-mingw",
-        commands=[
-            func("find-cmake-latest"),
-            shell_mongoc(
-                r"""
-                . .evergreen/scripts/find-cmake-latest.sh
-                export CMAKE="$(find_cmake_latest)"
-                export CC="C:/mingw-w64/x86_64-4.9.1-posix-seh-rt_v3-rev1/mingw64/bin/gcc.exe"
-                BSON_ONLY=1 cmd.exe /c .\\.evergreen\\scripts\\install-uninstall-check-windows.cmd
-                cmd.exe /c .\\.evergreen\\scripts\\install-uninstall-check-windows.cmd""",
-                include_expansions_in_env=["distro_id"],
-            )
-        ],
-    ),
-    NamedTask(
-        "install-uninstall-check-msvc",
-        commands=[
-            func("find-cmake-latest"),
-            shell_mongoc(
-                r"""
-                . .evergreen/scripts/find-cmake-latest.sh
-                export CMAKE="$(find_cmake_latest)"
-                export CC="Visual Studio 14 2015 Win64"
-                BSON_ONLY=1 cmd.exe /c .\\.evergreen\\scripts\\install-uninstall-check-windows.cmd
-                cmd.exe /c .\\.evergreen\\scripts\\install-uninstall-check-windows.cmd""",
-                include_expansions_in_env=["distro_id"],
-            )
-        ],
-    ),
-    NamedTask(
-        "install-uninstall-check",
-        commands=[
-            func("find-cmake-latest"),
-            shell_mongoc(
-                r"""
-                . .evergreen/scripts/find-cmake-latest.sh
-                export CMAKE="$(find_cmake_latest)"
-                DESTDIR="$(pwd)/dest" .evergreen/scripts/install-uninstall-check.sh
-                BSON_ONLY=1 .evergreen/scripts/install-uninstall-check.sh
-                .evergreen/scripts/install-uninstall-check.sh""",
-                include_expansions_in_env=["distro_id"],
-            )
-        ],
-    ),
     CompileTask("debug-compile-with-warnings", CFLAGS="-Werror -Wno-cast-align"),
     CompileTask(
         "debug-compile-nosasl-openssl-1.0.1",

.evergreen/legacy_config_generator/evergreen_config_lib/variants.py

@@ -64,9 +64,6 @@ def days(n: int) -> int:
             OD([("name", "link-with-bson-mac"), ("distros", ["macos-14-arm64"])]),
             OD([("name", "link-with-bson-mingw"), ("distros", ["windows-vsCurrent-large"])]),
             "check-headers",
-            "install-uninstall-check",
-            OD([("name", "install-uninstall-check-mingw"), ("distros", ["windows-vsCurrent-large"])]),
-            OD([("name", "install-uninstall-check-msvc"), ("distros", ["windows-vsCurrent-large"])]),
             "debug-compile-with-warnings",
             OD([("name", "build-and-test-with-toolchain"), ("distros", ["debian11-small"])]),
             "install-libmongoc-after-libbson",

.evergreen/scripts/compile-std.sh

@@ -22,7 +22,7 @@ script_dir="$(to_absolute "$(dirname "${BASH_SOURCE[0]}")")"
 declare mongoc_dir
 mongoc_dir="$(to_absolute "${script_dir}/../..")"
 
-declare install_dir="${mongoc_dir}/install-dir"
+declare libmongocrypt_install_dir="${mongoc_dir}/libmongocrypt-install-dir"
 
 declare -a configure_flags
 
@@ -38,7 +38,7 @@ configure_flags_append_if_not_null() {
   fi
 }
 
-configure_flags_append "-DCMAKE_PREFIX_PATH=${install_dir}"
+configure_flags_append "-DCMAKE_PREFIX_PATH=${libmongocrypt_install_dir:?}"
 configure_flags_append "-DCMAKE_SKIP_RPATH=TRUE" # Avoid hardcoding absolute paths to dependency libraries.
 configure_flags_append "-DENABLE_CLIENT_SIDE_ENCRYPTION=ON"
 configure_flags_append "-DENABLE_DEBUG_ASSERTIONS=ON"
@@ -90,15 +90,15 @@ CXXFLAGS+=" ${flags+${flags[*]}}"
 declare cmake_binary
 cmake_binary="$(find_cmake_latest)"
 
-declare build_dir
-build_dir="cmake-build"
+declare mongoc_build_dir mongoc_install_dir
+mongoc_build_dir="cmake-build"
+mongoc_install_dir="cmake-install"
+
+configure_flags_append "-DCMAKE_INSTALL_PREFIX=${mongoc_install_dir:?}"
 
 # shellcheck source=.evergreen/scripts/add-build-dirs-to-paths.sh
 . "${script_dir}/add-build-dirs-to-paths.sh"
 
-export PKG_CONFIG_PATH
-PKG_CONFIG_PATH="${install_dir}/lib/pkgconfig:${PKG_CONFIG_PATH:-}"
-
 if [[ "${OSTYPE}" == darwin* ]]; then
   # MacOS does not have nproc.
   nproc() {
@@ -164,7 +164,7 @@ echo "Checking requested C standard is supported... done."
 
 echo "Installing libmongocrypt..."
 # shellcheck source=.evergreen/scripts/compile-libmongocrypt.sh
-"${script_dir}/compile-libmongocrypt.sh" "${cmake_binary}" "${mongoc_dir}" "${install_dir}" &>output.txt || {
+"${script_dir}/compile-libmongocrypt.sh" "${cmake_binary}" "${mongoc_dir}" "${libmongocrypt_install_dir:?}" &>output.txt || {
   cat output.txt 1>&2
   exit 1
 }
@@ -187,9 +187,39 @@ else
   all_target="all"
 fi
 
-"${cmake_binary}" -S . -B "${build_dir:?}" "${configure_flags[@]}"
-"${cmake_binary}" --build "${build_dir:?}" --config Debug \
+# Ensure we're starting with a clean slate.
+rm -rf "${mongoc_build_dir:?}" "${mongoc_install_dir:?}"
+
+"${cmake_binary}" -S . -B "${mongoc_build_dir:?}" "${configure_flags[@]}"
+"${cmake_binary}" --build "${mongoc_build_dir:?}" --config Debug \
   --target mongo_c_driver_tests \
   --target mongo_c_driver_examples \
   --target public-header-warnings \
   --target "${all_target:?}"
+"${cmake_binary}" --install "${mongoc_build_dir:?}" --config Debug
+
+# "lib" vs. "lib64"
+if [[ -d "${mongoc_install_dir:?}/lib64" ]]; then
+  lib_dir="lib64"
+else
+  lib_dir="lib"
+fi
+
+# This file should not be deleted!
+touch "${mongoc_install_dir:?}/${lib_dir:?}/canary.txt"
+
+# Linux/MacOS: uninstall.sh
+# Windows:     uninstall.cmd
+"${cmake_binary}" --build "${mongoc_build_dir:?}" --target uninstall || true # CDRIVER-6062
+
+# No files should remain except canary.txt.
+# No directories except top-level directories should remain.
+echo "Checking results of uninstall..."
+diff <(cd "${mongoc_install_dir:?}" && find . -mindepth 1 | sort) <(
+  echo "./bin"
+  echo "./include"
+  echo "./${lib_dir:?}"
+  echo "./${lib_dir:?}/canary.txt"
+  echo "./share"
+)
+echo "Checking results of uninstall... done."

.evergreen/scripts/compile-windows.sh

@@ -56,7 +56,6 @@ IFS=' ' read -ra extra_configure_flags <<<"${EXTRA_CONFIGURE_FLAGS:-}"
 
 configure_flags_append "-DCMAKE_INSTALL_PREFIX=$(native-path "${install_dir}")"
 configure_flags_append "-DCMAKE_PREFIX_PATH=$(native-path "${install_dir}")"
-configure_flags_append "-DENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF"
 configure_flags_append "-DENABLE_MAINTAINER_FLAGS=ON"
 
 configure_flags_append_if_not_null C_STD_VERSION "-DCMAKE_C_STANDARD=${C_STD_VERSION:-}"
@@ -98,17 +97,15 @@ CMAKE_BUILD_PARALLEL_LEVEL="$(nproc)"
 declare build_dir
 build_dir="cmake-build"
 
-if [[ "${CC}" =~ mingw ]]; then
+if [[ "${CC}" =~ 'gcc' ]]; then
   # MinGW has trouble compiling src/cpp-check.cpp without some assistance.
   configure_flags_append "-DCMAKE_CXX_STANDARD=11"
 
   env \
-    "CC=gcc" \
-    "CXX=g++" \
     "${cmake_binary:?}" \
     -S . \
     -B "${build_dir:?}" \
-    -G "MinGW Makefiles" \
+    -G "Ninja" \
     "${configure_flags[@]}" \
     "${extra_configure_flags[@]}"