X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=win%2Fyaz.nsi;h=bc1bd39ded80a8b65de7b1a7e11b1312754f3a9e;hp=a994b5d0f21c019d9134279e9f7dafab7be09ced;hb=8b9999744362603b448a74f779ff7a2b4d76c89d;hpb=34886b048134b852abade14b9e535ac90f00093d

diff --git a/win/yaz.nsi b/win/yaz.nsi
index a994b5d..bc1bd39 100644
--- a/win/yaz.nsi
+++ b/win/yaz.nsi
@@ -2,32 +2,46 @@
 ; Copyright (C) Index Data
 ; See the file LICENSE for details.
 
+!include EnvVarUpdate.nsh
 !include version.nsi
 
-; Microsoft runtime CRT 
-; Uncomment exactly ONE of the sections below
-; 1: MSVC 6
-; !define VS_RUNTIME_DLL ""
-; !define VS_RUNTIME_MANIFEST ""
+!include "MUI.nsh"
 
-; 2: VS 2003
-; !define VS_RUNTIME_DLL "c:\Program Files\Microsoft Visual Studio .NET 2003\SDK\v1.1\Bin\msvcr71.dll"
-;!define VS_RUNTIME_MANIFEST ""
+!define VS_REDIST_FULL "c:\Program Files (x86)\Microsoft Visual Studio ${VSVER}.0\VC\redist\1033\${VS_REDIST_EXE}"
 
-; 3: VS 2005
-;!define VS_RUNTIME_DLL      "c:\Program Files\Microsoft Visual Studio 8\VC\redist\x86\Microsoft.VC80.CRT\msvcr80.dll"
-;!define VS_RUNTIME_MANIFEST "c:\Program Files\Microsoft Visual Studio 8\VC\redist\x86\Microsoft.VC80.CRT\Microsoft.VC80.CRT.manifest"
+; 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
 
-; 4: VS 2008
-;!define VS_RUNTIME_DLL      "c:\Program Files\Microsoft Visual Studio 9.0\VC\redist\x86\Microsoft.VC90.CRT\msvc*90.dll"
-;!define VS_RUNTIME_MANIFEST "c:\Program Files\Microsoft Visual Studio 9.0\VC\redist\x86\Microsoft.VC90.CRT\Microsoft.VC90.CRT.manifest"
+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
 
-; 5: VS 2013
-;!define VS_RUNTIME_DLL      "c:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\x86\Microsoft.VC120.CRT\msvc*.dll"
-;!define VS_RUNTIME_MANIFEST  ""
+InstallDir "$PROGRAMFILES\YAZ"
+!endif
 
+!if "${VSVER}" = "14"
+!define VS_REDIST_EXE vc_redist.${VSARCH}.exe
+!else
+!define VS_REDIST_EXE vcredist_${VSARCH}.exe
+!endif
 
-!include "MUI.nsh"
+RequestExecutionLevel admin
 
 SetCompressor bzip2
 
@@ -102,14 +116,18 @@ SectionEnd ; end of default section
 
 Section "YAZ Runtime" YAZ_Runtime
 	SectionIn 1 2
+	SetOutPath $INSTDIR\bin
+!if "${VS_REDIST_FULL}" != ""
+	File "${VS_REDIST_FULL}"
+	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
 	ExecWait '"$INSTDIR\bin\yaz-ztest.exe" -remove'
 Noservice:
-	SetOutPath $INSTDIR\bin
-	File "${VS_RUNTIME_DLL}"
-!if "${VS_RUNTIME_MANIFEST}" != ""
-	File "${VS_RUNTIME_MANIFEST}"
-!endif
 	File ..\bin\*.dll
 	File ..\bin\*.exe
 	SetOutPath $SMPROGRAMS\YAZ
@@ -179,17 +197,22 @@ Section "YAZ4J" YAZ4J
 	File /nonfatal ..\java\yaz4j.jar
 SectionEnd
 
+Section "YAZ Path" YAZ_PATH
+	SectionIn 1 2
+	${EnvVarUpdate} $0 "PATH" "A" "HKLM" "$INSTDIR\bin"
+SectionEnd
+
 ; begin uninstall settings/section
 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 
 		MessageBox MB_OK|MB_ICONEXCLAMATION \
                  "Note: $INSTDIR could not be removed."
@@ -205,6 +228,7 @@ LangString DESC_YAZ_Development ${LANG_ENGLISH} "Header files and import librari
 LangString DESC_YAZ_Documentation ${LANG_ENGLISH} "YAZ Users' guide and reference in HTML. Describes both YAZ applications and the API."
 LangString DESC_YAZ_Source ${LANG_ENGLISH} "Source code of YAZ. Required if you need to rebuild YAZ (for debugging purposes)."
 LangString DESC_YAZ4J ${LANG_ENGLISH} "Java wrapper for the ZOOM API of YAZ."
+LangString DESC_YAZ_PATH ${LANG_ENGLISH} "Update PATH to include binaries of YAZ."
 
 ;Assign language strings to sections
 !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
@@ -213,6 +237,7 @@ LangString DESC_YAZ4J ${LANG_ENGLISH} "Java wrapper for the ZOOM API of YAZ."
 !insertmacro MUI_DESCRIPTION_TEXT ${YAZ_Documentation} $(DESC_YAZ_Documentation)
 !insertmacro MUI_DESCRIPTION_TEXT ${YAZ_Source} $(DESC_YAZ_Source)
 !insertmacro MUI_DESCRIPTION_TEXT ${YAZ4J} $(DESC_YAZ4J)
+!insertmacro MUI_DESCRIPTION_TEXT ${YAZ_PATH} $(DESC_YAZ_PATH)
 !insertmacro MUI_FUNCTION_DESCRIPTION_END
 
 ; eof