From: Adam Dickmeiss <adam@indexdata.dk>
Date: Thu, 5 Mar 2009 11:46:40 +0000 (+0100)
Subject: NSIS installer works for src + binaries.
X-Git-Tag: v1.1.0~34^2^2^2~3
X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=commitdiff_plain;h=3d43eddaa86c283fa1a4883fb52defe648e49c2e;p=pazpar2-moved-to-github.git

NSIS installer works for src + binaries.

NSIS installer works for source and binaries.. Pazpar2 may be
started on console, but Windows service short-cuts do not yet work.
---

diff --git a/win/pazpar2.nsi b/win/pazpar2.nsi
index 790d46f..06be0be 100644
--- a/win/pazpar2.nsi
+++ b/win/pazpar2.nsi
@@ -81,10 +81,11 @@ 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 /oname=pazpar2.cfg ..\etc\pazpar2.cfg.dist 
+	SetOutPath $INSTDIR\log
 
 SectionEnd ; end of default section
 
@@ -94,16 +95,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