yoavs 2004/11/22 07:02:55 Modified: . Tag: TOMCAT_5_0 tomcat.nsi webapps/docs Tag: TOMCAT_5_0 changelog.xml Log: Bugzilla 32282: modified Windows Uninstaller to only remove webapps/ROOT and webapps if user asks to remove everything. Revision Changes Path No revision No revision 1.45.2.2 +5 -5 jakarta-tomcat-5/tomcat.nsi Index: tomcat.nsi =================================================================== RCS file: /home/cvs/jakarta-tomcat-5/tomcat.nsi,v retrieving revision 1.45.2.1 retrieving revision 1.45.2.2 diff -u -r1.45.2.1 -r1.45.2.2 --- tomcat.nsi 2 Sep 2004 10:02:05 -0000 1.45.2.1 +++ tomcat.nsi 22 Nov 2004 15:02:54 -0000 1.45.2.2 @@ -553,12 +553,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" @@ -567,9 +565,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.0 directory? (If you have anything\ + "Remove all files in your Tomcat 5.0 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 No revision No revision 1.70.2.81 +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.70.2.80 retrieving revision 1.70.2.81 diff -u -r1.70.2.80 -r1.70.2.81 --- changelog.xml 22 Nov 2004 14:54:56 -0000 1.70.2.80 +++ changelog.xml 22 Nov 2004 15:02:55 -0000 1.70.2.81 @@ -32,6 +32,9 @@ <update> When the package protection is not used, do not create the doPrivileged objects so we don't suffer the performance hit. </update> + <update> + <bug>32282</bug>: Modify Windows Uninstaller to remove webapps and webapps/ROOT only if user asks to remove everything. (yoavs) + </update> </changelog> </subsection>
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]