X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=win%2Fyaz.nsi;h=2f9c8487f73c9556f7ce18a6a7a8efb5a649d3d8;hb=6578641e0e29e0c36fb29d09a98310dc42071d97;hp=1879dfe599e504385b98377b53ec5c5e138e845c;hpb=84c9ccff7f7deb03ea8d8318c1bcad2d7fd66c3e;p=yaz-moved-to-github.git

diff --git a/win/yaz.nsi b/win/yaz.nsi
index 1879dfe..2f9c848 100644
--- a/win/yaz.nsi
+++ b/win/yaz.nsi
@@ -1,7 +1,14 @@
-; $Id: yaz.nsi,v 1.84 2006-06-02 13:17:23 adam Exp $
+; $Id: yaz.nsi,v 1.109 2007-05-08 08:39:00 adam Exp $
 
-!define VERSION "2.1.20"
-!define VS_RUNTIME_LOCATION "c:\Program Files\Microsoft Visual Studio .NET 2003\SDK\v1.1\Bin"
+!define VERSION "3.0.2"
+
+; 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"
 
@@ -84,12 +91,14 @@ Section "YAZ Runtime" YAZ_Runtime
 	ExecWait '"$INSTDIR\bin\yaz-ztest.exe" -remove'
 Noservice:
 	SetOutPath $INSTDIR\bin
-	File "${VS_RUNTIME_LOCATION}\msvcr71.dll"
+	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\yaz3.dll
+;	File ..\bin\*.manifest
 	File ..\bin\*.exe
 	SetOutPath $SMPROGRAMS\YAZ
  	CreateShortCut "$SMPROGRAMS\YAZ\YAZ Client.lnk" \
@@ -108,18 +117,13 @@ Section "YAZ Development" YAZ_Development
 	SetOutPath $INSTDIR\include\yaz
 	File ..\include\yaz\*.h
 	SetOutPath $INSTDIR\lib
-	File ..\lib\yaz.lib
-	File ..\lib\yazd.lib
-	SetOutPath $INSTDIR\bin
-	File ..\bin\yazd.dll
+	File ..\lib\yaz3.lib
 SectionEnd
 
 Section "YAZ Documentation" YAZ_Documentation
 	SectionIn 1 2
 	SetOutPath $INSTDIR\doc
 	File /r ..\doc\*.css
-	File /r ..\doc\*.dcl
-	File /r ..\doc\*.dsl
 	File /r ..\doc\*.ent
 	File /r ..\doc\*.html
 	File /r ..\doc\*.xml