X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=win%2Fyaz.nsi;h=397ed6e4f4c96e80c7438baaf35ed2c48ee3bf46;hp=0e2b10dd58cfdc7ad936275202e20488e53546ec;hb=03a8e03467d0085ffa2e34d885118fb8fe447149;hpb=635995241e865409ad462e33b0208d3a8ebfb14d

diff --git a/win/yaz.nsi b/win/yaz.nsi
index 0e2b10d..397ed6e 100644
--- a/win/yaz.nsi
+++ b/win/yaz.nsi
@@ -1,13 +1,13 @@
 ; This file is part of the YAZ toolkit.
-; Copyright (C) 1995-2008 Index Data
+; Copyright (C) 1995-2010 Index Data
 
-!define VERSION "3.0.32"
+!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 ""
+; !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"
@@ -17,6 +17,10 @@
 ;!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\msvcr90.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"
 
@@ -105,11 +109,8 @@ Noservice:
 	File ..\bin\zlib1.dll
 	File ..\bin\libxml2.dll
 	File ..\bin\libxslt.dll
-	File ..\bin\yaz3.dll
-	File ..\bin\icudt38.dll
-	File ..\bin\icuin38.dll
-	File ..\bin\icuuc38.dll
-	File ..\bin\yaz_icu3.dll
+	File ..\bin\icu*.dll
+	File ..\bin\yaz*.dll
 	File ..\bin\*.exe
 	SetOutPath $SMPROGRAMS\YAZ
  	CreateShortCut "$SMPROGRAMS\YAZ\YAZ Client.lnk" \
@@ -128,7 +129,7 @@ Section "YAZ Development" YAZ_Development
 	SetOutPath $INSTDIR\include\yaz
 	File ..\include\yaz\*.h
 	SetOutPath $INSTDIR\lib
-	File ..\lib\yaz3.lib
+	File ..\lib\yaz*.lib
 SectionEnd
 
 Section "YAZ Documentation" YAZ_Documentation
@@ -157,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