CDRIVER-2849 name uninstall program based on components built

rcsanchez97 · kevinAlbs · commit 31c92900193c · 2019-01-23T23:11:27.000-05:00
also make generation of uninstall optional with default to ON
diff --git a/.evergreen/install-uninstall-check-windows.cmd b/.evergreen/install-uninstall-check-windows.cmd
@@ -54,6 +54,15 @@ echo.%CC%| findstr /I "gcc">Nul && (
   if errorlevel 1 (
      exit /B 1
   )
+
+  echo > %INSTALL_DIR%\lib\canary.txt
+
+  dir %INSTALL_DIR%\share\mongo-c-driver
+
+  %CMAKE_MAKE_PROGRAM% uninstall
+  if errorlevel 1 (
+     exit /B 1
+  )
 ) || (
   %CMAKE% -G "%CC%" "-DCMAKE_INSTALL_PREFIX=%INSTALL_DIR%" "-DCMAKE_BUILD_TYPE=Debug" %BSON_ONLY_OPTION% .
   MSBuild.exe /m ALL_BUILD.vcxproj
@@ -64,15 +73,15 @@ echo.%CC%| findstr /I "gcc">Nul && (
   if errorlevel 1 (
      exit /B 1
   )
-)
 
-echo > %INSTALL_DIR%\lib\canary.txt
+  echo > %INSTALL_DIR%\lib\canary.txt
 
-dir %INSTALL_DIR%\share\mongo-c-driver
+  dir %INSTALL_DIR%\share\mongo-c-driver
 
-call %INSTALL_DIR%\share\mongo-c-driver\uninstall.cmd
-if errorlevel 1 (
-   exit /B 1
+  MSBuild.exe /m generate_uninstall\uninstall.vcxproj
+  if errorlevel 1 (
+     exit /B 1
+  )
 )
 
 if exist %INSTALL_DIR%\lib\pkgconfig\libbson-1.0.pc (
@@ -163,6 +172,24 @@ if "%BSON_ONLY%" NEQ "1" (
      echo $INSTALL_DIR\include\libmongoc-1.0 check ok
    )
 )
+if exist %INSTALL_DIR%\share\mongo-c-driver\uninstall-bson.cmd (
+   echo uninstall-bson.cmd found!
+   exit /B 1
+) else (
+   echo uninstall-bson.cmd check ok
+)
+if exist %INSTALL_DIR%\share\mongo-c-driver\uninstall.cmd (
+   echo uninstall.cmd found!
+   exit /B 1
+) else (
+   echo uninstall.cmd check ok
+)
+if exist %INSTALL_DIR%\share\mongo-c-driver\uninstall-bson.sh (
+   echo uninstall-bson.sh found!
+   exit /B 1
+) else (
+   echo uninstall-bson.sh check ok
+)
 if exist %INSTALL_DIR%\share\mongo-c-driver\uninstall.sh (
    echo uninstall.sh found!
    exit /B 1
diff --git a/.evergreen/install-uninstall-check.sh b/.evergreen/install-uninstall-check.sh
@@ -58,7 +58,7 @@ touch $INSTALL_DIR/lib/canary.txt
 
 ls -l $INSTALL_DIR/share/mongo-c-driver
 
-$INSTALL_DIR/share/mongo-c-driver/uninstall.sh
+make uninstall
 
 set +o xtrace
 
@@ -150,6 +150,12 @@ if [ -z "$BSON_ONLY" ]; then
     echo "$INSTALL_DIR/include/libmongoc-1.0 check ok"
   fi
 fi
+if test -f $INSTALL_DIR/share/mongo-c-driver/uninstall-bson.sh; then
+  echo "uninstall-bson.sh found!"
+  exit 1
+else
+  echo "uninstall-bson.sh check ok"
+fi
 if test -f $INSTALL_DIR/share/mongo-c-driver/uninstall.sh; then
   echo "uninstall.sh found!"
   exit 1
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -50,6 +50,7 @@ option (ENABLE_RDTSCP
 )
 option (ENABLE_APPLE_FRAMEWORK "Build libraries as frameworks on darwin platforms" OFF) 
 set (ENABLE_ICU AUTO CACHE STRING "Enable ICU support, necessary to use non-ASCII usernames or passwords, default AUTO.")
+option (ENABLE_UNINSTALL "Enable creation of uninstall script and associate uninstall build target." ON)
 
 project (mongo-c-driver C)
 
@@ -336,15 +337,25 @@ if (ENABLE_MONGOC)
 
 endif ()
 
-if (WIN32)
-   set (UNINSTALL_PROG "uninstall.cmd")
-else ()
-   set (UNINSTALL_PROG "uninstall.sh")
-endif ()
-set (UNINSTALL_PROG_DIR "${CMAKE_INSTALL_DATADIR}/mongo-c-driver")
+if (ENABLE_UNINSTALL)
+   if (WIN32)
+      if (ENABLE_MONGOC)
+         set (UNINSTALL_PROG "uninstall.cmd")
+      else ()
+         set (UNINSTALL_PROG "uninstall-bson.cmd")
+      endif ()
+   else ()
+      if (ENABLE_MONGOC)
+         set (UNINSTALL_PROG "uninstall.sh")
+      else ()
+         set (UNINSTALL_PROG "uninstall-bson.sh")
+      endif ()
+   endif ()
+   set (UNINSTALL_PROG_DIR "${CMAKE_INSTALL_DATADIR}/mongo-c-driver")
 
-# Create uninstall program and associated uninstall target
-#
-# This needs to be last (after all other add_subdirectory calls) to ensure that
-# the generated uninstall program is complete and correct
-add_subdirectory (generate_uninstall)
+   # Create uninstall program and associated uninstall target
+   #
+   # This needs to be last (after all other add_subdirectory calls) to ensure that
+   # the generated uninstall program is complete and correct
+   add_subdirectory (generate_uninstall)
+endif ()
diff --git a/build/generate-uninstall.cmd b/build/generate-uninstall.cmd
@@ -84,8 +84,13 @@ for /f "usebackq delims=" %%a in ("%manifest%") do (
    echo.del !suffix! ^|^| echo ... not removed
 )
 
-echo.echo Removing file share\mongo-c-driver\uninstall.cmd
-echo.del share\mongo-c-driver\uninstall.cmd ^|^| echo ... not removed
+if "%ENABLE_MONGOC%"=="ON" (
+   echo.echo Removing file share\mongo-c-driver\uninstall.cmd
+   echo.del share\mongo-c-driver\uninstall.cmd ^|^| echo ... not removed
+) else (
+   echo.echo Removing file share\mongo-c-driver\uninstall-bson.cmd
+   echo.del share\mongo-c-driver\uninstall-bson.cmd ^|^| echo ... not removed
+)
 call :save_dirs "share\mongo-c-driver"
 
 for /f "tokens=2 delims=[]" %%a in ('set dirs[') do (
diff --git a/build/generate-uninstall.sh b/build/generate-uninstall.sh
@@ -93,8 +93,13 @@ while IFS= read -r line || [ -n "${line}" ]; do
    printf "(rm -f \"%s\" && printf \"\\\n\") || printf \" ... not removed\\\n\"\n" "${suffix}"
 done < "${manifest}"
 
-printf "printf \"Removing file \\\"share/mongo-c-driver/uninstall.sh\\\"\"\n"
-printf "(rm -f \"share/mongo-c-driver/uninstall.sh\" && printf \"\\\n\") || printf \" ... not removed\\\n\"\n"
+if [ "${ENABLE_MONGOC}" = "ON" ]; then
+   printf "printf \"Removing file \\\"share/mongo-c-driver/uninstall.sh\\\"\"\n"
+   printf "(rm -f \"share/mongo-c-driver/uninstall.sh\" && printf \"\\\n\") || printf \" ... not removed\\\n\"\n"
+else
+   printf "printf \"Removing file \\\"share/mongo-c-driver/uninstall-bson.sh\\\"\"\n"
+   printf "(rm -f \"share/mongo-c-driver/uninstall-bson.sh\" && printf \"\\\n\") || printf \" ... not removed\\\n\"\n"
+fi
 dirs="${dirs}share/mongo-c-driver\nshare\n"
 
 echo "${dirs}" | sort -ru | while IFS= read -r dir; do
diff --git a/generate_uninstall/CMakeLists.txt b/generate_uninstall/CMakeLists.txt
@@ -17,6 +17,7 @@ if (WIN32)
       execute_process (
          COMMAND
             ${CMAKE_COMMAND} -E env
+            ENABLE_MONGOC=${ENABLE_MONGOC}
             cmd.exe /c
             \"${PROJECT_SOURCE_DIR}/build/generate-uninstall.cmd\"
             mongoc_install_manifest.txt
@@ -26,6 +27,10 @@ if (WIN32)
       )
    ")
    install (FILES "${CMAKE_CURRENT_BINARY_DIR}/${UNINSTALL_PROG}" DESTINATION "${UNINSTALL_PROG_DIR}" PERMISSIONS ${UNINSTALL_PERMISSIONS})
+
+   add_custom_target (uninstall
+      COMMAND call "${CMAKE_CURRENT_BINARY_DIR}/${UNINSTALL_PROG}"
+   )
 else ()
    install (CODE "
       string(REPLACE \";\" \"\\n\" MONGOC_INSTALL_MANIFEST_CONTENT
@@ -35,6 +40,7 @@ else ()
       execute_process (
          COMMAND
             ${CMAKE_COMMAND} -E env
+            ENABLE_MONGOC=${ENABLE_MONGOC}
             \"${PROJECT_SOURCE_DIR}/build/generate-uninstall.sh\"
             mongoc_install_manifest.txt
             ${CMAKE_INSTALL_PREFIX}
@@ -43,8 +49,8 @@ else ()
       )
    ")
    install (FILES "${CMAKE_CURRENT_BINARY_DIR}/${UNINSTALL_PROG}" DESTINATION "${UNINSTALL_PROG_DIR}" PERMISSIONS ${UNINSTALL_PERMISSIONS})
-endif ()
 
-add_custom_target (uninstall
-   COMMAND "${CMAKE_CURRENT_BINARY_DIR}/${UNINSTALL_PROG}"
-)
+   add_custom_target (uninstall
+      COMMAND sh "${CMAKE_CURRENT_BINARY_DIR}/${UNINSTALL_PROG}"
+   )
+endif ()
