tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r781535 - in /tomcat: build/tc5.5.x/tomcat.nsi container/tc5.5.x/webapps/docs/changelog.xml
Date Wed, 03 Jun 2009 20:39:57 GMT
Author: markt
Date: Wed Jun  3 20:39:56 2009
New Revision: 781535

URL: http://svn.apache.org/viewvc?rev=781535&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45880
More careful use of File /r and and NOTICE file

Modified:
    tomcat/build/tc5.5.x/tomcat.nsi
    tomcat/container/tc5.5.x/webapps/docs/changelog.xml

Modified: tomcat/build/tc5.5.x/tomcat.nsi
URL: http://svn.apache.org/viewvc/tomcat/build/tc5.5.x/tomcat.nsi?rev=781535&r1=781534&r2=781535&view=diff
==============================================================================
--- tomcat/build/tc5.5.x/tomcat.nsi (original)
+++ tomcat/build/tc5.5.x/tomcat.nsi Wed Jun  3 20:39:56 2009
@@ -139,11 +139,17 @@
   SetOutPath $INSTDIR
   File tomcat.ico
   File LICENSE
-  File /r common
-  File /nonfatal /r shared
-  File /nonfatal /r logs
-  File /nonfatal /r work
-  File /nonfatal /r temp
+  File NOTICE
+  SetOutPath $INSTDIR\common
+  File /r common\*.*
+  SetOutPath $INSTDIR\shared
+  File /nonfatal /r shared\*.*
+  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\commons-logging-api-1.1.1.jar
@@ -151,14 +157,16 @@
   File bin\*.exe
   SetOutPath $INSTDIR\conf
   File conf\*.*
-  SetOutPath $INSTDIR\server
-  File /r server\lib
-  File /nonfatal /r server\classes
-  SetOutPath $INSTDIR\server\webapps
-  File /r server\webapps\manager
-  File /r server\webapps\host-manager
-  SetOutPath $INSTDIR\webapps
-  File /r webapps\ROOT
+  SetOutPath $INSTDIR\server\lib
+  File /r server\lib\*.*
+  SetOutPath $INSTDIR\server\classes
+  File /nonfatal /r server\classes\*.*
+  SetOutPath $INSTDIR\server\webapps\manager
+  File /r server\webapps\manager\*.*
+  SetOutPath $INSTDIR\server\webapps\host-manager
+  File /r server\webapps\host-manager\*.*
+  SetOutPath $INSTDIR\webapps\ROOT
+  File /r webapps\ROOT\*.*
   SetOutPath $INSTDIR\conf\Catalina\localhost
   File conf\Catalina\localhost\manager.xml
   File conf\Catalina\localhost\host-manager.xml
@@ -293,8 +301,8 @@
 Section "Documentation" SecDocs
 
   SectionIn 1 3
-  SetOutPath $INSTDIR\webapps
-  File /r webapps\tomcat-docs
+  SetOutPath $INSTDIR\webapps\tomcat-docs
+  File /r webapps\tomcat-docs\*.*
 
 SectionEnd
 
@@ -303,9 +311,10 @@
   SectionIn 3
 
   SetOverwrite on
-  SetOutPath $INSTDIR\webapps
-  File /r webapps\jsp-examples
-  File /r webapps\servlets-examples
+  SetOutPath $INSTDIR\webapps\jsp-examples
+  File /r webapps\jsp-examples\*.*
+  SetOutPath $INSTDIR\webapps\servlets-examples
+  File /r webapps\servlets-examples\*.*
 
 SectionEnd
 
@@ -324,9 +333,10 @@
 
   SectionIn 3
 
-  SetOutPath $INSTDIR\webapps
-  File /r webapps\balancer
-  File /r webapps\webdav
+  SetOutPath $INSTDIR\webapps\balancer
+  File /r webapps\balancer\*.*
+  SetOutPath $INSTDIR\webapps\webdav
+  File /r webapps\webdav\*.*
 
 SectionEnd
 
@@ -676,6 +686,7 @@
   RMDir /r "$SMPROGRAMS\Apache Tomcat 5.5"
   Delete "$INSTDIR\tomcat.ico"
   Delete "$INSTDIR\LICENSE"
+  Delete "$INSTDIR\NOTICE"
   RMDir /r "$INSTDIR\bin"
   RMDir /r "$INSTDIR\common"
   Delete "$INSTDIR\conf\*.dtd"

Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=781535&r1=781534&r2=781535&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Wed Jun  3 20:39:56 2009
@@ -32,6 +32,14 @@
 
 <body>
 <section name="Tomcat 5.5.28 (fhanik)">
+  <subsection name="General">
+    <changelog>
+      <fix>
+        <bug>45880</bug>: Include NOTICE file in Windows installer and make sure
+        src files are excluded. (markt)
+      </fix>
+    </changelog>
+  </subsection>
   <subsection name="Catalina">
     <changelog>
       <fix>



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


Mime
View raw message