Author: markt
Date: Wed Dec 23 16:42:40 2009
New Revision: 893572
URL: http://svn.apache.org/viewvc?rev=893572&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47609
Implement fail-safe EOL conversion for source distributions
Based on patches provided by sebb / kkolinko
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/dist.xml
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=893572&r1=893571&r2=893572&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Dec 23 16:42:40 2009
@@ -68,13 +68,6 @@
-1: funkman : api change in Session.java for .x.x release
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47609
- Implement fail-safe EOL conversion for source distributions
- Based on patches provided by sebb / kkolinko
- http://people.apache.org/~markt/patches/2009-12-23-bug47609.patch
- +1: markt, kkolinko, rjung
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47774
Ensure web application class loader is used when calling session listeners
http://svn.apache.org/viewvc?rev=890530&view=rev
Modified: tomcat/tc6.0.x/trunk/dist.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/dist.xml?rev=893572&r1=893571&r2=893572&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/dist.xml (original)
+++ tomcat/tc6.0.x/trunk/dist.xml Wed Dec 23 16:42:40 2009
@@ -86,6 +86,23 @@
<property name="tomcat-dbcp.jar"
value="${tomcat-dbcp.home}/tomcat-dbcp.jar"/>
<property name="jasper-jdt.jar" value="${jasper-jdt.home}/jasper-jdt.jar"/>
+ <!-- Files that need to have their line endings changed for src distros -->
+ <patternset id="src.files" >
+ <include name="**/INSTALLLICENSE,**/KEYS,**/LICENSE,**/NOTICE"/>
+ <include name="**/RELEASE-NOTES"/>
+ <include name="**/*.bat,**/*.dtd"/>
+ <include name="**/*.htm,**/*.html"/>
+ <include name="**/*.ini,**/*.java,**/*.jjt"/>
+ <include name="**/*.jsp,**/*.jspf,**/*.jspx"/>
+ <include name="**/*.license,**/*.manifest,**/*.mdl,**/*.nsi"/>
+ <include name="**/*.policy,**/*.pom,**/*.properties"/>
+ <include name="**/*.properties.default"/>
+ <include name="**/*.rtf,**/*.sh,**/*.svg"/>
+ <include name="**/*.tag,**/*.tagx"/>
+ <include name="**/*.tasks,**/*.tld,**/*.txt"/>
+ <include name="**/*.xml,**/*.xsd,**/*.xsl"/>
+ </patternset>
+
<!-- ====================== COMBO: Clean All Directories ================ -->
<target name="clean"
description="Clean all components">
@@ -587,6 +604,10 @@
<!-- Packages the source code distribution in zip format -->
<target name="package-src-zip">
+ <fixcrlf srcdir="${tomcat.dist}/src" eol="crlf"
+ encoding="ISO-8859-1" fixlast="false" >
+ <patternset id="src.files"/>
+ </fixcrlf>
<zip zipfile="${tomcat.release}/v${version}/src/${final-src.name}.zip">
<zipfileset dir="${tomcat.dist}/src" prefix="${final-src.name}" />
</zip>
@@ -598,9 +619,10 @@
<!-- Packages the source code distribution in tar.gz format -->
<target name="package-src-tgz">
- <fixcrlf srcdir="${tomcat.dist}/src"
-
excludes="**/*.bin,**/*.bmp,**/*.dia,**/*.exe,**/*.gif,**/*.ico,**/*.jar,**/*.jpg,**/*.pdf,**/*.rtf,**/*.war"
- eol="lf" fixlast="false" encoding="ISO-8859-1" />
+ <fixcrlf srcdir="${tomcat.dist}/src" eol="lf"
+ encoding="ISO-8859-1" fixlast="false" >
+ <patternset id="src.files"/>
+ </fixcrlf>
<tar longfile="gnu" compression="gzip"
tarfile="${tomcat.release}/v${version}/src/${final-src.name}.tar.gz">
<tarfileset dir="${tomcat.dist}/src" prefix="${final-src.name}" />
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=893572&r1=893571&r2=893572&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Dec 23 16:42:40 2009
@@ -74,6 +74,10 @@
<fix>
Correct MD5 generation in the build process. (jfclere/kkolinko)
</fix>
+ <fix>
+ <bug>47609</bug>: Provide fail-safe EOL conversion for build process.
+ Based on patches by sebb/kkolinko. (markt)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
