[CDRIVER-5961] [CDRIVER-2086] Renaming of binaries, packages, and install paths

.evergreen/scripts/install-uninstall-check-windows.cmd

@@ -15,6 +15,9 @@ set CMAKE_MAKE_PROGRAM=C:\mingw-w64\x86_64-4.9.1-posix-seh-rt_v3-rev1\mingw64\bi
 rem Ensure Cygwin executables like sh.exe are not in PATH
 set PATH=C:\cygwin\bin;C:\Windows\system32;C:\Windows;C:\mingw-w64\x86_64-4.9.1-posix-seh-rt_v3-rev1\mingw64\bin;C:\mongoc;src\libbson;src\libmongoc
 
+set version=1.31.0
+set major=1
+
 if "%BSON_ONLY%"=="1" (
    set BUILD_DIR=%CD%\build-dir-bson
    set INSTALL_DIR=%CD%\install-dir-bson
@@ -120,29 +123,11 @@ echo.%CC%| findstr /I "gcc">Nul && (
   )
 )
 
-if exist %INSTALL_DIR%\lib\pkgconfig\libbson-1.0.pc (
-   echo libbson-1.0.pc found!
-   exit /B 1
-) else (
-   echo libbson-1.0.pc check ok
-)
-if exist %INSTALL_DIR%\lib\cmake\bson-1.0\bson-1.0-config.cmake (
-   echo bson-1.0-config.cmake found!
-   exit /B 1
-) else (
-   echo bson-1.0-config.cmake check ok
-)
-if exist %INSTALL_DIR%\lib\cmake\bson-1.0\bson-1.0-config-version.cmake (
-   echo bson-1.0-config-version.cmake found!
+if exist %INSTALL_DIR%\lib\pkgconfig\bson%major%.pc (
+   echo bson%major%.pc found!
    exit /B 1
 ) else (
-   echo bson-1.0-config-version.cmake check ok
-)
-if exist %INSTALL_DIR%\lib\cmake\bson-1.0\bson-targets.cmake (
-   echo bson-targets.cmake found!
-   exit /B 1
-) else (
-   echo bson-targets.cmake check ok
+   echo bson%major%.pc check ok
 )
 if not exist %INSTALL_DIR%\lib\canary.txt (
    echo canary.txt not found!
@@ -157,11 +142,11 @@ if not exist %INSTALL_DIR%\lib (
    echo %INSTALL_DIR%\lib check ok
 )
 if "%BSON_ONLY%" NEQ "1" (
-   if exist %INSTALL_DIR%\lib\pkgconfig\libmongoc-1.0.pc (
-     echo libmongoc-1.0.pc found!
+   if exist %INSTALL_DIR%\lib\pkgconfig\mongoc%major%.pc (
+     echo mongoc%major%.pc found!
      exit /B 1
    ) else (
-     echo libmongoc-1.0.pc check ok
+     echo mongoc%major%.pc check ok
    )
    if exist %INSTALL_DIR%\lib\cmake\mongoc-1.0\mongoc-1.0-config.cmake (
      echo mongoc-1.0-config.cmake found!
@@ -182,23 +167,17 @@ if "%BSON_ONLY%" NEQ "1" (
      echo mongoc-targets.cmake check ok
    )
 )
-if exist %INSTALL_DIR%\include\libbson-1.0\bson\bson.h (
+if exist %INSTALL_DIR%\include\bson-%version%\bson\bson.h (
    echo bson\bson.h found!
    exit /B 1
 ) else (
    echo bson\bson.h check ok
 )
-if exist %INSTALL_DIR%\include\libbson-1.0\bson.h (
-   echo bson.h found!
-   exit /B 1
-) else (
-   echo bson.h check ok
-)
-if exist %INSTALL_DIR%\include\libbson-1.0 (
-   echo $INSTALL_DIR\include\libbson-1.0 found!
+if exist %INSTALL_DIR%\include\bson-%version% (
+   echo $INSTALL_DIR\include\bson-%version% found!
    exit /B 1
 ) else (
-   echo $INSTALL_DIR\include\libbson-1.0 check ok
+   echo $INSTALL_DIR\include\bson-%version% check ok
 )
 if "%BSON_ONLY%" NEQ "1" (
    if exist %INSTALL_DIR%\include\libmongoc-1.0\mongoc\mongoc.h (

.evergreen/scripts/install-uninstall-check.sh

@@ -13,14 +13,21 @@ CMAKE=$(find_cmake_latest)
 . $DIR/check-symlink.sh
 SRCROOT=$(pwd)
 
+# The major version of the project. Appears in certain install filenames.
+_full_version=$(cat "$DIR/../../VERSION_CURRENT")
+version="${_full_version%-*}"  # 1.2.3-dev → 1.2.3
+major="${version%%.*}"         # 1.2.3     → 1
+echo "major version: $version"
+echo " full version: $major"
+
 # Use ccache if able.
 . $DIR/find-ccache.sh
 find_ccache_and_export_vars "$(pwd)" || true
 
 SCRATCH_DIR=$(pwd)/.scratch
 rm -rf "$SCRATCH_DIR"
 mkdir -p "$SCRATCH_DIR"
-cp -vr -- "$SRCROOT"/* "$SCRATCH_DIR"
+cp -r -- "$SRCROOT"/* "$SCRATCH_DIR"
 
 if [ "$BSON_ONLY" ]; then
   BUILD_DIR=$SCRATCH_DIR/build-dir-bson
@@ -58,8 +65,8 @@ if [[ -f $DIR/find-ccache.sh ]]; then
   find_ccache_and_export_vars "$SCRATCH_DIR" || true
 fi
 
-$CMAKE -DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX -DCMAKE_PREFIX_PATH=$INSTALL_DIR/lib/cmake $BSON_ONLY_OPTION "$SCRATCH_DIR"
-$CMAKE --build .
+$CMAKE -DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX -DBUILD_TESTING=OFF -DCMAKE_PREFIX_PATH=$INSTALL_DIR/lib/cmake $BSON_ONLY_OPTION "$SCRATCH_DIR"
+$CMAKE --build . --parallel
 if [ "$DESTDIR" ]; then
    DESTDIR=$DESTDIR $CMAKE --build . --target install
 else
@@ -93,29 +100,23 @@ $CMAKE --build . --target uninstall
 
 set +o xtrace
 
-if test -f $INSTALL_DIR/lib/pkgconfig/libbson-1.0.pc; then
-  echo "libbson-1.0.pc found!"
-  exit 1
-else
-  echo "libbson-1.0.pc check ok"
-fi
-if test -f $INSTALL_DIR/lib/cmake/bson-1.0/bson-1.0-config.cmake; then
-  echo "bson-1.0-config.cmake found!"
+if test -f $INSTALL_DIR/lib/pkgconfig/bson$major.pc; then
+  echo "bson$major.pc found!"
   exit 1
 else
-  echo "bson-1.0-config.cmake check ok"
+  echo "bson$major.pc check ok"
 fi
-if test -f $INSTALL_DIR/lib/cmake/bson-1.0/bson-1.0-config-version.cmake; then
-  echo "bson-1.0-config-version.cmake found!"
+if test -f $INSTALL_DIR/lib/cmake/bson-$version/bsonConfig.cmake; then
+  echo "bsonConfig.cmake found!"
   exit 1
 else
-  echo "bson-1.0-config-version.cmake check ok"
+  echo "bsonConfig.cmake check ok"
 fi
-if test -f $INSTALL_DIR/lib/cmake/bson-1.0/bson-targets.cmake; then
-  echo "bson-targets.cmake found!"
+if test -f $INSTALL_DIR/lib/cmake/bson-$version/bsonConfigVersion.cmake; then
+  echo "bsonConfigVersion.cmake found!"
   exit 1
 else
-  echo "bson-targets.cmake check ok"
+  echo "bsonConfigVersion.cmake check ok"
 fi
 if test ! -f $INSTALL_DIR/lib/canary.txt; then
   echo "canary.txt not found!"
@@ -130,11 +131,11 @@ else
   echo "$INSTALL_DIR/lib check ok"
 fi
 if [ -z "$BSON_ONLY" ]; then
-  if test -f $INSTALL_DIR/lib/pkgconfig/libmongoc-1.0.pc; then
-    echo "libmongoc-1.0.pc found!"
+  if test -f $INSTALL_DIR/lib/pkgconfig/mongoc$major.pc; then
+    echo "mongoc$major.pc found!"
     exit 1
   else
-    echo "libmongoc-1.0.pc check ok"
+    echo "mongoc$major.pc check ok"
   fi
   if test -f $INSTALL_DIR/lib/cmake/mongoc-1.0/mongoc-1.0-config.cmake; then
     echo "mongoc-1.0-config.cmake found!"
@@ -155,17 +156,17 @@ if [ -z "$BSON_ONLY" ]; then
     echo "mongoc-targets.cmake check ok"
   fi
 fi
-if test -f $INSTALL_DIR/include/libbson-1.0/bson/bson.h; then
+if test -f $INSTALL_DIR/include/bson-$version/bson/bson.h; then
   echo "bson/bson.h found!"
   exit 1
 else
   echo "bson/bson.h check ok"
 fi
-if test -d $INSTALL_DIR/include/libbson-1.0; then
-  echo "$INSTALL_DIR/include/libbson-1.0 found!"
+if test -d $INSTALL_DIR/include/bson-$version; then
+  echo "$INSTALL_DIR/include/bson-$version found!"
   exit 1
 else
-  echo "$INSTALL_DIR/include/libbson-1.0 check ok"
+  echo "$INSTALL_DIR/include/bson-$version check ok"
 fi
 if [ -z "$BSON_ONLY" ]; then
   if test -f $INSTALL_DIR/include/libmongoc-1.0/mongoc/mongoc.h; then