Author: kkolinko
Date: Sun Nov 14 21:05:41 2010
New Revision: 1035068
URL: http://svn.apache.org/viewvc?rev=1035068&view=rev
Log:
- SetOutPath creates the empty folders for us. Thus 'File /nonfatal' trick is
not needed.
- Simplify deletion patterns in the Uninstall section
Modified:
tomcat/trunk/res/tomcat.nsi
Modified: tomcat/trunk/res/tomcat.nsi
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/tomcat.nsi?rev=1035068&r1=1035067&r2=1035068&view=diff
==============================================================================
--- tomcat/trunk/res/tomcat.nsi (original)
+++ tomcat/trunk/res/tomcat.nsi Sun Nov 14 21:05:41 2010
@@ -162,12 +162,10 @@ Section "Core" SecTomcatCore
File NOTICE
SetOutPath $INSTDIR\lib
File /r lib\*.*
+ ; Note: just calling 'SetOutPath' will create the empty folders for us
SetOutPath $INSTDIR\logs
- File /nonfatal /r logs\*.*
SetOutPath $INSTDIR\work
- File /nonfatal /r work\*.*
SetOutPath $INSTDIR\temp
- File /nonfatal /r temp\*.*
SetOutPath $INSTDIR\bin
File bin\bootstrap.jar
File bin\tomcat-juli.jar
@@ -917,8 +915,10 @@ Section Uninstall
MessageBox MB_YESNO|MB_ICONQUESTION \
"Remove all files in your Tomcat @VERSION_MAJOR_MINOR@ directory? (If
you have anything \
you created that you want to keep, click No)" IDNO Removed
- RMDir /r "$INSTDIR\webapps\ROOT" ; this would be skipped if the user hits
no
- RMDir "$INSTDIR\webapps"
+ ; these would be skipped if the user hits no
+ RMDir /r "$INSTDIR\webapps"
+ RMDir /r "$INSTDIR\logs"
+ RMDir /r "$INSTDIR\conf"
Delete "$INSTDIR\*.*"
RMDir /r "$INSTDIR"
Sleep 500
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
