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
Fix potential buffer overrun that could occur if SRU charset name
[yaz-moved-to-github.git]
/
win
/
yaz.nsi
diff --git
a/win/yaz.nsi
b/win/yaz.nsi
index
f39fb96
..
3cc13fe
100644
(file)
--- a/
win/yaz.nsi
+++ b/
win/yaz.nsi
@@
-1,9
+1,19
@@
-; $Id: yaz.nsi,v 1.47 2004-05-10 12:32:01 adam Exp $
+; $Id: yaz.nsi,v 1.111 2007-06-02 20:57:12 adam Exp $
-!define VERSION "2.0.20"
+!define VERSION "3.0.5"
+
+; Microsoft runtime CRT
+; VS 2003
+!define VS_RUNTIME_DLL "c:\Program Files\Microsoft Visual Studio .NET 2003\SDK\v1.1\Bin\msvcr71.dll"
+
+; 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"
!include "MUI.nsh"
!include "MUI.nsh"
+SetCompressor bzip2
+
Name "YAZ"
Caption "Index Data YAZ ${VERSION} Setup"
OutFile "yaz_${VERSION}.exe"
Name "YAZ"
Caption "Index Data YAZ ${VERSION} Setup"
OutFile "yaz_${VERSION}.exe"
@@
-81,8
+91,15
@@
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_DLL}"
+; File "${VS_RUNTIME_MANIFEST}"
+ File ..\bin\iconv.dll
+ File ..\bin\zlib1.dll
+ File ..\bin\libxml2.dll
+ File ..\bin\libxslt.dll
+ File ..\bin\yaz3.dll
+; File ..\bin\*.manifest
File ..\bin\*.exe
File ..\bin\*.exe
- File ..\bin\*.dll
SetOutPath $SMPROGRAMS\YAZ
CreateShortCut "$SMPROGRAMS\YAZ\YAZ Client.lnk" \
"$INSTDIR\bin\yaz-client.exe"
SetOutPath $SMPROGRAMS\YAZ
CreateShortCut "$SMPROGRAMS\YAZ\YAZ Client.lnk" \
"$INSTDIR\bin\yaz-client.exe"
@@
-100,52
+117,45
@@
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\*.lib
+ File ..\lib\yaz3.lib
SectionEnd
Section "YAZ Documentation" YAZ_Documentation
SectionIn 1 2
SetOutPath $INSTDIR\doc
SectionEnd
Section "YAZ Documentation" YAZ_Documentation
SectionIn 1 2
SetOutPath $INSTDIR\doc
- File ..\doc\*.html
- File ..\doc\*.png
- File ..\doc\*.pdf
- File ..\doc\*.xml
- File ..\doc\*.in
- File ..\doc\*.dsl
- File ..\doc\*.xsl
- File ..\doc\*.css
+ File /r ..\doc\*.css
+ File /r ..\doc\*.ent
+ File /r ..\doc\*.html
+ File /r ..\doc\*.xml
+ File /r ..\doc\*.png
+ File /r ..\doc\*.xsl
SetOutPath $SMPROGRAMS\YAZ
CreateShortCut "$SMPROGRAMS\YAZ\HTML Documentation.lnk" \
SetOutPath $SMPROGRAMS\YAZ
CreateShortCut "$SMPROGRAMS\YAZ\HTML Documentation.lnk" \
- "$INSTDIR\doc\yaz.html"
- CreateShortCut "$SMPROGRAMS\YAZ\PDF Documentaion.lnk" \
- "$INSTDIR\doc\yaz.pdf"
+ "$INSTDIR\doc\index.html"
SectionEnd
Section "YAZ Source" YAZ_Source
SectionIn 1
SectionEnd
Section "YAZ Source" YAZ_Source
SectionIn 1
+ SetOutPath $INSTDIR
+ File /r ..\*.c
+ File /r /x yaz ..\*.h
SetOutPath $INSTDIR\util
SetOutPath $INSTDIR\util
- File ..\util\*.c
File ..\util\yaz-asncomp
SetOutPath $INSTDIR\src
File ..\util\yaz-asncomp
SetOutPath $INSTDIR\src
- File ..\src\*.c
- File ..\src\*.h
File ..\src\*.y
File ..\src\*.tcl
File ..\src\*.y
File ..\src\*.tcl
+ File ..\src\*.csv
File ..\src\*.asn
File ..\src\*.asn
- File ..\src\charconv.sgm
File ..\src\codetables.xml
File ..\src\codetables.xml
- SetOutPath $INSTDIR\zoom
- File ..\zoom\*.c
- SetOutPath $INSTDIR\ztest
- File ..\ztest\*.c
- SetOutPath $INSTDIR\client
- File ..\client\*.c
- File ..\client\*.h
+ SetOutPath $INSTDIR\test
+ File ..\test\marc*.*
+ File ..\test\*.sh
+ File ..\test\*.xml
+ File ..\test\*.asn
SetOutPath $INSTDIR\win
File makefile
File *.nsi
File *.rc
SetOutPath $INSTDIR\win
File makefile
File *.nsi
File *.rc
- File *.h
SectionEnd
; begin uninstall settings/section
SectionEnd
; begin uninstall settings/section
@@
-171,7
+181,7
@@
SectionEnd
;Language strings
LangString DESC_YAZ_Runtime ${LANG_ENGLISH} "YAZ runtime files needed in order for YAZ to run, such as DLLs."
LangString DESC_YAZ_Development ${LANG_ENGLISH} "Header files and import libraries required for developing software using YAZ."
;Language strings
LangString DESC_YAZ_Runtime ${LANG_ENGLISH} "YAZ runtime files needed in order for YAZ to run, such as DLLs."
LangString DESC_YAZ_Development ${LANG_ENGLISH} "Header files and import libraries required for developing software using YAZ."
-LangString DESC_YAZ_Documentation ${LANG_ENGLISH} "YAZ Users' guide and reference in HTML and PDF. Describes both YAZ applications and the API."
+LangString DESC_YAZ_Documentation ${LANG_ENGLISH} "YAZ Users' guide and reference in HTML. Describes both YAZ applications and the API."
LangString DESC_YAZ_Source ${LANG_ENGLISH} "Source code of YAZ. Required if you need to rebuild YAZ (for debugging purposes)."
;Assign language strings to sections
LangString DESC_YAZ_Source ${LANG_ENGLISH} "Source code of YAZ. Required if you need to rebuild YAZ (for debugging purposes)."
;Assign language strings to sections