Updated ICU DLLs for Windows dist (nsis)

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

diff --git a/win/yaz.nsi b/win/yaz.nsi
index 348860d..236a995 100644 (file)
--- a/win/yaz.nsi
+++ b/win/yaz.nsi
@@ -1,6 +1,22 @@
-; $Id: yaz.nsi,v 1.56 2004-10-01 13:05:10 adam Exp $
+; This file is part of the YAZ toolkit.
+; Copyright (C) 1995-2008 Index Data
+
+!define VERSION "3.0.36"
+
+; Microsoft runtime CRT 
+; Uncomment exactly ONE section of the three 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"
 
-!define VERSION "2.0.26"
 
 !include "MUI.nsh"
 
@@ -83,11 +99,15 @@ Section "YAZ Runtime" YAZ_Runtime
        ExecWait '"$INSTDIR\bin\yaz-ztest.exe" -remove'
 Noservice:
        SetOutPath $INSTDIR\bin
-       File c:\winnt\system32\msvcr71.dll
+       File "${VS_RUNTIME_DLL}"
+       File "${VS_RUNTIME_MANIFEST}"
        File ..\bin\iconv.dll
-       File ..\bin\zlib.dll
+       File ..\bin\zlib1.dll
        File ..\bin\libxml2.dll
-       File ..\bin\yaz.dll
+       File ..\bin\libxslt.dll
+       File ..\bin\yaz3.dll
+       File ..\bin\icu*.dll
+       File ..\bin\yaz_icu3.dll
        File ..\bin\*.exe
        SetOutPath $SMPROGRAMS\YAZ
        CreateShortCut "$SMPROGRAMS\YAZ\YAZ Client.lnk" \
@@ -106,51 +126,45 @@ Section "YAZ Development" YAZ_Development
        SetOutPath $INSTDIR\include\yaz
        File ..\include\yaz\*.h
        SetOutPath $INSTDIR\lib
-       File ..\lib\yaz.lib
+       File ..\lib\yaz3.lib
 SectionEnd
 
 Section "YAZ Documentation" YAZ_Documentation
        SectionIn 1 2
        SetOutPath $INSTDIR\doc
-       File ..\doc\*.html
-       File ..\doc\*.png
-       File ..\doc\*.pdf
-       File ..\doc\*.xml
-       File ..\doc\*.in
-       File ..\doc\*.dsl
-       File ..\doc\*.xsl
-       File ..\doc\*.css
+       File /r ..\doc\*.css
+       File /r ..\doc\*.ent
+       File /r ..\doc\*.html
+       File /r ..\doc\*.xml
+       File /r ..\doc\*.png
+       File /r ..\doc\*.xsl
        SetOutPath $SMPROGRAMS\YAZ
        CreateShortCut "$SMPROGRAMS\YAZ\HTML Documentation.lnk" \
-                 "$INSTDIR\doc\yaz.html"
-       CreateShortCut "$SMPROGRAMS\YAZ\PDF Documentaion.lnk" \
-                 "$INSTDIR\doc\yaz.pdf"
+                 "$INSTDIR\doc\index.html"
 SectionEnd
 
 Section "YAZ Source" YAZ_Source
        SectionIn 1
+       SetOutPath $INSTDIR
+       File /r ..\*.c
+       File /r /x yaz ..\*.h
        SetOutPath $INSTDIR\util
-       File ..\util\*.c
        File ..\util\yaz-asncomp
        SetOutPath $INSTDIR\src
-       File ..\src\*.c
-       File ..\src\*.h
        File ..\src\*.y
        File ..\src\*.tcl
+       File ..\src\*.csv
        File ..\src\*.asn
        File ..\src\codetables.xml
-       SetOutPath $INSTDIR\zoom
-       File ..\zoom\*.c
-       SetOutPath $INSTDIR\ztest
-       File ..\ztest\*.c
-       SetOutPath $INSTDIR\client
-       File ..\client\*.c
-       File ..\client\*.h
+       SetOutPath $INSTDIR\test
+       File ..\test\marc*.*
+       File ..\test\*.sh
+       File ..\test\*.xml
+       File ..\test\*.asn
        SetOutPath $INSTDIR\win
        File makefile
        File *.nsi
        File *.rc
-       File *.h
 SectionEnd
 
 ; begin uninstall settings/section
@@ -176,7 +190,7 @@ SectionEnd
   ;Language strings
 LangString DESC_YAZ_Runtime ${LANG_ENGLISH} "YAZ runtime files needed in order for YAZ to run, such as DLLs."
 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 and PDF. Describes both YAZ applications and the API."
+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)."
 
 ;Assign language strings to sections