Author: kkolinko
Date: Sun Nov 14 02:25:36 2010
New Revision: 1034926

URL: http://svn.apache.org/viewvc?rev=1034926&view=rev
Log:
Move server.xml and tomcat-users.xml to the top of the installer archive (aka 
reserving them).

Those were installed among the first files ('configure' was called from Core 
section), but this code is near the end of the script and thus the files were 
packed near the end of the archive. The delay while extracting server.xml was 
noticeable. With this fix that step completes nearly instantly.

Modified:
    tomcat/trunk/res/tomcat.nsi

Modified: tomcat/trunk/res/tomcat.nsi
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/tomcat.nsi?rev=1034926&r1=1034925&r2=1034926&view=diff
==============================================================================
--- tomcat/trunk/res/tomcat.nsi (original)
+++ tomcat/trunk/res/tomcat.nsi Sun Nov 14 02:25:36 2010
@@ -773,10 +773,10 @@ Function configure
   ; that is automatically deleted when the installer exits.
   InitPluginsDir
   SetOutPath $PLUGINSDIR
-  File confinstall\server_1.xml
-  File confinstall\server_2.xml
-  File confinstall\tomcat-users_1.xml
-  File confinstall\tomcat-users_2.xml
+  ReserveFile confinstall\server_1.xml
+  ReserveFile confinstall\server_2.xml
+  ReserveFile confinstall\tomcat-users_1.xml
+  ReserveFile confinstall\tomcat-users_2.xml
 
   ; Build final server.xml
   Delete "$INSTDIR\conf\server.xml"



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to