Author: remy.maucherat(a)jboss.com Date: 2009-05-25 10:32:57 -0400 (Mon, 25 May 2009) New Revision: 1062 Modified: trunk/build.xml trunk/dist.xml Log: - Some encoding tweaks. Modified: trunk/build.xml =================================================================== --- trunk/build.xml 2009-05-25 14:32:03 UTC (rev 1061) +++ trunk/build.xml 2009-05-25 14:32:57 UTC (rev 1062) @@ -337,7 +337,7 @@ </copy> <filter token="VERSION" value="${version}"/> <copy tofile="${tomcat.build}/webapps/docs/RELEASE-NOTES.txt" file="RELEASE-NOTES" - filtering="true" /> + filtering="true" encoding="ISO-8859-1" /> <copy tofile="${tomcat.build}/webapps/docs/appdev/sample/build.xml" file="webapps/docs/appdev/build.xml.txt"/> @@ -573,7 +573,7 @@ <filter token="VERSION" value="${version}"/> <copy tofile="${tomcat.build}/webapps/ROOT/RELEASE-NOTES.txt" file="RELEASE-NOTES" - filtering="true" /> + filtering="true" encoding="ISO-8859-1" /> <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib" /> <copy file="${jasper-jdt.jar}" todir="${tomcat.build}/lib" /> Modified: trunk/dist.xml =================================================================== --- trunk/dist.xml 2009-05-25 14:32:03 UTC (rev 1061) +++ trunk/dist.xml 2009-05-25 14:32:57 UTC (rev 1062) @@ -128,8 +128,8 @@ <touch file="${tomcat.dist}/temp/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> @@ -141,7 +141,7 @@ author="true" version="true" windowtitle="JBoss Web API Documentation" doctitle="JBoss Web API" - bottom="Copyright &#169; 2000-2008 Apache Software Foundation. All Rights Reserved." + bottom="Copyright &amp;#169; 2000-${year} Apache Software Foundation. All Rights Reserved." additionalparam="-breakiterator" maxmemory="256m" > </javadoc> @@ -406,8 +406,8 @@ <!-- 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}"> @@ -471,8 +471,8 @@ <!-- 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"> @@ -497,7 +497,7 @@ <target name="package-docs-tgz"> <!-- 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"> @@ -533,7 +533,8 @@ <!-- 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="**/*.jar,**/*.gif,**/*.bmp,**/*.jpg,**/*.ico,**/*.war,**/*.exe,**/*.pdf,**/*.bin,**/*.dia" eol="lf" + encoding="ISO-8859-1" fixlast="false"/> <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}" />