X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=win%2Fzebra.nsi;h=192711e733fd51603d3329be268c87bcd9b97ff5;hp=059c9bba0478b9e6163bd85035a5a545fd93c7a3;hb=a46626a5becb4d5e0b16846d783dfe9befe7d61c;hpb=b5e0f092ff4326645b09ddcac88da36008572304

diff --git a/win/zebra.nsi b/win/zebra.nsi
index 059c9bb..192711e 100644
--- a/win/zebra.nsi
+++ b/win/zebra.nsi
@@ -1,7 +1,14 @@
-; $Id: zebra.nsi,v 1.28 2006-05-24 19:12:47 adam Exp $
+!define VERSION "2.0.33"
 
-!define VERSION "1.4.0"
-!define VS_RUNTIME_LOCATION "c:\Program Files\Microsoft Visual Studio .NET 2003\SDK\v1.1\Bin"
+; 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"
+
+; VS 2003
+; !define VS_RUNTIME_DLL "c:\Program files\Microsoft Visual Studio .NET 2003\SDK\v1.1\Bin\msvcr71.dll"
+
+; VS 6.0
+; (no defines)
 
 !include "MUI.nsh"
 
@@ -69,13 +76,23 @@ SectionEnd ; end of default section
 Section "Zebra Runtime"
 	SectionIn 1 2
 	SetOutPath $INSTDIR\bin
+!ifdef VS_RUNTIME_DLL
+	File "${VS_RUNTIME_DLL}"
+!endif
+!ifdef VS_RUNTIME_MANIFEST
+	File "${VS_RUNTIME_MANIFEST}"
+	File ..\bin\*.manifest
+!endif
 	File ..\bin\*.exe
+	File ..\bin\idzebra.dll
 	File ..\bin\iconv.dll
 	File ..\bin\zlib1.dll
 	File ..\bin\libxml2.dll
-	File ..\bin\yaz.dll
+	File ..\bin\libxslt.dll
+	File ..\bin\yaz3.dll
 	File ..\bin\libexpat.dll
-	File "${VS_RUNTIME_LOCATION}\msvcr71.dll"
+	File ..\bin\icu*.dll
+	File ..\bin\yaz_icu3.dll
 SectionEnd
 
 Section "Zebra Development"
@@ -91,11 +108,10 @@ SectionEnd
 Section "Zebra Documentation"
 	SectionIn 1 2
 	SetOutPath $INSTDIR\doc
-	File ..\doc\*.html
-	File ..\doc\*.png
-	File ..\doc\*.xml
-	File ..\doc\*.in
-	File ..\doc\*.xsl
+	File /r ..\doc\*.html
+	File /r ..\doc\*.png
+	File /r ..\doc\*.xml
+	File /r ..\doc\*.xsl
 	SetOutPath "$SMPROGRAMS\Index Data\Zebra\"
 	CreateShortCut "$SMPROGRAMS\Index Data\Zebra\HTML Documentation.lnk" \
                  "$INSTDIR\doc\index.html"
@@ -107,7 +123,7 @@ Section "Zebra Examples"
 	SetOutPath $INSTDIR
 
 	File /r ..\test
-	File /r ..\examples
+	File /r /x *.mf /x *.LCK ..\examples
 SectionEnd
 
 Section "Zebra Source"
@@ -129,9 +145,6 @@ Section "Zebra Source"
 	File ..\isamb\*.c
 	SetOutPath $INSTDIR\data1
 	File ..\data1\*.c
-	SetOutPath $INSTDIR\recctrl
-	File ..\recctrl\*.c
-	File ..\recctrl\*.h
 	SetOutPath $INSTDIR\dict
 	File ..\dict\*.c
 	File ..\dict\*.h