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

diff --git a/win/zebra.nsi b/win/zebra.nsi
index eb231ba..f20b718 100644
--- a/win/zebra.nsi
+++ b/win/zebra.nsi
@@ -1,13 +1,26 @@
-; $Id: zebra.nsi,v 1.29 2006-06-07 11:20:03 adam Exp $
-
-!define VERSION "1.4.0"
+!include version.nsi
 
 ; Microsoft runtime CRT
-; VS 2003
-; !define VS_RUNTIME "c:\Program Files\Microsoft Visual Studio .NET 2003\SDK\v1.1\Bin\msvcr71.dll"
+; 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"
 
-; VS 2005
-!define VS_RUNTIME "c:\Program Files\Microsoft Visual Studio 8\VC\redist\x86\Microsoft.VC80.CRT\msvcr80.dll"
+; 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"
+
+; 5: VS 2013
+!define VS_RUNTIME_DLL      "c:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\x86\Microsoft.VC120.CRT\msvc*.dll"
+!define VS_RUNTIME_MANIFEST  ""
 
 !include "MUI.nsh"
 
@@ -75,13 +88,17 @@ SectionEnd ; end of default section
 Section "Zebra Runtime"
 	SectionIn 1 2
 	SetOutPath $INSTDIR\bin
+	File "${VS_RUNTIME_DLL}"
+!if "${VS_RUNTIME_MANIFEST}" != ""
+	File "${VS_RUNTIME_MANIFEST}"
+!endif
 	File ..\bin\*.exe
-	File ..\bin\iconv.dll
-	File ..\bin\zlib1.dll
+	File ..\bin\idzebra.dll
 	File ..\bin\libxml2.dll
-	File ..\bin\yaz.dll
+	File ..\bin\libxslt.dll
+	File ..\bin\yaz*.dll
+	File ..\bin\icu*.dll
 	File ..\bin\libexpat.dll
-	File "${VS_RUNTIME}"
 SectionEnd
 
 Section "Zebra Development"
@@ -97,11 +114,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 /nonfatal /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,13 +129,16 @@ Section "Zebra Examples"
 	SetOutPath $INSTDIR
 
 	File /r ..\test
-	File /r ..\examples
+	File /r /x *.mf /x *.LCK ..\examples
 SectionEnd
 
 Section "Zebra Source"
 	SectionIn 1
+	SetOutPath $INSTDIR
+	File ..\IDMETA
 	SetOutPath $INSTDIR\util
 	File ..\util\*.c
+	File ..\util\*.tcl
 	SetOutPath $INSTDIR\dfa
 	File ..\dfa\*.c
 	File ..\dfa\*.h
@@ -135,9 +154,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