From b5115582e64640cbe04fe815c5d4b1414661fbcf Mon Sep 17 00:00:00 2001 From: markt Date: Sun, 13 Jan 2008 22:29:37 +0000 Subject: [PATCH] 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. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@611660 13f79535-47bb-0310-9956-ffa450edef68 --- res/tomcat.nsi | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/res/tomcat.nsi b/res/tomcat.nsi index 42c1b9e48..5f0c416fc 100644 --- a/res/tomcat.nsi +++ b/res/tomcat.nsi @@ -136,20 +136,26 @@ Section "Core" SecTomcatCore 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 @@ SectionEnd 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 @@ Section "Examples" SecExamples SectionIn 3 SetOverwrite on - SetOutPath $INSTDIR\webapps - File /r webapps\examples + SetOutPath $INSTDIR\webapps\examples + File /r webapps\examples\*.* SectionEnd -- 2.11.0