Author: markt
Date: Thu Jan 14 18:37:52 2010
New Revision: 899348

URL: http://svn.apache.org/viewvc?rev=899348&view=rev
Log:
Need to fix line endings for zip distro if building on non-windows

Modified:
    tomcat/trunk/dist.xml

Modified: tomcat/trunk/dist.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/dist.xml?rev=899348&r1=899347&r2=899348&view=diff
==============================================================================
--- tomcat/trunk/dist.xml (original)
+++ tomcat/trunk/dist.xml Thu Jan 14 18:37:52 2010
@@ -387,6 +387,8 @@
 
   <!-- Packages the core zip distro -->
   <target name="package-zip">
+    <fixcrlf srcdir="${tomcat.dist}" includes="*.txt,LICENSE,NOTICE" 
eol="crlf" encoding="ISO-8859-1" fixlast="false" />
+    <fixcrlf srcdir="${tomcat.dist}/conf" eol="crlf" encoding="ISO-8859-1" 
fixlast="false" />
     <zip zipfile="${tomcat.release}/v${version}/bin/${final.name}.zip">
       <zipfileset dir="${tomcat.dist}" prefix="${final.name}">
         <include name="bin/**"/>
@@ -417,6 +419,9 @@
 
   <!-- Packages the core windows zip distros -->
   <target name="package-winzip">
+    <fixcrlf srcdir="${tomcat.dist}" includes="*.txt,LICENSE,NOTICE" 
eol="crlf" encoding="ISO-8859-1" fixlast="false" />
+    <fixcrlf srcdir="${tomcat.dist}/conf" eol="crlf" encoding="ISO-8859-1" 
fixlast="false" />
+
     <!-- Windows x86 package -->
     <zip 
zipfile="${tomcat.release}/v${version}/bin/${final.name}-windows-x86.zip">
       <zipfileset dir="${tomcat.dist}" prefix="${final.name}">



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

Reply via email to