IDMETA and mk_version.tcl part of Windows package

[idzebra-moved-to-github.git] / win / zebra.nsi

diff --git a/win/zebra.nsi b/win/zebra.nsi
index 1c84b90..f4d2674 100644 (file)
--- a/win/zebra.nsi
+++ b/win/zebra.nsi
@@ -1,13 +1,22 @@
-; $Id: zebra.nsi,v 1.41 2007-05-09 07:36:06 adam Exp $
+!include version.nsi
 
-!define VERSION "2.0.14"
+; 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"
+
+; 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"
 
@@ -76,15 +85,15 @@ Section "Zebra Runtime"
        SectionIn 1 2
        SetOutPath $INSTDIR\bin
        File "${VS_RUNTIME_DLL}"
-; File "${VS_RUNTIME_MANIFEST}"
+       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\yaz3.dll
+       File ..\bin\yaz*.dll
+       File ..\bin\icu*.dll
        File ..\bin\libexpat.dll
 SectionEnd
 
@@ -121,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