Windows installer/uninstaller tickets[CPP-751][CPP-743] (#573)

* More pleasing uninstall of old console[CPP-743]

* Kill app if running before uninstalling[CPP-751]

* Move NSIS plugins to LFS.

Author: john-michaelburke

.gitattributes

@@ -1,2 +1,3 @@
 "console_backend/tests/data/*" filter=lfs diff=lfs merge=lfs -text
 "pyside-wheels/*.whl" filter=lfs diff=lfs merge=lfs -text
+installers/Windows/NSIS/*.zip filter=lfs diff=lfs merge=lfs -text

.gitignore

@@ -19,4 +19,5 @@ get-pip.py
 .*.sw?
 installers/Windows/*.exe
 installers/Linux/*.deb
-installers/Windows/NSIS/
+installers/Windows/NSIS/*
+!installers/Windows/NSIS/*.zip

Makefile.toml

@@ -764,12 +764,15 @@ mv *.deb installers/Linux/
 [tasks.install-nsis-plugin]
 script_runner = "@duckscript"
 script = '''
-filepath = set installers/Windows/NSIS/Inetc.zip
-if not is_path_exists ${filepath}
-  mkdir installers/Windows/NSIS
-  wget -O ${filepath} https://nsis.sourceforge.io/mediawiki/images/c/c9/Inetc.zip
+inetc_filepath = set installers/Windows/NSIS/Plugins/x86-unicode/INetC.dll
+if not is_path_exists ${inetc_filepath}
   exec --fail-on-error unzip -d installers/Windows/NSIS installers/Windows/NSIS/Inetc.zip
 end
+nsprocess_filepath = set installers/Windows/NSIS/Plugin/nsProcess.dll
+if not is_path_exists ${nsprocess_filepath}
+  exec --fail-on-error unzip -d installers/Windows/NSIS installers/Windows/NSIS/nsProcess.zip
+  exec --fail-on-error mv installers/Windows/NSIS/Plugin/nsProcessW.dll installers/Windows/NSIS/Plugin/nsProcess.dll
+end
 '''
 
 [tasks.dist-to-installer.windows]

installers/Windows/Installer.nsi

@@ -8,6 +8,7 @@ Unicode true
 !include FileFunc.nsh
 !include LogicLib.nsh
 !addplugindir "NSIS\Plugins\x86-unicode"
+!addplugindir "NSIS\Plugin"
 !define MUI_ICON "..\..\resources\images\icon.ico"
 !define MUI_UNICON "..\..\resources\images\icon.ico"
 
@@ -22,9 +23,10 @@ Unicode true
 !define outfile_prefix "swift-console"
 !define installer_dir "py39-dist"
 !define company_name "Swift Navigation"
-!define old_uninstaller "$PROGRAMFILES\${company_name}\${app_name}\Uninstall.exe"
 !define old_shortcut "${app_name} (Old).lnk"
 
+var Checkbox
+
 !define vc_redist_url "https://aka.ms/vs/17/release/vc_redist.x64.exe"
 
 ManifestDPIAware true
@@ -82,6 +84,7 @@ FunctionEnd
 
   !define UninstallMsg "Warning! By clicking $\"Next$\", this installer will uninstall any previous versions of the Swift Console.$\n$\n\
 If this is not desired, please exit the installer now."
+  !define OldUninstallMsg "Also uninstall the previous generation of Swift Console (versions lower than v4.0.0)"
 
   Function uninstallOldVersionsPage
   !insertmacro MUI_HEADER_TEXT "Uninstall Previous Version" "This installer will uninstall any previous versions."
@@ -95,10 +98,25 @@ If this is not desired, please exit the installer now."
   ${NSD_CreateLabel} 0 0 100% 40u "${UninstallMsg}"
   Pop $0
 
+  ${NSD_CreateCheckbox} 10u 110u 100% 10u "${OldUninstallMsg}"
+  Pop $Checkbox
+  ${NSD_Check} $Checkbox
+
   nsDialogs::Show
   FunctionEnd
 
   Function uninstallOldVersionsPageLeave
+  ${NSD_GetState} $Checkbox $0
+  ${If} $0 <> ${BST_UNCHECKED}
+      SetShellVarContext current
+      RMDir /r "$PROGRAMFILES\Swift Navigation\Swift Console\*.*"
+      Delete "$DESKTOP\Swift Console.lnk"
+      Delete "$DESKTOP\${old_shortcut}"
+      Delete "$SMPROGRAMS\Swift Navigation\Swift Console.lnk"
+      Delete "$SMPROGRAMS\Swift Navigation\Uninstall.lnk"
+      RMDir "$SMPROGRAMS\Swift Navigation"
+      SetShellVarContext all
+  ${EndIf}
   Call Uninstall
   FunctionEnd
 
@@ -160,6 +178,7 @@ If this is not desired, please exit the installer now."
 
 Function MoveOldShtct
     SetShellVarContext current
+    IfFileExists "$DESKTOP\${old_shortcut}" +2 0
     Rename "$DESKTOP\${app_name}.lnk" "$DESKTOP\${old_shortcut}"
     SetShellVarContext all
 FunctionEnd
@@ -230,9 +249,23 @@ Function LaunchAsNonAdmin
   Exec '"$WINDIR\explorer.exe" "$InstDir\${app_executable}"'
 FunctionEnd
 
+!macro CloseAppIfRunning Prefix
+Function ${Prefix}CloseAppIfRunning
+  nsProcess::_FindProcess "${app_executable}"
+  Pop $R0
+  ${If} $R0 == 0
+      nsProcess::_CloseProcess "${app_executable}"
+      Sleep 2000
+  ${EndIf}
+  nsProcess::_Unload
+FunctionEnd
+!macroend
+!insertmacro CloseAppIfRunning "" 
+!insertmacro CloseAppIfRunning "un."
+
 !macro Uninstall Prefix
 Function ${Prefix}Uninstall
-  Exec '"${old_uninstaller}" "/AllUsers /S"'
+  Call ${Prefix}CloseAppIfRunning
   RMDir /r "$InstDir"
   Delete "$DESKTOP\${app_name}.lnk"
   Delete "$SMPROGRAMS\${app_name}.lnk"

installers/Windows/NSIS/Inetc.zip

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:88d9dcffbe967df6ee9f5820f8199a673383e581bf650dbc35b94846314b1a4b
+size 83045

installers/Windows/NSIS/nsProcess.zip

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0d864ceeb0573c9d0a3fbbbe726f4a819bbb9e7c18c8ca2adaca6f47dce6db5e
+size 20550