Author: markt Date: Thu Jan 17 11:20:49 2008 New Revision: 612936 URL: http://svn.apache.org/viewvc?rev=612936&view=rev Log: Fix installer issue that included to many files due to use of 'File /r xxx' rather than 'File /r xxx\*.*'
Modified: tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/res/tomcat.nsi tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=612936&r1=612935&r2=612936&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jan 17 11:20:49 2008 @@ -31,11 +31,6 @@ +1: jfclere -1: fhanik - Can we add the 'package' directive to make the package match the dir structure -* Fix Windows installer issue that was including files when it should not - http://svn.apache.org/viewvc?rev=611660&view=rev - +1: markt, fhanik, pero - -1: - * Add global flag to turn off reverse DNS lookups, performance improvement for tribes http://svn.apache.org/viewvc?view=rev&revision=612192 +1: fhanik, markt, pero Modified: tomcat/tc6.0.x/trunk/res/tomcat.nsi URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/tomcat.nsi?rev=612936&r1=612935&r2=612936&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/res/tomcat.nsi (original) +++ tomcat/tc6.0.x/trunk/res/tomcat.nsi Thu Jan 17 11:20:49 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 Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=612936&r1=612935&r2=612936&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original) +++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Jan 17 11:20:49 2008 @@ -87,6 +87,11 @@ <fix> Cookie parsing of $Version regression from 6.0.15 has been fixed </fix> + <fix> + The script that builds the windows installer was including additional + files due to the way it processes recurrsive file selectors. The + selectors have been modified to only include the intended files. (markt) + </fix> </changelog> </subsection> <subsection name="Catalina"> --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]