yoavs 2004/11/22 07:04:59 Modified: . tomcat.nsi webapps/docs changelog.xml Log: Bugzilla 32282: modified Windows Uninstaller to only remove webapps/ROOT and webapps if user asks to remove everything. Revision Changes Path 1.67 +5 -5 jakarta-tomcat-5/tomcat.nsi Index: tomcat.nsi =================================================================== RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v retrieving revision 1.66 retrieving revision 1.67 diff -u -r1.66 -r1.67 --- tomcat.nsi 13 Nov 2004 18:57:05 -0000 1.66 +++ tomcat.nsi 22 Nov 2004 15:04:58 -0000 1.67 @@ -617,12 +617,10 @@ RMDir "$INSTDIR\logs" RMDir /r "$INSTDIR\server" RMDir /r "$INSTDIR\webapps\balancer" - RMDir /r "$INSTDIR\webapps\ROOT" RMDir /r "$INSTDIR\webapps\tomcat-docs" RMDir /r "$INSTDIR\webapps\servlets-examples" RMDir /r "$INSTDIR\webapps\jsp-examples" RMDir /r "$INSTDIR\webapps\webdav" - RMDir "$INSTDIR\webapps" RMDir /r "$INSTDIR\work" RMDir /r "$INSTDIR\temp" RMDir /r "$INSTDIR\src" @@ -631,9 +629,11 @@ ; if $INSTDIR was removed, skip these next ones IfFileExists "$INSTDIR" 0 Removed MessageBox MB_YESNO|MB_ICONQUESTION \ - "Remove all files in your Tomcat 5.5 directory? (If you have anything\ + "Remove all files in your Tomcat 5.5 directory? (If you have anything \ you created that you want to keep, click No)" IDNO Removed - Delete "$INSTDIR\*.*" ; this would be skipped if the user hits no + RMDir /r "$INSTDIR\webapps\ROOT" ; this would be skipped if the user hits no + RMDir "$INSTDIR\webapps" + Delete "$INSTDIR\*.*" RMDir /r "$INSTDIR" Sleep 500 IfFileExists "$INSTDIR" 0 Removed 1.179 +3 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.178 retrieving revision 1.179 diff -u -r1.178 -r1.179 --- changelog.xml 22 Nov 2004 14:52:28 -0000 1.178 +++ changelog.xml 22 Nov 2004 15:04:58 -0000 1.179 @@ -44,6 +44,9 @@ <update> <bug>32249</bug>: Updated logging documentation. (yoavs) </update> + <update> + <bug>32282</bug>: Modify Windows Uninstaller to only remove webapps/ROOT and webapps if user asks to remove everything. (yoavs) + </update> </changelog> </subsection>
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]