X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=win%2Fpazpar2.nsi;h=cbe7eb375abdd9a474f3f1c16cda09b082a0638b;hb=817e3ec506c4095bc4fcc1923cee36153ef4ee43;hp=790d46fec676d8b288cddec0fa4eb451886eff8d;hpb=4e8ce154427cf65ff8e76c584a457f5bff23815e;p=pazpar2-moved-to-github.git

diff --git a/win/pazpar2.nsi b/win/pazpar2.nsi
index 790d46f..cbe7eb3 100644
--- a/win/pazpar2.nsi
+++ b/win/pazpar2.nsi
@@ -1,13 +1,14 @@
 ; This file is part of Pazpar2.
-; Copyright (C) 2006-2009 Index Data
+; Copyright (C) Index Data
+; See the file LICENSE for details.
 
 !include version.nsi
 
 ; Microsoft runtime CRT 
-; Uncomment exactly ONE section of the three below
+; Uncomment exactly ONE of the sections below
 ; 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"
@@ -17,6 +18,10 @@
 ;!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"
 
@@ -81,10 +86,12 @@ Section "" ; (default section)
 	File LICENSE.txt
 	File ..\README
 	File ..\NEWS
-	SetOutPath $INSTDIR/etc
+	SetOutPath $INSTDIR\etc
 	File /r ..\etc\*.xml
 	File /r ..\etc\*.xsl
-	File /r ..\etc\*.dist
+	File /r ..\etc\*.mmap
+	File /oname=pazpar2.cfg ..\etc\pazpar2.cfg.dist 
+	SetOutPath $INSTDIR\log
 
 SectionEnd ; end of default section
 
@@ -94,16 +101,16 @@ Section "Pazpar2 Runtime" Pazpar2_Runtime
 	ExecWait '"$INSTDIR\bin\pazpar2.exe" -remove'
 Noservice:
 	SetOutPath $INSTDIR\bin
-	File "${VS_RUNTIME_DLL}"
-	File "${VS_RUNTIME_MANIFEST}"
+	; File "${VS_RUNTIME_DLL}"
+	; File "${VS_RUNTIME_MANIFEST}"
 	File ..\bin\*.dll
 	File ..\bin\*.exe
 	SetOutPath $SMPROGRAMS\Pazpar2
 	SetOutPath $SMPROGRAMS\Pazpar2\Server
  	CreateShortCut "$SMPROGRAMS\Pazpar2\Server\Server on console.lnk" \
                  "$INSTDIR\bin\pazpar2.exe" '-f"$INSTDIR\etc\pazpar2.cfg"'
-  	CreateShortCut "$SMPROGRAMS\Pazpar2\Server\Install Z39.50 service.lnk" \
-                  "$INSTDIR\bin\pazpar2.exe" '-installa -f"$INSTDIR\etc\pazpar2.cfg"'
+  	CreateShortCut "$SMPROGRAMS\Pazpar2\Server\Install Pazpar2 service.lnk" \
+                 "$INSTDIR\bin\pazpar2.exe" '-install -l"$INSTDIR\log\pazpar2.log" -f"$INSTDIR\etc\pazpar2.cfg"'
  	CreateShortCut "$SMPROGRAMS\Pazpar2\Server\Remove Pazpar2 service.lnk" \
                  "$INSTDIR\bin\pazpar2.exe" '-remove'
 SectionEnd