Merge pull request #4041 from uglide/improve_windows_installer

Improve windows installer

Author: uglide

appveyor.yml

@@ -22,14 +22,17 @@ build_script:
 - cd %SRCDIR%
 - copy /y .\bin\windows\release\rdm.exe .\build\windows\installer\resources\rdm.exe
 - copy /y .\bin\windows\release\rdm.pdb .\build\windows\installer\resources\rdm.pdb
-- copy /y C:\OpenSSL-Win32\bin\libeay32.dll .\build\windows\installer\resources\libeay32.dll
-- copy /y C:\OpenSSL-Win32\bin\ssleay32.dll .\build\windows\installer\resources\ssleay32.dll
 - copy /y .\3rdparty\qredisclient\3rdparty\windows\rmt_openssl.1.1.0.3\build\native\bin\v140\Win32\Release\dynamic\libcrypto-1_1.dll .\build\windows\installer\resources\libcrypto-1_1.dll
 - copy /y .\3rdparty\qredisclient\3rdparty\windows\rmt_openssl.1.1.0.3\build\native\bin\v140\Win32\Release\dynamic\libssl-1_1.dll .\build\windows\installer\resources\libssl-1_1.dll
 - copy /y .\3rdparty\qredisclient\3rdparty\windows\rmt_openssl.1.1.0.3\build\native\bin\v140\Win32\Release\dynamic\capi.dll .\build\windows\installer\resources\capi.dll
 - copy /y .\3rdparty\qredisclient\3rdparty\windows\rmt_openssl.1.1.0.3\build\native\bin\v140\Win32\Release\dynamic\padlock.dll .\build\windows\installer\resources\padlock.dll
 - cd build/windows/installer/resources/
-- windeployqt --compiler-runtime --angle --release --force --qmldir %SRCDIR%/src/qml rdm.exe
+- windeployqt --no-angle --no-opengl-sw --no-compiler-runtime --no-translations --release --force --qmldir %SRCDIR%/src/qml rdm.exe
+- rmdir /S /Q .\platforminputcontexts
+- rmdir /S /Q .\qmltooling
+- rmdir /S /Q .\QtGraphicalEffects
+- del /Q  .\imageformats\qtiff.dll
+- del /Q  .\imageformats\qwebp.dll
 - cd %SRCDIR%
 - call "C:\\Program Files (x86)\\NSIS\\makensis.exe" /V1 /DVERSION=%APPVEYOR_BUILD_VERSION%  ./build/windows/installer/installer.nsi
 test_script:

build/windows/installer/include/install_vcredist_x86.nsh

@@ -0,0 +1,47 @@
+!include LogicLib.nsh
+
+!macro InstallVCredist
+  !define VCplus_URL "https://download.microsoft.com/download/9/3/F/93FCF1E7-E6A4-478B-96E7-D4B285925B00/vc_redist.x86.exe"
+ 
+  ReadRegStr $0 HKLM "Software\Microsoft\DevDiv\vc\Servicing\14.0\RuntimeMinimum" Install
+  StrCmp $0 "1" VCInstalled
+  
+  DetailPrint "Beginning download of VC++ 14 Redistributable."
+  inetc::get /TIMEOUT=30000 ${VCplus_URL} "$TEMP\vc_redist.x86.exe" /END
+  Pop $0
+  DetailPrint "Result: $0"
+  StrCmp $0 "OK" InstallVCplusplus
+  StrCmp $0 "cancelled" VCCanceled
+  inetc::get /TIMEOUT=30000 /NOPROXY ${VCplus_URL} "$TEMP\vc_redist.x86.exe" /END
+  Pop $0
+  DetailPrint "Result: $0"
+  StrCmp $0 "OK" InstallVCplusplus
+ 
+  MessageBox MB_ICONSTOP "Download failed: $0. Please install it manually and try again: $VCplus_URL"
+  Abort
+
+  InstallVCplusplus:
+  DetailPrint "Completed download."
+  Pop $0
+  ${If} $0 == "cancel"
+    MessageBox MB_YESNO|MB_ICONEXCLAMATION \
+    "Download cancelled.  Continue Installation?" \
+    IDYES VCInstalled IDNO VCCanceled
+  ${EndIf}
+
+  DetailPrint "Pausing installation while downloaded VC++ installer runs."
+  DetailPrint "Installation could take several minutes to complete."
+  ExecWait '$TEMP\vc_redist.x86.exe /passive /norestart'
+
+  DetailPrint "Removing VC++ installer."
+  Delete "$TEMP\vc_redist.x86.exe"
+  
+  DetailPrint "VC++ installer removed."
+  goto VCInstalled
+ 
+VCCanceled:
+  Abort "Installation cancelled by user."
+ 
+VCInstalled:
+  Pop $0
+!macroend

build/windows/installer/installer.nsi

@@ -25,6 +25,7 @@ SetCompressor /SOLID /FINAL lzma
 
 # Included files
 !include "nsProcess.nsh"
+!include "install_vcredist_x86.nsh"
 !include Sections.nsh
 !include MUI2.nsh
 
@@ -65,14 +66,19 @@ ShowUninstDetails show
 # Installer sections
 Section -Main SEC0000
     ${nsProcess::KillProcess} "${APP_EXE}" $R4
-    RMDir /r $INSTDIR
+
+    IfFileExists $INSTDIR\uninstall.exe alredy_installed not_installed
+    alredy_installed:
+    ExecWait '$INSTDIR\uninstall.exe /S'
+    Sleep 3000
+
+    not_installed:
 
     SetOutPath $INSTDIR
-    SetOverwrite on
     File ..\..\..\bin\windows\release\crashreporter.exe
     File /r resources\*
     WriteRegStr HKLM "${REGKEY}\Components" Main 1
-    ExecWait '"$INSTDIR\vcredist_x86.exe"  /quiet /norestart'
+    !insertmacro InstallVCredist
     BringToFront
 SectionEnd