X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=win%2Fzebra.nsi;h=a3857169cf23f5d9976fdbea9c5a029801e51b4f;hp=eb231bac69fbdcb6f963350ed799ad270a1bede1;hb=b0e96fd39e829ed6efb70a27999986fab11301f6;hpb=08ba6b946fdd92b78ac2ee6712281c96cd712335

diff --git a/win/zebra.nsi b/win/zebra.nsi
index eb231ba..a385716 100644
--- a/win/zebra.nsi
+++ b/win/zebra.nsi
@@ -1,13 +1,13 @@
-; $Id: zebra.nsi,v 1.29 2006-06-07 11:20:03 adam Exp $
+; $Id: zebra.nsi,v 1.35 2006-09-22 12:44:04 adam Exp $
 
-!define VERSION "1.4.0"
-
-; Microsoft runtime CRT
-; VS 2003
-; !define VS_RUNTIME "c:\Program Files\Microsoft Visual Studio .NET 2003\SDK\v1.1\Bin\msvcr71.dll"
+!define VERSION "2.0.2"
 
 ; VS 2005
-!define VS_RUNTIME "c:\Program Files\Microsoft Visual Studio 8\VC\redist\x86\Microsoft.VC80.CRT\msvcr80.dll"
+; !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"
 
 !include "MUI.nsh"
 
@@ -75,13 +75,17 @@ SectionEnd ; end of default section
 Section "Zebra Runtime"
 	SectionIn 1 2
 	SetOutPath $INSTDIR\bin
+	File "${VS_RUNTIME_DLL}"
+; File "${VS_RUNTIME_MANIFEST}"
 	File ..\bin\*.exe
+; File ..\bin\*.manifest
+	File ..\bin\idzebra.dll
 	File ..\bin\iconv.dll
 	File ..\bin\zlib1.dll
 	File ..\bin\libxml2.dll
+	File ..\bin\libxslt.dll
 	File ..\bin\yaz.dll
 	File ..\bin\libexpat.dll
-	File "${VS_RUNTIME}"
 SectionEnd
 
 Section "Zebra Development"
@@ -97,11 +101,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"
@@ -113,7 +116,7 @@ Section "Zebra Examples"
 	SetOutPath $INSTDIR
 
 	File /r ..\test
-	File /r ..\examples
+	File /r /x *.mf /x *.LCK ..\examples
 SectionEnd
 
 Section "Zebra Source"
@@ -135,9 +138,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