X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=win%2Fzebra.nsi;h=f20b718d5f0ef3141fab17c74bd478bcc02faf30;hp=bbd6406b9a9a72af57141439d39ff44b59ed642a;hb=c8990c69b37a60e142ebe74befca0e60cd0754c0;hpb=5d1021b2b70231c8f36fd7ec4583c4816a4f25d6

diff --git a/win/zebra.nsi b/win/zebra.nsi
index bbd6406..f20b718 100644
--- a/win/zebra.nsi
+++ b/win/zebra.nsi
@@ -1,16 +1,26 @@
-; $Id: zebra.nsi,v 1.45 2007-12-19 13:38:23 adam Exp $
+!include version.nsi
 
-!define VERSION "2.0.20"
+; Microsoft runtime CRT
+; Uncomment exactly ONE of the sections below
+; 1: MSVC 6
+; !define VS_RUNTIME_DLL ""
+; !define VS_RUNTIME_MANIFEST ""
 
-; VS 2005
+; 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 2003
-; !define VS_RUNTIME_DLL "c:\Program files\Microsoft Visual Studio .NET 2003\SDK\v1.1\Bin\msvcr71.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"
 
-; VS 6.0
-; (no defines)
+; 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"
 
@@ -78,20 +88,16 @@ 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
+!if "${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\libxslt.dll
-	File ..\bin\yaz3.dll
+	File ..\bin\yaz*.dll
+	File ..\bin\icu*.dll
 	File ..\bin\libexpat.dll
 SectionEnd
 
@@ -108,7 +114,7 @@ SectionEnd
 Section "Zebra Documentation"
 	SectionIn 1 2
 	SetOutPath $INSTDIR\doc
-	File /r ..\doc\*.html
+	File /nonfatal /r ..\doc\*.html
 	File /r ..\doc\*.png
 	File /r ..\doc\*.xml
 	File /r ..\doc\*.xsl
@@ -128,8 +134,11 @@ 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