X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=win%2Fyaz.nsi;h=8ca4735746981ef6e8391458c1dc65f392ab5362;hp=2e81a0b737c3aefc4c7d24fca5cd0273ab233ef5;hb=e2a9f7ce085c4c39cf1689f30a860fb6445cd346;hpb=473824797f568578dc17d7242551cb2f7ccef46c

diff --git a/win/yaz.nsi b/win/yaz.nsi
index 2e81a0b..8ca4735 100644
--- a/win/yaz.nsi
+++ b/win/yaz.nsi
@@ -2,6 +2,7 @@
 ; Copyright (C) Index Data
 ; See the file LICENSE for details.
 
+!include EnvVarUpdate.nsh
 !include version.nsi
 
 ; Microsoft runtime CRT 
@@ -22,6 +23,10 @@
 ;!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"
 
+; 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  ""
+
 
 !include "MUI.nsh"
 
@@ -103,7 +108,9 @@ Section "YAZ Runtime" YAZ_Runtime
 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
@@ -168,9 +175,14 @@ SectionEnd
 Section "YAZ4J" YAZ4J
 	SectionIn 1 2
 	SetOutPath $INSTDIR\bin
-	File ..\bin\yaz4j.dll
+	File /nonfatal ..\bin\yaz4j.dll
 	SetOutPath $INSTDIR\java
-	File ..\java\yaz4j.jar
+	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
@@ -184,6 +196,7 @@ Section Uninstall
 	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."
@@ -199,6 +212,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
@@ -207,6 +221,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