Set VS_REDIST_EXE for all architectures

[yaz-moved-to-github.git] / win / yaz.nsi

diff --git a/win/yaz.nsi b/win/yaz.nsi
index 1a31506..bc1bd39 100644 (file)
--- a/win/yaz.nsi
+++ b/win/yaz.nsi
@@ -5,12 +5,44 @@
 !include EnvVarUpdate.nsh
 !include version.nsi
 
-; !define VS_REDIST_EXE "vcredist_x86.exe"
-; !define VS_REDIST_FULL "c:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\1033\${VS_REDIST_EXE}"
-; !define VS_REDIST_KEY "SOFTWARE\Microsoft\VisualStudio\12.0\VC\Runtimes\x86"
-
 !include "MUI.nsh"
 
+!define VS_REDIST_FULL "c:\Program Files (x86)\Microsoft Visual Studio ${VSVER}.0\VC\redist\1033\${VS_REDIST_EXE}"
+
+; For example can be found with regedit:
+;  Microsoft Visual C++ 2013 x86 Minimum Runtime
+!if "${VSARCH}" = "x64"
+; 64-bit
+!if "${VSVER}" = "12"
+!define VS_REDIST_KEY "SOFTWARE\Classes\Installer\Products\6E8D947A316B3EB3F8F540C548BE2AB9"
+!endif
+!if "${VSVER}" = "14"
+; Microsoft Visual C++ 2015 x64 Minimum Runtime - 14.0.23026
+!define VS_REDIST_KEY "SOFTWARE\Classes\Installer\Products\51E9E3D0A7EDB003691F4BFA219B4688"
+!endif
+
+InstallDir "$PROGRAMFILES64\YAZ"
+!else
+; 32-bit
+!if "${VSVER}" = "12"
+!define VS_REDIST_KEY "SOFTWARE\Classes\Installer\Products\21EE4A31AE32173319EEFE3BD6FDFFE3"
+!endif
+!if "${VSVER}" = "14"
+; Microsoft Visual C++ 2015 x86 Minimum Runtime - 14.0.23026
+!define VS_REDIST_KEY "SOFTWARE\Classes\Installer\Products\55E3652ACEB38283D8765E8E9B8E6B57"
+!endif
+
+InstallDir "$PROGRAMFILES\YAZ"
+!endif
+
+!if "${VSVER}" = "14"
+!define VS_REDIST_EXE vc_redist.${VSARCH}.exe
+!else
+!define VS_REDIST_EXE vcredist_${VSARCH}.exe
+!endif
+
+RequestExecutionLevel admin
+
 SetCompressor bzip2
 
 Name "YAZ"
@@ -87,10 +119,10 @@ Section "YAZ Runtime" YAZ_Runtime
        SetOutPath $INSTDIR\bin
 !if "${VS_REDIST_FULL}" != ""
        File "${VS_REDIST_FULL}"
-       ReadRegStr $1 HKLM "${VS_REDIST_KEY}" "Installed"
-       StrCmp $1 1 installed_redist
-       ExecWait '"$INSTDIR\bin\${VS_REDIST_EXE}" /passive /nostart'
-installed_redist:
+       ReadRegDword $1 HKLM "${VS_REDIST_KEY}" "Version"
+       ${If} $1 == ""
+         ExecWait '"$INSTDIR\bin\${VS_REDIST_EXE}" /passive /nostart'
+       ${endif}
        Delete "$INSTDIR\bin\${VS_REDIST_EXE}"
 !endif
        IfFileExists "$INSTDIR\bin\yaz-ztest.exe" 0 Noservice
@@ -174,12 +206,11 @@ SectionEnd
 UninstallText "This will uninstall YAZ ${VERSION} from your system"
 
 Section Uninstall
-; add delete commands to delete whatever files/registry keys/etc you installed here.
+       ExecWait '"$INSTDIR\bin\yaz-ztest" -remove'
+       RMDir /r $SMPROGRAMS\YAZ
        Delete "$INSTDIR\uninst.exe"
        DeleteRegKey HKLM "SOFTWARE\Index Data\YAZ"
        DeleteRegKey HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\YAZ"
-       ExecWait '"$INSTDIR\bin\yaz-ztest" -remove'
-       RMDir /r $SMPROGRAMS\YAZ
        RMDir /r $INSTDIR
        ${un.EnvVarUpdate} $0 "PATH" "R" "HKLM" "$INSTDIR\bin"
         IfFileExists $INSTDIR 0 Removed