You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2008/01/13 23:29:38 UTC
svn commit: r611660 - /tomcat/trunk/res/tomcat.nsi

Author: markt
Date: Sun Jan 13 14:29:37 2008
New Revision: 611660

URL: http://svn.apache.org/viewvc?rev=611660&view=rev
Log:
Fix a problem with the installer. File /r lib was selecting the jar files in src/webapps/examples/WEB-INF/lib. There may have been other issues too. Make all uses of File /r more explicit as to the files that are being referred to.

Modified:
    tomcat/trunk/res/tomcat.nsi

Modified: tomcat/trunk/res/tomcat.nsi
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/tomcat.nsi?rev=611660&r1=611659&r2=611660&view=diff
==============================================================================
--- tomcat/trunk/res/tomcat.nsi (original)
+++ tomcat/trunk/res/tomcat.nsi Sun Jan 13 14:29:37 2008
@@ -136,20 +136,26 @@
   SetOutPath $INSTDIR
   File tomcat.ico
   File LICENSE
-  File /r lib
-  File /nonfatal /r logs
-  File /nonfatal /r work
-  File /nonfatal /r temp
+  SetOutPath $INSTDIR\lib
+  File /r lib\*.*
+  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
   File bin\*.exe
   SetOutPath $INSTDIR\conf
   File conf\*.*
-  SetOutPath $INSTDIR\webapps
-  File /r webapps\ROOT
-  File /r webapps\host-manager
-  File /r webapps\manager
+  SetOutPath $INSTDIR\webapps\ROOT
+  File /r webapps\ROOT\*.*
+  SetOutPath $INSTDIR\webapps\host-manager
+  File /r webapps\host-manager\*.*
+  SetOutPath $INSTDIR\webapps\manager
+  File /r webapps\manager\*.*
 
   Call configure
   Call findJavaPath
@@ -285,8 +291,8 @@
 Section "Documentation" SecDocs
 
   SectionIn 1 3
-  SetOutPath $INSTDIR\webapps
-  File /r webapps\docs
+  SetOutPath $INSTDIR\webapps\docs
+  File /r webapps\docs\*.*
 
 SectionEnd
 
@@ -295,8 +301,8 @@
   SectionIn 3
 
   SetOverwrite on
-  SetOutPath $INSTDIR\webapps
-  File /r webapps\examples
+  SetOutPath $INSTDIR\webapps\examples
+  File /r webapps\examples\*.*
 
 SectionEnd
 



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