Author: kkolinko
Date: Thu Mar 4 20:27:23 2010
New Revision: 919165
URL: http://svn.apache.org/viewvc?rev=919165&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47609
Implement fail-safe EOL conversion for source distributions
Based on a patch provided by sebb
Modified:
tomcat/tc5.5.x/trunk/STATUS.txt
tomcat/tc5.5.x/trunk/build/build.xml
tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=919165&r1=919164&r2=919165&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Thu Mar 4 20:27:23 2010
@@ -80,16 +80,6 @@
rjung: it might be more reader friendly to explicitely add parentheses when
having || and && mixed in the same logical expression (see the "while" loop).
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47609
- Implement fail-safe EOL conversion for source distributions
- Based on a patch provided by sebb
- This patch is required, because otherwise the *.keystore
- files used in storeconfig[-ha] module tests become broken in the -src.tar.gz
- bundle.
- http://people.apache.org/~kkolinko/patches/2010-01-05_tc55_bug47609.patch
- +1: kkolinko, markt, rjung
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47997
Process changes for all naming contexts, not just the global one
http://svn.apache.org/viewvc?rev=883134&view=rev
Modified: tomcat/tc5.5.x/trunk/build/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/build/build.xml?rev=919165&r1=919164&r2=919165&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/build/build.xml (original)
+++ tomcat/tc5.5.x/trunk/build/build.xml Thu Mar 4 20:27:23 2010
@@ -102,6 +102,53 @@
<!-- constant to declare a file binary for md5sum -->
<property name="md5sum.binary-prefix" value=" *" />
+ <!-- Files that need to have their line endings changed for src distros -->
+ <patternset id="src.files" >
+ <include name="**/.classpath"/>
+ <include name="**/.project"/>
+ <include name="**/INSTALLLICENSE"/>
+ <include name="**/KEYS"/>
+ <include name="**/LICENSE"/>
+ <include name="**/NOTICE"/>
+ <include name="**/README"/>
+ <include name="**/RELEASE-NOTES"/>
+ <include name="**/VERSION"/>
+ <include name="**/manifest"/>
+ <include name="**/*.MF"/>
+ <include name="**/*.bat"/>
+ <include name="**/*.css"/>
+ <include name="**/*.dtd"/>
+ <include name="**/*.htm"/>
+ <include name="**/*.html"/>
+ <include name="**/*.ini"/>
+ <include name="**/*.java"/>
+ <include name="**/*.jsp"/>
+ <include name="**/*.jspf"/>
+ <include name="**/*.jspx"/>
+ <include name="**/subparseform.lib"/>
+ <include name="**/subroutines.lib"/>
+ <include name="**/*.manifest"/>
+ <include name="**/*.mdl"/>
+ <include name="**/*.nsi"/>
+ <include name="**/*.pl"/>
+ <include name="**/*.policy"/>
+ <include name="**/*.properties"/>
+ <include name="**/*.properties.default"/>
+ <include name="**/*.properties.minimal"/>
+ <include name="**/*.properties.sample"/>
+ <include name="**/*.sh"/>
+ <include name="**/*.shtml"/>
+ <include name="**/*.spec"/>
+ <include name="**/*.tag"/>
+ <include name="**/*.tagx"/>
+ <include name="**/*.tasks"/>
+ <include name="**/*.tld"/>
+ <include name="**/*.txt"/>
+ <include name="**/*.xml"/>
+ <include name="**/*.xsd"/>
+ <include name="**/*.xsl"/>
+ </patternset>
+
<!-- =================== DETECT: Display configuration ================== -->
<target name="detect"
description="Display configuration and conditional compilation flags">
@@ -1889,6 +1936,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 refid="src.files"/>
+ </fixcrlf>
<zip zipfile="${tomcat.release}/v${version}/src/${final-src.name}.zip">
<zipfileset dir="${tomcat.dist}/src" prefix="${final-src.name}" />
</zip>
@@ -1901,11 +1952,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"
- encoding="ISO-8859-1" fixlast="false" />
-
+ <fixcrlf srcdir="${tomcat.dist}/src" eol="lf"
+ encoding="ISO-8859-1" fixlast="false" >
+ <patternset refid="src.files"/>
+ </fixcrlf>
<tar longfile="gnu" compression="gzip"
tarfile="${tomcat.release}/v${version}/src/${final-src.name}.tar.gz">
<tarfileset dir="${tomcat.dist}/src" mode="755"
prefix="${final-src.name}">
Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=919165&r1=919164&r2=919165&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Thu Mar 4
20:27:23 2010
@@ -41,6 +41,10 @@
in catalina.sh. (fhanik/kkolinko)
</add>
<fix>
+ <bug>47609</bug>: Provide fail-safe EOL conversion for build process.
+ (sebb/markt/kkolinko)
+ </fix>
+ <fix>
<bug>47689</bug>: Enable the test Ant target to work. (markt)
</fix>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
