projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update NEWS for 3.0.52
[yaz-moved-to-github.git]
/
win
/
yaz.nsi
diff --git
a/win/yaz.nsi
b/win/yaz.nsi
index
0f55899
..
397ed6e
100644
(file)
--- a/
win/yaz.nsi
+++ b/
win/yaz.nsi
@@
-1,12
+1,13
@@
-; $Id: yaz.nsi,v 1.126 2008-01-14 23:11:53 adam Exp $
+; This file is part of the YAZ toolkit.
+; Copyright (C) 1995-2010 Index Data
-!define VERSION "3.0.20"
+!include version.nsi
; Microsoft runtime CRT
; Uncomment exactly ONE section of the three below
; 1: MSVC 6
; 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"
; 2: VS 2003
; !define VS_RUNTIME_DLL "c:\Program Files\Microsoft Visual Studio .NET 2003\SDK\v1.1\Bin\msvcr71.dll"
@@
-16,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"
;!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"
!include "MUI.nsh"
@@
-104,11
+109,8
@@
Noservice:
File ..\bin\zlib1.dll
File ..\bin\libxml2.dll
File ..\bin\libxslt.dll
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" \
File ..\bin\*.exe
SetOutPath $SMPROGRAMS\YAZ
CreateShortCut "$SMPROGRAMS\YAZ\YAZ Client.lnk" \
@@
-127,7
+129,7
@@
Section "YAZ Development" YAZ_Development
SetOutPath $INSTDIR\include\yaz
File ..\include\yaz\*.h
SetOutPath $INSTDIR\lib
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
SectionEnd
Section "YAZ Documentation" YAZ_Documentation
@@
-156,7
+158,7
@@
Section "YAZ Source" YAZ_Source
File ..\src\*.tcl
File ..\src\*.csv
File ..\src\*.asn
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
SetOutPath $INSTDIR\test
File ..\test\marc*.*
File ..\test\*.sh