From b281702946159a2b4dc3db3dd69eab32c115b8d5 Mon Sep 17 00:00:00 2001
From: joostverburg <joostverburg@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Mon, 17 Feb 2003 21:11:17 +0000
Subject: [PATCH] entries.log, Source\exehead

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2169 212acab6-be3b-0410-9dea-997c60f758d6
---
 Examples/cvsdata.nsi | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/Examples/cvsdata.nsi b/Examples/cvsdata.nsi
index 1181ebe9..787b7acc 100644
--- a/Examples/cvsdata.nsi
+++ b/Examples/cvsdata.nsi
@@ -6,6 +6,10 @@
 
 ;Written by Joost Verburg
 
+!echo "Compiling CVS Data Setup..."
+
+!verbose 3
+
 ;--------------------------------
 ;Configuration
 
@@ -24,6 +28,8 @@ SilentInstall silent
 
   SetOutPath "${NSISPATH}\${DIR}\CVS"
   File "/oname=${NSISPATH}\${DIR}\CVS\Entries" "..\${DIR}\CVS\Entries"
+  ;CVS sometimes uses Entries.log files. Ignore warnings about not existing Entries.log files.
+  File /nonfatal "/oname=${NSISPATH}\${DIR}\CVS\Entries.log" "..\${DIR}\CVS\Entries.log"
   File "/oname=${NSISPATH}\${DIR}\CVS\Repository" "..\${DIR}\CVS\Repository"
   File "/oname=${NSISPATH}\${DIR}\CVS\Root" "..\${DIR}\CVS\Root"
     
@@ -48,10 +54,6 @@ FunctionEnd
 
 Section ""
 
-!echo "Adding CVS data..."
-
-!verbose 3
-
 !insertmacro CVSDATA "."
 !insertmacro CVSDATA "Bin"
 !insertmacro CVSDATA "Contrib"
@@ -90,8 +92,9 @@ Section ""
 !insertmacro CVSDATA "Plugins"
 !insertmacro CVSDATA "Source"
 !insertmacro CVSDATA "Source\bzip2"
+!insertmacro CVSDATA "Source\exehead"
 !insertmacro CVSDATA "Source\zlib"
 
-!verbose 4
+SectionEnd
 
-SectionEnd
\ No newline at end of file
+!verbose 4
\ No newline at end of file