X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=win%2Fyaz.nsi;h=444b146ba518fa55b18e70d5ac1c9a4df28d6245;hp=90fc7bd24992c4745ec9a1b4607739af67a6782d;hb=4e58607ee6ef2a5d183262b9a87415fed2311c85;hpb=6deaadd7501d45aaf921edb7526689d1b95681a6

diff --git a/win/yaz.nsi b/win/yaz.nsi
index 90fc7bd..444b146 100644
--- a/win/yaz.nsi
+++ b/win/yaz.nsi
@@ -1,7 +1,22 @@
-; $Id: yaz.nsi,v 1.85 2006-06-02 13:31:21 adam Exp $
+; This file is part of the YAZ toolkit.
+; Copyright (C) 1995-2008 Index Data
+
+!include version.nsi
+
+; 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"
 
-!define VERSION "2.1.20"
-!define VS_RUNTIME_LOCATION "c:\Program Files\Microsoft Visual Studio .NET 2003\SDK\v1.1\Bin"
 
 !include "MUI.nsh"
 
@@ -84,12 +99,15 @@ Section "YAZ Runtime" YAZ_Runtime
 	ExecWait '"$INSTDIR\bin\yaz-ztest.exe" -remove'
 Noservice:
 	SetOutPath $INSTDIR\bin
-	File "${VS_RUNTIME_LOCATION}\msvcr71.dll"
+	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\yaz3.dll
+	File ..\bin\icu*.dll
+	File ..\bin\yaz_icu3.dll
 	File ..\bin\*.exe
 	SetOutPath $SMPROGRAMS\YAZ
  	CreateShortCut "$SMPROGRAMS\YAZ\YAZ Client.lnk" \
@@ -108,10 +126,7 @@ Section "YAZ Development" YAZ_Development
 	SetOutPath $INSTDIR\include\yaz
 	File ..\include\yaz\*.h
 	SetOutPath $INSTDIR\lib
-	File ..\lib\yaz.lib
-	File ..\lib\yazd.lib
-	SetOutPath $INSTDIR\bin
-	File ..\bin\yazd.dll
+	File ..\lib\yaz3.lib
 SectionEnd
 
 Section "YAZ Documentation" YAZ_Documentation
@@ -140,7 +155,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