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
Merge branch 'master' of ssh://git.indexdata.com:222/home/git/pub/yaz
[yaz-moved-to-github.git]
/
win
/
yaz.nsi
diff --git
a/win/yaz.nsi
b/win/yaz.nsi
index
638c7bb
..
a994b5d
100644
(file)
--- a/
win/yaz.nsi
+++ b/
win/yaz.nsi
@@
-1,13
+1,14
@@
; This file is part of the YAZ toolkit.
; This file is part of the YAZ toolkit.
-; Copyright (C) 1995-2008 Index Data
+; Copyright (C) Index Data
+; See the file LICENSE for details.
-!define VERSION "3.0.28"
+!include version.nsi
; Microsoft runtime CRT
; Microsoft runtime CRT
-; Uncomment exactly ONE section of the three below
+; Uncomment exactly ONE of the sections below
; 1: MSVC 6
; 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"
@@
-17,6
+18,14
@@
;!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\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"
+
+; 5: VS 2013
+;!define VS_RUNTIME_DLL "c:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\redist\x86\Microsoft.VC120.CRT\msvc*.dll"
+;!define VS_RUNTIME_MANIFEST ""
+
!include "MUI.nsh"
!include "MUI.nsh"
@@
-33,7
+42,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" ""
@@
-74,7
+82,7
@@
Section "" ; (default section)
CreateShortCut "$SMPROGRAMS\YAZ\YAZ Program Directory.lnk" \
"$INSTDIR"
WriteINIStr "$SMPROGRAMS\YAZ\YAZ Home page.url" \
CreateShortCut "$SMPROGRAMS\YAZ\YAZ Program Directory.lnk" \
"$INSTDIR"
WriteINIStr "$SMPROGRAMS\YAZ\YAZ Home page.url" \
- "InternetShortcut" "URL" "http://www.indexdata.dk/yaz/"
+ "InternetShortcut" "URL" "http://www.indexdata.com/yaz/"
CreateShortCut "$SMPROGRAMS\YAZ\Uninstall YAZ.lnk" \
"$INSTDIR\uninst.exe"
SetOutPath $INSTDIR
CreateShortCut "$SMPROGRAMS\YAZ\Uninstall YAZ.lnk" \
"$INSTDIR\uninst.exe"
SetOutPath $INSTDIR
@@
-83,7
+91,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
@@
-100,16
+107,10
@@
Section "YAZ Runtime" YAZ_Runtime
Noservice:
SetOutPath $INSTDIR\bin
File "${VS_RUNTIME_DLL}"
Noservice:
SetOutPath $INSTDIR\bin
File "${VS_RUNTIME_DLL}"
+!if "${VS_RUNTIME_MANIFEST}" != ""
File "${VS_RUNTIME_MANIFEST}"
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\icudt38.dll
- File ..\bin\icuin38.dll
- File ..\bin\icuuc38.dll
- File ..\bin\yaz_icu3.dll
+!endif
+ 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" \
@@
-128,18
+129,18
@@
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
SectionIn 1 2
SetOutPath $INSTDIR\doc
SectionEnd
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"
@@
-148,6
+149,7
@@
SectionEnd
Section "YAZ Source" YAZ_Source
SectionIn 1
SetOutPath $INSTDIR
Section "YAZ Source" YAZ_Source
SectionIn 1
SetOutPath $INSTDIR
+ File ..\IDMETA
File /r ..\*.c
File /r /x yaz ..\*.h
SetOutPath $INSTDIR\util
File /r ..\*.c
File /r /x yaz ..\*.h
SetOutPath $INSTDIR\util
@@
-157,7
+159,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
@@
-169,6
+171,14
@@
Section "YAZ Source" YAZ_Source
File *.rc
SectionEnd
File *.rc
SectionEnd
+Section "YAZ4J" YAZ4J
+ SectionIn 1 2
+ SetOutPath $INSTDIR\bin
+ File /nonfatal ..\bin\yaz4j.dll
+ SetOutPath $INSTDIR\java
+ File /nonfatal ..\java\yaz4j.jar
+SectionEnd
+
; begin uninstall settings/section
UninstallText "This will uninstall YAZ ${VERSION} from your system"
; begin uninstall settings/section
UninstallText "This will uninstall YAZ ${VERSION} from your system"
@@
-194,6
+204,7
@@
LangString DESC_YAZ_Runtime ${LANG_ENGLISH} "YAZ runtime files needed in order f
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. 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)."
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. 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)."
+LangString DESC_YAZ4J ${LANG_ENGLISH} "Java wrapper for the ZOOM API of YAZ."
;Assign language strings to sections
!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
;Assign language strings to sections
!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
@@
-201,6
+212,7
@@
LangString DESC_YAZ_Source ${LANG_ENGLISH} "Source code of YAZ. Required if you
!insertmacro MUI_DESCRIPTION_TEXT ${YAZ_Development} $(DESC_YAZ_Development)
!insertmacro MUI_DESCRIPTION_TEXT ${YAZ_Documentation} $(DESC_YAZ_Documentation)
!insertmacro MUI_DESCRIPTION_TEXT ${YAZ_Source} $(DESC_YAZ_Source)
!insertmacro MUI_DESCRIPTION_TEXT ${YAZ_Development} $(DESC_YAZ_Development)
!insertmacro MUI_DESCRIPTION_TEXT ${YAZ_Documentation} $(DESC_YAZ_Documentation)
!insertmacro MUI_DESCRIPTION_TEXT ${YAZ_Source} $(DESC_YAZ_Source)
+!insertmacro MUI_DESCRIPTION_TEXT ${YAZ4J} $(DESC_YAZ4J)
!insertmacro MUI_FUNCTION_DESCRIPTION_END
; eof
!insertmacro MUI_FUNCTION_DESCRIPTION_END
; eof