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
Mention SRU rather than SRW (where appropriate).
[yaz-moved-to-github.git]
/
win
/
yaz.nsi
diff --git
a/win/yaz.nsi
b/win/yaz.nsi
index
9f55d8f
..
72f8825
100644
(file)
--- a/
win/yaz.nsi
+++ b/
win/yaz.nsi
@@
-1,4
+1,4
@@
-; $Id: yaz.nsi,v 1.86 2006-06-07 11:18:04 adam Exp $
+; $Id: yaz.nsi,v 1.89 2006-06-07 18:25:32 adam Exp $
!define VERSION "2.1.21"
!define VERSION "2.1.21"
@@
-7,7
+7,8
@@
; !define VS_RUNTIME "c:\Program Files\Microsoft Visual Studio .NET 2003\SDK\v1.1\Bin\msvcr71.dll"
; VS 2005
; !define VS_RUNTIME "c:\Program Files\Microsoft Visual Studio .NET 2003\SDK\v1.1\Bin\msvcr71.dll"
; VS 2005
-!define VS_RUNTIME "c:\Program Files\Microsoft Visual Studio 8\VC\redist\x86\Microsoft.VC80.CRT\msvcr80.dll"
+!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"
!include "MUI.nsh"
!include "MUI.nsh"
@@
-90,12
+91,14
@@
Section "YAZ Runtime" YAZ_Runtime
ExecWait '"$INSTDIR\bin\yaz-ztest.exe" -remove'
Noservice:
SetOutPath $INSTDIR\bin
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\iconv.dll
File ..\bin\zlib1.dll
File ..\bin\libxml2.dll
File ..\bin\libxslt.dll
File ..\bin\yaz.dll
+ File ..\bin\*.manifest
File ..\bin\*.exe
SetOutPath $SMPROGRAMS\YAZ
CreateShortCut "$SMPROGRAMS\YAZ\YAZ Client.lnk" \
File ..\bin\*.exe
SetOutPath $SMPROGRAMS\YAZ
CreateShortCut "$SMPROGRAMS\YAZ\YAZ Client.lnk" \
@@
-115,9
+118,6
@@
Section "YAZ Development" YAZ_Development
File ..\include\yaz\*.h
SetOutPath $INSTDIR\lib
File ..\lib\yaz.lib
File ..\include\yaz\*.h
SetOutPath $INSTDIR\lib
File ..\lib\yaz.lib
- File ..\lib\yazd.lib
- SetOutPath $INSTDIR\bin
- File ..\bin\yazd.dll
SectionEnd
Section "YAZ Documentation" YAZ_Documentation
SectionEnd
Section "YAZ Documentation" YAZ_Documentation