Author: kkolinko
Date: Tue Jul 7 12:11:57 2009
New Revision: 791806
URL: http://svn.apache.org/viewvc?rev=791806&view=rev
Log:
Patch for fixcrlf tasks:
* Specify explicit encoding, instead of using the platform default one
* Don't add blank lines to files
* Added **/*.rtf to the list of exclusions and sorted it alphabetically.
(We have a License.rtf file)
Note, that fixlast option for fixcrlf task is since Ant 1.6.1 only.
Modified:
tomcat/build/tc5.5.x/build.xml
tomcat/container/tc5.5.x/build.xml
tomcat/container/tc5.5.x/catalina/build.xml
tomcat/container/tc5.5.x/tester/build.xml
tomcat/current/tc5.5.x/STATUS.txt
tomcat/jasper/tc5.5.x/build.xml
Modified: tomcat/build/tc5.5.x/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/build/tc5.5.x/build.xml?rev=791806&r1=791805&r2=791806&view=diff
==============================================================================
--- tomcat/build/tc5.5.x/build.xml (original)
+++ tomcat/build/tc5.5.x/build.xml Tue Jul 7 12:11:57 2009
@@ -621,8 +621,10 @@
<antcall target="build-i18n"/>
<!-- Correct permissions and line endings on "bin" scripts -->
- <fixcrlf srcdir="${tomcat.build}/bin" includes="*.sh" eol="lf"/>
- <fixcrlf srcdir="${tomcat.build}/bin" includes="*.bat" eol="crlf"/>
+ <fixcrlf srcdir="${tomcat.build}/bin" includes="*.sh" eol="lf"
+ encoding="ISO-8859-1" fixlast="false" />
+ <fixcrlf srcdir="${tomcat.build}/bin" includes="*.bat" eol="crlf"
+ encoding="ISO-8859-1" fixlast="false" />
<chmod dir="${tomcat.build}/bin" includes="*.sh" perm="+x"/>
</target>
@@ -1102,8 +1104,10 @@
<antcall target="build-jasper"/>
<!-- Correct permissions and line endings on "bin" scripts -->
- <fixcrlf srcdir="${tomcat.build}/bin" includes="*.sh" eol="lf"/>
- <fixcrlf srcdir="${tomcat.build}/bin" includes="*.bat" eol="crlf"/>
+ <fixcrlf srcdir="${tomcat.build}/bin" includes="*.sh" eol="lf"
+ encoding="ISO-8859-1" fixlast="false" />
+ <fixcrlf srcdir="${tomcat.build}/bin" includes="*.bat" eol="crlf"
+ encoding="ISO-8859-1" fixlast="false" />
<chmod dir="${tomcat.build}/bin" includes="*.sh" perm="+x"/>
<antcall target="fix-webapps"/>
@@ -1371,8 +1375,10 @@
<touch file="${tomcat.dist}/temp/bugzilla37035-safeToDelete.tmp" />
<!-- Correct permissions and line endings on "bin" scripts -->
- <fixcrlf srcdir="${tomcat.dist}/bin" includes="*.sh" eol="lf"/>
- <fixcrlf srcdir="${tomcat.dist}/bin" includes="*.bat" eol="crlf"/>
+ <fixcrlf srcdir="${tomcat.dist}/bin" includes="*.sh" eol="lf"
+ encoding="ISO-8859-1" fixlast="false" />
+ <fixcrlf srcdir="${tomcat.dist}/bin" includes="*.bat" eol="crlf"
+ encoding="ISO-8859-1" fixlast="false" />
<chmod dir="${tomcat.dist}/bin" includes="*.sh" perm="+x"/>
</target>
@@ -1674,8 +1680,10 @@
<!-- Packages the core tar.gz distro -->
<target name="package-tgz">
- <fixcrlf srcdir="${tomcat.dist}" includes="*.txt,LICENSE,NOTICE" eol="lf"/>
- <fixcrlf srcdir="${tomcat.dist}/conf" eol="lf"/>
+ <fixcrlf srcdir="${tomcat.dist}" includes="*.txt,LICENSE,NOTICE" eol="lf"
+ encoding="ISO-8859-1" fixlast="false" />
+ <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">
<tarfileset dir="${tomcat.dist}" mode="755" prefix="${final.name}">
@@ -1736,8 +1744,10 @@
<!-- Packages the embedded Tomcat distro in tar.gz format -->
<target name="package-embed-tgz">
<fixcrlf srcdir="${tomcat.dist}"
- includes="*.txt,LICENSE,NOTICE" eol="lf"/>
- <fixcrlf srcdir="${tomcat.embed}" includes="*.xml" eol="lf"/>
+ includes="*.txt,LICENSE,NOTICE" eol="lf"
+ encoding="ISO-8859-1" fixlast="false" />
+ <fixcrlf srcdir="${tomcat.embed}" includes="*.xml" eol="lf"
+ encoding="ISO-8859-1" fixlast="false" />
<tar longfile="gnu" compression="gzip"
tarfile="${tomcat.release}/v${version}/bin/${final.name}-embed.tar.gz">
<tarfileset dir="${tomcat.dist}" prefix="${final.name}-embed">
@@ -1760,8 +1770,10 @@
<!-- Packages the deployer Tomcat distro in tar.gz format -->
<target name="package-deployer-tgz">
<fixcrlf srcdir="${tomcat.dist}"
- includes="*.txt,LICENSE,NOTICE" eol="lf"/>
- <fixcrlf srcdir="${tomcat.deployer}" includes="*.xml" eol="lf"/>
+ includes="*.txt,LICENSE,NOTICE" eol="lf"
+ encoding="ISO-8859-1" fixlast="false" />
+ <fixcrlf srcdir="${tomcat.deployer}" includes="*.xml" eol="lf"
+ encoding="ISO-8859-1" fixlast="false" />
<tar longfile="gnu" compression="gzip"
tarfile="${tomcat.release}/v${version}/bin/${final.name}-deployer.tar.gz">
@@ -1784,7 +1796,8 @@
<!-- Packages the 1.4 compatibility distro in tar.gz format -->
<target name="package-compat-tgz">
- <fixcrlf srcdir="${tomcat.dist}" includes="*.txt,LICENSE,NOTICE" eol="lf"/>
+ <fixcrlf srcdir="${tomcat.dist}" includes="*.txt,LICENSE,NOTICE" eol="lf"
+ encoding="ISO-8859-1" fixlast="false" />
<tar longfile="gnu" compression="gzip"
tarfile="${tomcat.release}/v${version}/bin/${final.name}-compat.tar.gz">
@@ -1807,7 +1820,8 @@
<!-- Packages the admin webapp distro in tar.gz format -->
<target name="package-admin-tgz">
- <fixcrlf srcdir="${tomcat.dist}" includes="*.txt,LICENSE,NOTICE" eol="lf"/>
+ <fixcrlf srcdir="${tomcat.dist}" includes="*.txt,LICENSE,NOTICE" eol="lf"
+ encoding="ISO-8859-1" fixlast="false" />
<tar longfile="gnu" compression="gzip"
tarfile="${tomcat.release}/v${version}/bin/${final.name}-admin.tar.gz">
@@ -1847,7 +1861,8 @@
</copy>
<!-- Package gocs -->
- <fixcrlf srcdir="${tomcat.dist}" includes="*.txt,LICENSE,NOTICE" eol="lf"/>
+ <fixcrlf srcdir="${tomcat.dist}" includes="*.txt,LICENSE,NOTICE" eol="lf"
+ encoding="ISO-8859-1" fixlast="false" />
<tar longfile="gnu" compression="gzip"
tarfile="${tomcat.release}/v${version}/bin/${final.name}-fulldocs.tar.gz">
@@ -1883,8 +1898,9 @@
<!-- Packages the source code distribution in tar.gz format -->
<target name="package-src-tgz">
<fixcrlf srcdir="${tomcat.dist}/src"
-
excludes="**/*.jar,**/*.gif,**/*.bmp,**/*.jpg,**/*.ico,**/*.war,**/*.exe,**/*.pdf,**/*.bin,**/*.dia"
- eol="lf" />
+
excludes="**/*.bin,**/*.bmp,**/*.dia,**/*.exe,**/*.gif,**/*.ico,**/*.jar,**/*.jpg,**/*.pdf,**/*.rtf,**/*.war"
+ eol="lf"
+ encoding="ISO-8859-1" fixlast="false" />
<tar longfile="gnu" compression="gzip"
tarfile="${tomcat.release}/v${version}/src/${final-src.name}.tar.gz">
Modified: tomcat/container/tc5.5.x/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/build.xml?rev=791806&r1=791805&r2=791806&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/build.xml (original)
+++ tomcat/container/tc5.5.x/build.xml Tue Jul 7 12:11:57 2009
@@ -179,8 +179,10 @@
</copy>
<!-- Correct permissions and line endings on "bin" scripts -->
- <fixcrlf srcdir="${tomcat.dist}/bin" includes="*.sh" eol="lf"/>
- <fixcrlf srcdir="${tomcat.dist}/bin" includes="*.bat" eol="crlf"/>
+ <fixcrlf srcdir="${tomcat.dist}/bin" includes="*.sh" eol="lf"
+ encoding="ISO-8859-1" fixlast="false" />
+ <fixcrlf srcdir="${tomcat.dist}/bin" includes="*.bat" eol="crlf"
+ encoding="ISO-8859-1" fixlast="false" />
<chmod dir="${tomcat.dist}/bin" includes="*.sh" perm="+x"/>
</target>
Modified: tomcat/container/tc5.5.x/catalina/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/build.xml?rev=791806&r1=791805&r2=791806&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/catalina/build.xml (original)
+++ tomcat/container/tc5.5.x/catalina/build.xml Tue Jul 7 12:11:57 2009
@@ -556,8 +556,10 @@
<copy todir="${catalina.build}/bin">
<fileset dir="src/bin"
excludes="*-using-launcher.*,launcher.properties,catalina.xml,*-tasks.xml" />
</copy>
- <fixcrlf srcdir="${catalina.build}/bin" includes="*.sh" eol="lf"/>
- <fixcrlf srcdir="${catalina.build}/bin" includes="*.bat" eol="crlf"/>
+ <fixcrlf srcdir="${catalina.build}/bin" includes="*.sh" eol="lf"
+ encoding="ISO-8859-1" fixlast="false" />
+ <fixcrlf srcdir="${catalina.build}/bin" includes="*.bat" eol="crlf"
+ encoding="ISO-8859-1" fixlast="false" />
<chmod perm="+x" dir="${catalina.build}/bin" includes="*.sh"/>
<!-- Common Extensions -->
@@ -898,8 +900,10 @@
<copy todir="${catalina.deploy}/bin">
<fileset dir="src/bin"
excludes="*-using-launcher.*,launcher.properties,catalina.xml" />
</copy>
- <fixcrlf srcdir="${catalina.deploy}/bin" includes="*.sh" eol="lf"/>
- <fixcrlf srcdir="${catalina.deploy}/bin" includes="*.bat" eol="crlf"/>
+ <fixcrlf srcdir="${catalina.deploy}/bin" includes="*.sh" eol="lf"
+ encoding="ISO-8859-1" fixlast="false" />
+ <fixcrlf srcdir="${catalina.deploy}/bin" includes="*.bat" eol="crlf"
+ encoding="ISO-8859-1" fixlast="false" />
<chmod perm="+x" dir="${catalina.build}/bin" includes="*.sh"/>
<!-- Configuration Files -->
@@ -1180,8 +1184,10 @@
<copy todir="${catalina.dist}/bin">
<fileset dir="src/bin"
excludes="*-using-launcher.*,launcher.properties,catalina.xml" />
</copy>
- <fixcrlf srcdir="${catalina.dist}/bin" includes="*.sh" eol="lf"/>
- <fixcrlf srcdir="${catalina.dist}/bin" includes="*.bat" eol="crlf"/>
+ <fixcrlf srcdir="${catalina.dist}/bin" includes="*.sh" eol="lf"
+ encoding="ISO-8859-1" fixlast="false" />
+ <fixcrlf srcdir="${catalina.dist}/bin" includes="*.bat" eol="crlf"
+ encoding="ISO-8859-1" fixlast="false" />
<chmod perm="+x" dir="${catalina.build}/bin" includes="*.sh"/>
<!-- Common Extensions -->
Modified: tomcat/container/tc5.5.x/tester/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/tester/build.xml?rev=791806&r1=791805&r2=791806&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/tester/build.xml (original)
+++ tomcat/container/tc5.5.x/tester/build.xml Tue Jul 7 12:11:57 2009
@@ -52,8 +52,10 @@
<copy todir="${tester.build}/bin">
<fileset dir="src/bin" />
</copy>
- <fixcrlf srcdir="${tester.build}/bin" includes="*.sh" eol="lf"/>
- <fixcrlf srcdir="${tester.build}/bin" includes="*.bat" eol="crlf"/>
+ <fixcrlf srcdir="${tester.build}/bin" includes="*.sh" eol="lf"
+ encoding="ISO-8859-1" fixlast="false" />
+ <fixcrlf srcdir="${tester.build}/bin" includes="*.bat" eol="crlf"
+ encoding="ISO-8859-1" fixlast="false" />
<chmod perm="+x" file="${tester.build}/bin/tester.sh"/>
<copy todir="${tester.build}/conf">
<fileset dir="src/conf" />
@@ -167,8 +169,10 @@
<copy todir="${tester.deploy}/bin">
<fileset dir="${tester.build}/bin" />
</copy>
- <fixcrlf srcdir="${tester.deploy}/bin" includes="*.sh" eol="lf"/>
- <fixcrlf srcdir="${tester.deploy}/bin" includes="*.bat" eol="crlf"/>
+ <fixcrlf srcdir="${tester.deploy}/bin" includes="*.sh" eol="lf"
+ encoding="ISO-8859-1" fixlast="false" />
+ <fixcrlf srcdir="${tester.deploy}/bin" includes="*.bat" eol="crlf"
+ encoding="ISO-8859-1" fixlast="false" />
<chmod perm="+x" file="${tester.deploy}/bin/tester.sh"/>
<copy todir="${tester.deploy}/conf" overwrite="true">
<fileset dir="${tester.build}/conf" />
@@ -220,8 +224,10 @@
<copy todir="${tester.dist}/bin">
<fileset dir="${tester.build}/bin" />
</copy>
- <fixcrlf srcdir="${tester.dist}/bin" includes="*.sh" eol="lf"/>
- <fixcrlf srcdir="${tester.dist}/bin" includes="*.bat" eol="crlf"/>
+ <fixcrlf srcdir="${tester.dist}/bin" includes="*.sh" eol="lf"
+ encoding="ISO-8859-1" fixlast="false" />
+ <fixcrlf srcdir="${tester.dist}/bin" includes="*.bat" eol="crlf"
+ encoding="ISO-8859-1" fixlast="false" />
<chmod perm="+x" file="${tester.dist}/bin/tester.sh"/>
<mkdir dir="${tester.dist}/webapps"/>
Modified: tomcat/current/tc5.5.x/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=791806&r1=791805&r2=791806&view=diff
==============================================================================
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Tue Jul 7 12:11:57 2009
@@ -75,16 +75,6 @@
+1: markt - min JRE version is 1.4, even with the compat package
-1:
-* Patch for fixcrlf tasks:
- * Specify explicit encoding, instead of using the platform default one
- * Don't add blank lines to files
- * Added **/*.rtf to the list of exclusions and sorted it alphabetically.
- (We have a License.rtf file)
- Note, that fixlast option for fixcrlf task is since Ant 1.6.1 only.
- http://people.apache.org/~kkolinko/patches/2009-07-04_tc55_fixcrlf.patch
- +1: kkolinko, markt, rjung
- -1:
-
* Specify explicit encoding when performing filtering in copy and replace tasks
http://people.apache.org/~kkolinko/patches/2009-07-04_tc55_copy-encodings.patch
+1: kkolinko, markt, rjung
Modified: tomcat/jasper/tc5.5.x/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/jasper/tc5.5.x/build.xml?rev=791806&r1=791805&r2=791806&view=diff
==============================================================================
--- tomcat/jasper/tc5.5.x/build.xml (original)
+++ tomcat/jasper/tc5.5.x/build.xml Tue Jul 7 12:11:57 2009
@@ -119,8 +119,10 @@
<copy todir="${jasper.build}/bin">
<fileset dir="src/bin"
excludes="*-using-launcher.*,launcher.properties,jasper.xml" />
</copy>
- <fixcrlf srcdir="${jasper.build}/bin" includes="*.sh" eol="lf"/>
- <fixcrlf srcdir="${jasper.build}/bin" includes="*.bat" eol="crlf"/>
+ <fixcrlf srcdir="${jasper.build}/bin" includes="*.sh" eol="lf"
+ encoding="ISO-8859-1" fixlast="false" />
+ <fixcrlf srcdir="${jasper.build}/bin" includes="*.bat" eol="crlf"
+ encoding="ISO-8859-1" fixlast="false" />
<chmod perm="+x" dir="${jasper.build}/bin" includes="*.sh"/>
</target>
@@ -261,8 +263,10 @@
<copy todir="${jasper.deploy}/bin">
<fileset dir="${jasper.build}/bin" />
</copy>
- <fixcrlf srcdir="${jasper.deploy}/bin" includes="*.sh" eol="lf"/>
- <fixcrlf srcdir="${jasper.deploy}/bin" includes="*.bat" eol="crlf"/>
+ <fixcrlf srcdir="${jasper.deploy}/bin" includes="*.sh" eol="lf"
+ encoding="ISO-8859-1" fixlast="false" />
+ <fixcrlf srcdir="${jasper.deploy}/bin" includes="*.bat" eol="crlf"
+ encoding="ISO-8859-1" fixlast="false" />
<chmod perm="+x" file="${jasper.deploy}/bin/jspc.sh"/>
</target>
@@ -296,8 +300,10 @@
<copy todir="${jasper.dist}/bin">
<fileset dir="${jasper.build}/bin" />
</copy>
- <fixcrlf srcdir="${jasper.dist}/bin" includes="*.sh" eol="lf"/>
- <fixcrlf srcdir="${jasper.dist}/bin" includes="*.bat" eol="crlf"/>
+ <fixcrlf srcdir="${jasper.dist}/bin" includes="*.sh" eol="lf"
+ encoding="ISO-8859-1" fixlast="false" />
+ <fixcrlf srcdir="${jasper.dist}/bin" includes="*.bat" eol="crlf"
+ encoding="ISO-8859-1" fixlast="false" />
<chmod perm="+x" file="${jasper.dist}/bin/jspc.sh"/>
<!-- Jasper Compiler and Runtime JAR Files -->
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
