X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=win%2Fzebra.nsi;h=f4d26748cee8aefcc8448affab00e0a5e718e9f3;hp=15189c2b3f270c24a9e65254b8e8592ec9ad184b;hb=d513d15e315601b730b0b3a6126c3163d00223fb;hpb=734bbc43bb8ad9deabf59186c0e9b1ca1b7ea664

diff --git a/win/zebra.nsi b/win/zebra.nsi
index 15189c2..f4d2674 100644
--- a/win/zebra.nsi
+++ b/win/zebra.nsi
@@ -1,16 +1,22 @@
-; $Id: zebra.nsi,v 1.50 2008-03-05 09:29:10 adam Exp $
+!include version.nsi
 
-!define VERSION "2.0.30"
+; Microsoft runtime CRT 
+; Uncomment exactly ONE of the sections below
+; 1: MSVC 6
+; !define VS_RUNTIME_DLL ""
+; !define VS_RUNTIME_MANIFEST ""
 
-; 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"
+; 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 ""
 
-; VS 2003
-; !define VS_RUNTIME_DLL "c:\Program files\Microsoft Visual Studio .NET 2003\SDK\v1.1\Bin\msvcr71.dll"
+; 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 6.0
-; (no defines)
+; 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"
 
 !include "MUI.nsh"
 
@@ -78,25 +84,17 @@ 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\libxslt.dll
-	File ..\bin\yaz3.dll
+	File ..\bin\yaz*.dll
+	File ..\bin\icu*.dll
 	File ..\bin\libexpat.dll
-	File ..\bin\icudt38.dll
-	File ..\bin\icuin38.dll
-	File ..\bin\icuuc38.dll
-	File ..\bin\yaz_icu3.dll
 SectionEnd
 
 Section "Zebra Development"
@@ -132,8 +130,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