Author: markt
Date: Sun Nov 16 15:50:57 2008
New Revision: 718145
URL: http://svn.apache.org/viewvc?rev=718145&view=rev
Log:
Stricter file filters to build installer
Modified:
tomcat/container/branches/tc4.1.x/RELEASE-NOTES-4.1.txt
tomcat/container/branches/tc4.1.x/tomcat.nsi
tomcat/current/tc4.1.x/STATUS.txt
Modified: tomcat/container/branches/tc4.1.x/RELEASE-NOTES-4.1.txt
URL:
http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/RELEASE-NOTES-4.1.txt?rev=718145&r1=718144&r2=718145&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/RELEASE-NOTES-4.1.txt (original)
+++ tomcat/container/branches/tc4.1.x/RELEASE-NOTES-4.1.txt Sun Nov 16 15:50:57
2008
@@ -700,6 +700,9 @@
[4.1.38] Docs
Reference docs for latest JK release rather latest JK/JK2 docs from
svn
+[4.1.39] Installer
+ Make file patterns used to copy files for installer more strict
+
------------------
Catalina Bug Fixes:
Modified: tomcat/container/branches/tc4.1.x/tomcat.nsi
URL:
http://svn.apache.org/viewvc/tomcat/container/branches/tc4.1.x/tomcat.nsi?rev=718145&r1=718144&r2=718145&view=diff
==============================================================================
--- tomcat/container/branches/tc4.1.x/tomcat.nsi (original)
+++ tomcat/container/branches/tc4.1.x/tomcat.nsi Sun Nov 16 15:50:57 2008
@@ -58,17 +58,26 @@
File tomcat.ico
File LICENSE
File NOTICE
- File /r /x *.exe bin
- File /r common
- File /r conf
- File /nonfatal /r shared
- File /nonfatal /r logs
- File /r server
- File /nonfatal /r work
- File /nonfatal /r temp
+ SetOutPath $INSTDIR\bin
+ File /r /x *.exe bin\*.*
+ SetOutPath $INSTDIR\common
+ File /r common\*.*
+ SetOutPath $INSTDIR\conf
+ File /r conf\*.*
+ SetOutPath $INSTDIR\shared
+ File /nonfatal /r shared\*.*
+ SetOutPath $INSTDIR\logs
+ File /nonfatal /r logs\*.*
+ SetOutPath $INSTDIR\server
+ File /r server\*.*
+ SetOutPath $INSTDIR\work
+ File /nonfatal /r work\*.*
+ SetOutPath $INSTDIR\temp
+ File /nonfatal /r temp\*.*
SetOutPath $INSTDIR\webapps
File webapps\*.xml
- File /r webapps\ROOT
+ SetOutPath $INSTDIR\webapps\ROOT
+ File /r webapps\ROOT\*.*
Call findJavaPath
Pop $2
@@ -158,8 +167,8 @@
Section "Tomcat Documentation" Section7
SectionIn 1 3
- SetOutPath $INSTDIR\webapps
- File /r webapps\tomcat-docs
+ SetOutPath $INSTDIR\webapps\tomcat-docs
+ File /r webapps\tomcat-docs\*.*
IfFileExists "$SMPROGRAMS\Apache Tomcat 4.1" 0 NoLinks
@@ -180,9 +189,10 @@
SetOutPath $INSTDIR\conf
File conf\server.xml
SetOverwrite on
- SetOutPath $INSTDIR\webapps
- File /r webapps\examples
- File /r webapps\webdav
+ SetOutPath $INSTDIR\webapps\examples
+ File /r webapps\examples\*.*
+ SetOutPath $INSTDIR\webapps\webdav
+ File /r webapps\webdav\*.*
SectionEnd
@@ -192,8 +202,8 @@
Section "Tomcat Source Code" Section10
SectionIn 3
- SetOutPath $INSTDIR
- File /r src
+ SetOutPath $INSTDIR\src
+ File /r src\*.*
SectionEnd
@@ -359,8 +369,8 @@
StrCpy $R4 'port="$R0"'
StrCpy $R5 '<user name="$R1" password="$R2" roles="admin,manager" />'
- SetOutPath $TEMP
- File /r confinstall
+ SetOutPath $TEMP\confinstall
+ File /r confinstall\*.*
; Build final server.xml
Delete "$INSTDIR\conf\server.xml"
Modified: tomcat/current/tc4.1.x/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/current/tc4.1.x/STATUS.txt?rev=718145&r1=718144&r2=718145&view=diff
==============================================================================
--- tomcat/current/tc4.1.x/STATUS.txt (original)
+++ tomcat/current/tc4.1.x/STATUS.txt Sun Nov 16 15:50:57 2008
@@ -24,9 +24,3 @@
PATCHES PROPOSED TO BACKPORT:
[ New proposals should be added at the end of the list ]
-
-
-* Fix installer packaging - only include the files we meant to
- http://people.apache.org/~markt/patches/2008-10-31-tc4-wininstaller.patch
- +1: markt, jfclere, yoavs, rjung
- -1:
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
