X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=win%2Fyaz.nsi;h=c96aa80473442cb292d380f16ea4d03be5bccd03;hp=3a5c35db7f5dcc94a4de2d5b5b894b9a64b112ec;hb=2729cd06642622e1355f41f947498902e6dde61a;hpb=1321777c57cf0b7faaea70cded9c8e39698c23fa

diff --git a/win/yaz.nsi b/win/yaz.nsi
index 3a5c35d..c96aa80 100644
--- a/win/yaz.nsi
+++ b/win/yaz.nsi
@@ -1,15 +1,27 @@
-; $Id: yaz.nsi,v 1.95 2006-10-04 08:04:10 adam Exp $
+; This file is part of the YAZ toolkit.
+; Copyright (C) 1995-2013 Index Data
 
-!define VERSION "2.1.34"
+!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"
 
+; 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"
+
+
 !include "MUI.nsh"
 
 SetCompressor bzip2
@@ -25,7 +37,6 @@ ComponentText "This will install the YAZ Toolkit on your computer:"
 InstType "Full (w/ Source)"
 InstType "Lite (w/o Source)"
 
-InstallDir "$PROGRAMFILES\YAZ"
 InstallDirRegKey HKLM "SOFTWARE\Index Data\YAZ" ""
 
 
@@ -66,7 +77,7 @@ Section "" ; (default section)
  	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
@@ -75,7 +86,6 @@ Section "" ; (default section)
 	File ..\NEWS
 	SetOutPath $INSTDIR
 	SetOutPath $INSTDIR\ztest
-	File ..\ztest\dummy-records
 	File ..\ztest\dummy-grs
 	File ..\ztest\dummy-words
 	SetOutPath $INSTDIR\etc
@@ -92,13 +102,8 @@ Section "YAZ Runtime" YAZ_Runtime
 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\yaz.dll
-;	File ..\bin\*.manifest
+	File "${VS_RUNTIME_MANIFEST}"
+	File ..\bin\*.dll
 	File ..\bin\*.exe
 	SetOutPath $SMPROGRAMS\YAZ
  	CreateShortCut "$SMPROGRAMS\YAZ\YAZ Client.lnk" \
@@ -117,18 +122,18 @@ Section "YAZ Development" YAZ_Development
 	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
 	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\*.xsl
+	File /nonfatal /r ..\doc\*.xsl
 	SetOutPath $SMPROGRAMS\YAZ
 	CreateShortCut "$SMPROGRAMS\YAZ\HTML Documentation.lnk" \
                  "$INSTDIR\doc\index.html"
@@ -137,6 +142,7 @@ SectionEnd
 Section "YAZ Source" YAZ_Source
 	SectionIn 1
 	SetOutPath $INSTDIR
+	File ..\IDMETA
 	File /r ..\*.c
 	File /r /x yaz ..\*.h
 	SetOutPath $INSTDIR\util
@@ -146,7 +152,7 @@ Section "YAZ Source" YAZ_Source
 	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