X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=win%2Fyaz.nsi;h=9d923e6ed98051fab9ff57f22f99e4d70c23433f;hb=a4a4e9d375bfbcc823e8b3820ffb23272e919004;hp=a01dcdd37826e1f1649870d6db8064f465057a09;hpb=92f596bde85d55acdd37df9c8d2323dd1b23f6a2;p=yaz-moved-to-github.git

diff --git a/win/yaz.nsi b/win/yaz.nsi
index a01dcdd..9d923e6 100644
--- a/win/yaz.nsi
+++ b/win/yaz.nsi
@@ -7,7 +7,6 @@
 
 !include "MUI.nsh"
 
-!define VS_REDIST_EXE vcredist_${VSARCH}.exe
 !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:
@@ -18,6 +17,8 @@
 !define VS_REDIST_KEY "SOFTWARE\Classes\Installer\Products\6E8D947A316B3EB3F8F540C548BE2AB9"
 !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 "$PROGRAMFILES64\YAZ"
@@ -27,12 +28,23 @@ InstallDir "$PROGRAMFILES64\YAZ"
 !define VS_REDIST_KEY "SOFTWARE\Classes\Installer\Products\21EE4A31AE32173319EEFE3BD6FDFFE3"
 !endif
 !if "${VSVER}" = "14"
+; Microsoft Visual C++ 2015 x64 Minimum Runtime - 14.0.23026
+!define VS_REDIST_KEY "SOFTWARE\Classes\Installer\Products\51E9E3D0A7EDB003691F4BFA219B4688"
+!endif
+
+!if "${VSVER}" = "14"
+!define VS_REDIST_EXE vc_redist.${VSARCH}.exe
+!else
+!define VS_REDIST_EXE vcredist_${VSARCH}.exe
 !endif
 
+
 InstallDir "$PROGRAMFILES\YAZ"
 !endif
 
 
+RequestExecutionLevel admin
+
 SetCompressor bzip2
 
 Name "YAZ"
@@ -196,12 +208,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