Bundle with Visual Studio 8 by default

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

diff --git a/win/yaz.nsi b/win/yaz.nsi
index ebc4174..9f55d8f 100644 (file)
--- a/win/yaz.nsi
+++ b/win/yaz.nsi
@@ -1,7 +1,13 @@
-; $Id: yaz.nsi,v 1.82 2006-05-03 13:27:20 adam Exp $
+; $Id: yaz.nsi,v 1.86 2006-06-07 11:18:04 adam Exp $
 
-!define VERSION "2.1.19"
-!define VS_RUNTIME_LOCATION "c:\Program Files\Microsoft Visual Studio .NET 2003\SDK\v1.1\Bin"
+!define VERSION "2.1.21"
+
+; Microsoft runtime CRT
+; VS 2003
+; !define VS_RUNTIME "c:\Program Files\Microsoft Visual Studio .NET 2003\SDK\v1.1\Bin\msvcr71.dll"
+
+; VS 2005
+!define VS_RUNTIME "c:\Program Files\Microsoft Visual Studio 8\VC\redist\x86\Microsoft.VC80.CRT\msvcr80.dll"
 
 !include "MUI.nsh"
 
@@ -84,7 +90,7 @@ Section "YAZ Runtime" YAZ_Runtime
        ExecWait '"$INSTDIR\bin\yaz-ztest.exe" -remove'
 Noservice:
        SetOutPath $INSTDIR\bin
-       File "${VS_RUNTIME_LOCATION}\msvcr71.dll"
+       File "${VS_RUNTIME}"
        File ..\bin\iconv.dll
        File ..\bin\zlib1.dll
        File ..\bin\libxml2.dll
@@ -118,19 +124,14 @@ Section "YAZ Documentation" YAZ_Documentation
        SectionIn 1 2
        SetOutPath $INSTDIR\doc
        File /r ..\doc\*.css
-       File /r ..\doc\*.dcl
-       File /r ..\doc\*.dsl
        File /r ..\doc\*.ent
        File /r ..\doc\*.html
-       File /r ..\doc\*.pdf
        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
@@ -180,7 +181,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