X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=win%2Fyaz.nsi;h=6c2b261492f50a6e1d711fa94f61e8b9d27aa0bc;hb=43849124700caab5cd76369c0fea934ca756e3a7;hp=fdd07af27c9abe89bea8b730be0c2ab4db764a98;hpb=24e8ba4deca04c30ead995e4c961f08027e120a9;p=yaz-moved-to-github.git

diff --git a/win/yaz.nsi b/win/yaz.nsi
index fdd07af..6c2b261 100644
--- a/win/yaz.nsi
+++ b/win/yaz.nsi
@@ -1,13 +1,26 @@
-; $Id: yaz.nsi,v 1.87 2006-06-07 14:25:43 adam Exp $
+; This file is part of the YAZ toolkit.
+; Copyright (C) 1995-2010 Index Data
 
-!define VERSION "2.1.21"
+!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"
+; Microsoft runtime CRT 
+; Uncomment exactly ONE section of the three 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"
+
+; 4: VS 2008
+!define VS_RUNTIME_DLL      "c:\Program Files\Microsoft Visual Studio 9\VC\redist\x86\Microsoft.VC90.CRT\msvcr90.dll"
+!define VS_RUNTIME_MANIFEST "c:\Program Files\Microsoft Visual Studio 9\VC\redist\x86\Microsoft.VC90.CRT\Microsoft.VC90.CRT.manifest"
 
-; VS 2005
-!define VS_RUNTIME "c:\Program Files\Microsoft Visual Studio 8\VC\redist\x86\Microsoft.VC80.CRT\msvcr80.dll"
 
 !include "MUI.nsh"
 
@@ -90,13 +103,14 @@ Section "YAZ Runtime" YAZ_Runtime
 	ExecWait '"$INSTDIR\bin\yaz-ztest.exe" -remove'
 Noservice:
 	SetOutPath $INSTDIR\bin
-	File "${VS_RUNTIME}"
+	File "${VS_RUNTIME_DLL}"
+	File "${VS_RUNTIME_MANIFEST}"
 	File ..\bin\iconv.dll
 	File ..\bin\zlib1.dll
 	File ..\bin\libxml2.dll
 	File ..\bin\libxslt.dll
-	File ..\bin\yaz.dll
-	File ..\bin\*.manifest
+	File ..\bin\icu*.dll
+	File ..\bin\yaz*.dll
 	File ..\bin\*.exe
 	SetOutPath $SMPROGRAMS\YAZ
  	CreateShortCut "$SMPROGRAMS\YAZ\YAZ Client.lnk" \
@@ -115,7 +129,7 @@ Section "YAZ Development" YAZ_Development
 	SetOutPath $INSTDIR\include\yaz
 	File ..\include\yaz\*.h
 	SetOutPath $INSTDIR\lib
-	File ..\lib\yaz.lib
+	File ..\lib\yaz*.lib
 SectionEnd
 
 Section "YAZ Documentation" YAZ_Documentation
@@ -144,7 +158,7 @@ Section "YAZ Source" YAZ_Source
 	File ..\src\*.tcl
 	File ..\src\*.csv
 	File ..\src\*.asn
-	File ..\src\codetables.xml
+	File ..\src\codetables*.xml
 	SetOutPath $INSTDIR\test
 	File ..\test\marc*.*
 	File ..\test\*.sh