Windows: Change check for vcredist YAZ-848

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

diff --git a/win/yaz.nsi b/win/yaz.nsi
index d92440c..5a9f62f 100644 (file)
--- a/win/yaz.nsi
+++ b/win/yaz.nsi
@@ -1,27 +1,10 @@
 ; This file is part of the YAZ toolkit.
-; Copyright (C) 1995-2010 Index Data
+; 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 ""
-
-; 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 ""
-
-; 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"
-
-; 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"
-
-
 !include "MUI.nsh"
 
 SetCompressor bzip2
@@ -37,7 +20,6 @@ ComponentText "This will install the YAZ Toolkit on your computer:"
 InstType "Full (w/ Source)"
 InstType "Lite (w/o Source)"
 
-InstallDir "$PROGRAMFILES\YAZ"
 InstallDirRegKey HKLM "SOFTWARE\Index Data\YAZ" ""
 
 
@@ -98,18 +80,19 @@ 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}"
-       File "${VS_RUNTIME_MANIFEST}"
-       File ..\bin\iconv.dll
-       File ..\bin\zlib1.dll
-       File ..\bin\libxml2.dll
-       File ..\bin\libxslt.dll
-       File ..\bin\icu*.dll
-       File ..\bin\yaz*.dll
+       File ..\bin\*.dll
        File ..\bin\*.exe
        SetOutPath $SMPROGRAMS\YAZ
        CreateShortCut "$SMPROGRAMS\YAZ\YAZ Client.lnk" \
@@ -134,12 +117,12 @@ SectionEnd
 Section "YAZ Documentation" YAZ_Documentation
        SectionIn 1 2
        SetOutPath $INSTDIR\doc
-       File /r ..\doc\*.css
-       File /r ..\doc\*.ent
-       File /r ..\doc\*.html
+       File /nonfatal /r ..\doc\*.css
+       File /nonfatal /r ..\doc\*.ent
+       File /nonfatal /r ..\doc\*.html
        File /r ..\doc\*.xml
        File /r ..\doc\*.png
-       File /r ..\doc\*.xsl
+       File /nonfatal /r ..\doc\*.xsl
        SetOutPath $SMPROGRAMS\YAZ
        CreateShortCut "$SMPROGRAMS\YAZ\HTML Documentation.lnk" \
                  "$INSTDIR\doc\index.html"
@@ -148,6 +131,7 @@ SectionEnd
 Section "YAZ Source" YAZ_Source
        SectionIn 1
        SetOutPath $INSTDIR
+       File ..\IDMETA
        File /r ..\*.c
        File /r /x yaz ..\*.h
        SetOutPath $INSTDIR\util
@@ -169,6 +153,19 @@ Section "YAZ Source" YAZ_Source
        File *.rc
 SectionEnd
 
+Section "YAZ4J" YAZ4J
+       SectionIn 1 2
+       SetOutPath $INSTDIR\bin
+       File /nonfatal ..\bin\yaz4j.dll
+       SetOutPath $INSTDIR\java
+       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"
 
@@ -180,6 +177,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."
@@ -194,6 +192,8 @@ LangString DESC_YAZ_Runtime ${LANG_ENGLISH} "YAZ runtime files needed in order f
 LangString DESC_YAZ_Development ${LANG_ENGLISH} "Header files and import libraries required for developing software using YAZ."
 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
@@ -201,6 +201,8 @@ LangString DESC_YAZ_Source ${LANG_ENGLISH} "Source code of YAZ. Required if you
 !insertmacro MUI_DESCRIPTION_TEXT ${YAZ_Development} $(DESC_YAZ_Development)
 !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