CDRIVER-6062 fix Windows uninstall batch script behavior (#2075)

Author: eramongodb

.evergreen/scripts/compile-std.sh

@@ -210,7 +210,7 @@ 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
+"${cmake_binary}" --build "${mongoc_build_dir:?}" --target uninstall
 
 # No files should remain except canary.txt.
 # No directories except top-level directories should remain.

build/cmake/GenerateUninstaller.cmake

@@ -120,53 +120,6 @@ limitations under the License.]])
 string(STRIP header "${header}")
 string(REPLACE "\n" ";" header_lines "${header}")
 
-# Prefix for the Batch script:
-set(bat_preamble [[
-call :init
-
-:print
-<nul set /p_=%~1
-exit /b
-
-:rmfile
-set f=%__prefix%\%~1
-call :print "Remove file %f% "
-if EXIST "%f%" (
-    del /Q /F "%f%" || exit /b %errorlevel%
-    call :print " - ok"
-) else (
-    call :print " - skipped: not present"
-)
-echo(
-exit /b
-
-:rmdir
-set f=%__prefix%\%~1
-call :print "Remove directory: %f% "
-if EXIST "%f%" (
-    rmdir /Q "%f%" 2>nul
-    if ERRORLEVEL 0 (
-        call :print "- ok"
-    ) else (
-        call :print "- skipped (non-empty?)"
-    )
-) else (
-    call :print " - skipped: not present"
-)
-echo(
-exit /b
-
-:init
-setlocal EnableDelayedExpansion
-setlocal EnableExtensions
-if /i "%~dp0" NEQ "%TEMP%\" (
-    set tmpfile=%TEMP%\mongoc-%~nx0
-    copy "%~f0" "!tmpfile!" >nul
-    call "!tmpfile!" & del "!tmpfile!"
-    exit /b
-)
-]])
-
 # Prefix for the shell script:
 set(sh_preamble [[
 set -eu
@@ -225,15 +178,9 @@ if(UNINSTALL_IS_WIN32)
         ""
         "${header_lines}"
         ""
-        "${bat_preamble}"
-        "if \"%DESTDIR%\"==\"\" ("
-        "  set __prefix=${install_prefix}"
-        ") else ("
-        "  set __prefix=!DESTDIR!\\${relative_prefix}"
-        ")"
-        "")
-    set(__rmfile "call :rmfile")
-    set(__rmdir "call :rmdir")
+        "if \"%DESTDIR%\"==\"\" (set __prefix=${install_prefix}) else (set __prefix=!DESTDIR!\\${relative_prefix})"
+        ""
+        "(GOTO) 2>nul & (")
 else()
     # Comment the header:
     list(TRANSFORM header_lines PREPEND "# " REGEX "^.+$")
@@ -247,8 +194,6 @@ else()
         "${sh_preamble}"
         "__prefix=\${DESTDIR:-}${install_prefix}"
         "")
-    set(__rmfile "__rmfile")
-    set(__rmdir "__rmdir")
 endif()
 
 # Add the first lines to the file:
@@ -258,13 +203,37 @@ append_line("${init}")
 # Generate a "remove a file" command
 function(add_rmfile filename)
     file(TO_NATIVE_PATH "${filename}" native)
-    append_line("${__rmfile} '${native}'")
+    if(WIN32)
+      set(file "%__prefix%\\${native}")
+      set(rmfile_lines
+        "  <nul set /p \"=Remove file: ${file} \""
+        "  if EXIST \"${file}\" ("
+        "    del /Q /F \"${file}\" && echo - ok"
+        "  ) ELSE echo - skipped: not present"
+        ") && (")
+      string(REPLACE ";" "\n" rmfile "${rmfile_lines}")
+      append_line("${rmfile}")
+    else()
+      append_line("__rmfile '${native}'")
+    endif()
 endfunction()
 
 # Generate a "remove a directory" command
 function(add_rmdir dirname)
     file(TO_NATIVE_PATH "${dirname}" native)
-    append_line("${__rmdir} '${native}'")
+    if(WIN32)
+      set(dir "%__prefix%\\${native}")
+      set(rmdir_lines
+        "  <nul set /p \"=Remove directory: ${dir} \""
+        "  if EXIST \"${dir}\" ("
+        "    rmdir /Q \"${dir}\" 2>nul && echo - ok || echo - skipped ^(non-empty?^)"
+        "  ) ELSE echo - skipped: not present"
+        ") && (")
+      string(REPLACE ";" "\n" rmdir "${rmdir_lines}")
+      append_line("${rmdir}")
+    else()
+      append_line("__rmdir '${native}'")
+    endif()
 endfunction()
 
 set(script_self "${install_prefix}/${UNINSTALL_SCRIPT_SELF}")
@@ -298,4 +267,10 @@ foreach(dir IN LISTS dirs_to_remove)
     add_rmdir("${relpath}")
 endforeach()
 
+# Allow the batch script delete itself without error.
+if(WIN32)
+    append_line("  ver>nul")
+    append_line(")")
+endif()
+
 message(STATUS "Generated uninstaller: ${UNINSTALL_WRITE_FILE}")