Move server.xml and tomcat-users.xml to the top of the installer archive (aka reservi...

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.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1034926 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/res/tomcat.nsi b/res/tomcat.nsi
index 00a0191..77bb343 100644 (file)
--- a/res/tomcat.nsi
+++ b/res/tomcat.nsi
@@ -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"