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
IDMETA part of Windows package
[yaz-moved-to-github.git]
/
win
/
yaz.nsi
diff --git
a/win/yaz.nsi
b/win/yaz.nsi
index
cd38bf5
..
e6461b1
100644
(file)
--- a/
win/yaz.nsi
+++ b/
win/yaz.nsi
@@
-1,5
+1,5
@@
; This file is part of the YAZ toolkit.
; This file is part of the YAZ toolkit.
-; Copyright (C) 1995-2010 Index Data
+; Copyright (C) 1995-2011 Index Data
!include version.nsi
!include version.nsi
@@
-18,8
+18,8
@@
;!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_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"
+;!define VS_RUNTIME_DLL "c:\Program Files\Microsoft Visual Studio 9.0\VC\redist\x86\Microsoft.VC90.CRT\msvc*90.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"
@@
-37,7
+37,6
@@
ComponentText "This will install the YAZ Toolkit on your computer:"
InstType "Full (w/ Source)"
InstType "Lite (w/o Source)"
InstType "Full (w/ Source)"
InstType "Lite (w/o Source)"
-InstallDir "$PROGRAMFILES\YAZ"
InstallDirRegKey HKLM "SOFTWARE\Index Data\YAZ" ""
InstallDirRegKey HKLM "SOFTWARE\Index Data\YAZ" ""
@@
-87,7
+86,6
@@
Section "" ; (default section)
File ..\NEWS
SetOutPath $INSTDIR
SetOutPath $INSTDIR\ztest
File ..\NEWS
SetOutPath $INSTDIR
SetOutPath $INSTDIR\ztest
- File ..\ztest\dummy-records
File ..\ztest\dummy-grs
File ..\ztest\dummy-words
SetOutPath $INSTDIR\etc
File ..\ztest\dummy-grs
File ..\ztest\dummy-words
SetOutPath $INSTDIR\etc
@@
-105,12
+103,7
@@
Noservice:
SetOutPath $INSTDIR\bin
File "${VS_RUNTIME_DLL}"
File "${VS_RUNTIME_MANIFEST}"
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\icu*.dll
- File ..\bin\yaz*.dll
+ File ..\bin\*.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" \
@@
-135,12
+128,12
@@
SectionEnd
Section "YAZ Documentation" YAZ_Documentation
SectionIn 1 2
SetOutPath $INSTDIR\doc
Section "YAZ Documentation" YAZ_Documentation
SectionIn 1 2
SetOutPath $INSTDIR\doc
- File /r ..\doc\*.css
- File /r ..\doc\*.ent
- File /r ..\doc\*.html
+ File /nonfatal /r ..\doc\*.css
+ File /nonfatal /r ..\doc\*.ent
+ File /nonfatal /r ..\doc\*.html
File /r ..\doc\*.xml
File /r ..\doc\*.png
File /r ..\doc\*.xml
File /r ..\doc\*.png
- File /r ..\doc\*.xsl
+ File /nonfatal /r ..\doc\*.xsl
SetOutPath $SMPROGRAMS\YAZ
CreateShortCut "$SMPROGRAMS\YAZ\HTML Documentation.lnk" \
"$INSTDIR\doc\index.html"
SetOutPath $SMPROGRAMS\YAZ
CreateShortCut "$SMPROGRAMS\YAZ\HTML Documentation.lnk" \
"$INSTDIR\doc\index.html"
@@
-149,6
+142,8
@@
SectionEnd
Section "YAZ Source" YAZ_Source
SectionIn 1
SetOutPath $INSTDIR
Section "YAZ Source" YAZ_Source
SectionIn 1
SetOutPath $INSTDIR
+ File ..\configure.ac
+ File ..\IDMETA
File /r ..\*.c
File /r /x yaz ..\*.h
SetOutPath $INSTDIR\util
File /r ..\*.c
File /r /x yaz ..\*.h
SetOutPath $INSTDIR\util