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
yaz-config: dont list SSL libs for shared libyaz
[yaz-moved-to-github.git]
/
win
/
yaz.nsi
diff --git
a/win/yaz.nsi
b/win/yaz.nsi
index
3532d25
..
a442b81
100644
(file)
--- a/
win/yaz.nsi
+++ b/
win/yaz.nsi
@@
-1,15
+1,27
@@
-; $Id: yaz.nsi,v 1.102 2007-01-13 09:00:04 adam Exp $
+; This file is part of the YAZ toolkit.
+; Copyright (C) 1995-2010 Index Data
-!define VERSION "2.1.46"
+!include version.nsi
-; Microsoft runtime CRT
-; VS 2003
-!define VS_RUNTIME_DLL "c:\Program Files\Microsoft Visual Studio .NET 2003\SDK\v1.1\Bin\msvcr71.dll"
+; Microsoft runtime CRT
+; Uncomment exactly ONE of the sections below
+; 1: MSVC 6
+; !define VS_RUNTIME_DLL ""
+; !define VS_RUNTIME_MANIFEST ""
-; VS 2005
+; 2: VS 2003
+; !define VS_RUNTIME_DLL "c:\Program Files\Microsoft Visual Studio .NET 2003\SDK\v1.1\Bin\msvcr71.dll"
+;!define VS_RUNTIME_MANIFEST ""
+
+; 3: 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"
;!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"
SetCompressor bzip2
!include "MUI.nsh"
SetCompressor bzip2
@@
-66,7
+78,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
@@
-75,7
+87,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
@@
-92,13
+103,13
@@
Section "YAZ Runtime" YAZ_Runtime
Noservice:
SetOutPath $INSTDIR\bin
File "${VS_RUNTIME_DLL}"
Noservice:
SetOutPath $INSTDIR\bin
File "${VS_RUNTIME_DLL}"
-; 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\iconv.dll
File ..\bin\zlib1.dll
File ..\bin\libxml2.dll
File ..\bin\libxslt.dll
- File ..\bin\yaz.dll
-; File ..\bin\*.manifest
+ 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" \
@@
-117,7
+128,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\yaz.lib
+ File ..\lib\yaz*.lib
SectionEnd
Section "YAZ Documentation" YAZ_Documentation
SectionEnd
Section "YAZ Documentation" YAZ_Documentation
@@
-146,7
+157,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