Author: violetagg
Date: Thu Jan 19 09:55:12 2017
New Revision: 1779442
URL: http://svn.apache.org/viewvc?rev=1779442&view=rev
Log:
Ensure there are no files with DOS line endings in the bin tar.gz
Modified:
tomcat/tc6.0.x/trunk/dist.xml
Modified: tomcat/tc6.0.x/trunk/dist.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/dist.xml?rev=1779442&r1=1779441&r2=1779442&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/dist.xml (original)
+++ tomcat/tc6.0.x/trunk/dist.xml Thu Jan 19 09:55:12 2017
@@ -94,6 +94,27 @@
<filter token="VERSION_MAJOR_MINOR" value="${version.major.minor}"/>
</filterset>
+ <!-- Files that need to have their line endings changed for bin distros -->
+ <patternset id="bin.files" >
+ <include name="**/LICENSE"/>
+ <include name="**/NOTICE"/>
+ <include name="**/RELEASE-NOTES"/>
+ <include name="**/*.html"/>
+ <include name="**/*.java"/>
+ <include name="**/*.jsp"/>
+ <include name="**/*.jspf"/>
+ <include name="**/*.jspx"/>
+ <include name="**/*.mdl"/>
+ <include name="**/*.properties"/>
+ <include name="**/*.svg"/>
+ <include name="**/*.tag"/>
+ <include name="**/*.tld"/>
+ <include name="**/*.txt"/>
+ <include name="**/*.xml"/>
+ <include name="**/*.xsd"/>
+ <include name="**/*.xsl"/>
+ </patternset>
+
<!-- Files that need to have their line endings changed for src distros -->
<patternset id="src.files" >
<include name="**/INSTALLLICENSE"/>
@@ -566,7 +587,9 @@
<!-- Packages the core tar.gz distro -->
<target name="package-tgz">
- <fixcrlf srcdir="${tomcat.dist}" includes="*.txt,LICENSE,NOTICE" eol="lf"
encoding="ISO-8859-1" fixlast="false" />
+ <fixcrlf srcdir="${tomcat.dist}" eol="lf" encoding="ISO-8859-1"
fixlast="false" >
+ <patternset refid="bin.files"/>
+ </fixcrlf>
<fixcrlf srcdir="${tomcat.dist}/conf" eol="lf" encoding="ISO-8859-1"
fixlast="false" />
<tar longfile="gnu" compression="gzip"
tarfile="${tomcat.release}/v${version}/bin/${final.name}.tar.gz">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
