Author: kkolinko
Date: Mon Jun 8 02:03:41 2009
New Revision: 782504
URL: http://svn.apache.org/viewvc?rev=782504&view=rev
Log:
Build files: Apply explicit encoding to all operations that perform filtering.
Those are: 1) <copy>, when filtering is used (has filtering="true" or has a
nested <filterset>), 2) <fixcrlf>
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/build.xml
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=782504&r1=782503&r2=782504&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Mon Jun 8 02:03:41 2009
@@ -88,11 +88,6 @@
-0: kkolinko: http://marc.info/?l=tomcat-dev&m=124192105131636&w=2
-1:
-* Build files: Apply explicit encoding to all operations that perform
filtering.
- http://svn.apache.org/viewvc?rev=776921&view=rev
- +1: kkolinko, markt, funkman
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44943
For zip/tgz distributives it was already fixed in 6.0.17, 5.5.27.
Now, apply the same fix to exe distributive.
Modified: tomcat/tc6.0.x/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.xml?rev=782504&r1=782503&r2=782504&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/build.xml (original)
+++ tomcat/tc6.0.x/trunk/build.xml Mon Jun 8 02:03:41 2009
@@ -260,7 +260,8 @@
<copy tofile="res/manifest.tmp"
file="res/servlet-api.jar.manifest"
overwrite="yes"
- filtering="true" />
+ filtering="true"
+ encoding="ISO-8859-1" />
<jar jarfile="${servlet-api.jar}"
manifest="res/manifest.tmp">
<fileset dir="res">
@@ -280,7 +281,8 @@
<copy tofile="res/manifest.tmp"
file="res/jsp-api.jar.manifest"
overwrite="yes"
- filtering="true" />
+ filtering="true"
+ encoding="ISO-8859-1" />
<jar jarfile="${jsp-api.jar}"
manifest="res/manifest.tmp">
<fileset dir="res">
@@ -374,7 +376,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"/>
@@ -477,7 +479,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" />
<!-- Build classes for examples webapp -->
<javac srcdir="webapps/examples/WEB-INF/classes"
Modified: tomcat/tc6.0.x/trunk/dist.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/dist.xml?rev=782504&r1=782503&r2=782504&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/dist.xml (original)
+++ tomcat/tc6.0.x/trunk/dist.xml Mon Jun 8 02:03:41 2009
@@ -216,7 +216,7 @@
<!-- Copy the top-level documentation files -->
<filter token="VERSION" value="${version}"/>
- <copy todir="${tomcat.dist}" filtering="true">
+ <copy todir="${tomcat.dist}" filtering="true" encoding="ISO-8859-1">
<fileset dir=".">
<include name="INSTALLING.txt"/>
<include name="LICENSE"/>
@@ -249,8 +249,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"
fixlast="false" />
- <fixcrlf srcdir="${tomcat.dist}/bin" includes="*.bat" eol="crlf"
fixlast="false" />
+ <fixcrlf srcdir="${tomcat.dist}/bin" includes="*.sh" eol="lf"
fixlast="false" encoding="ISO-8859-1" />
+ <fixcrlf srcdir="${tomcat.dist}/bin" includes="*.bat" eol="crlf"
fixlast="false" encoding="ISO-8859-1" />
<chmod dir="${tomcat.dist}/bin" includes="*.sh" perm="+x"/>
</target>
@@ -368,7 +368,7 @@
<filter token="VERSION_MAJOR" value="${version.major}"/>
<filter token="VERSION_MAJOR_MINOR" value="${version.major.minor}"/>
- <copy file="res/tomcat.nsi" tofile="${tomcat.dist}/tomcat.nsi"
filtering="true" overwrite="true"/>
+ <copy file="res/tomcat.nsi" tofile="${tomcat.dist}/tomcat.nsi"
filtering="true" overwrite="true" encoding="ISO-8859-1" />
<exec dir="${tomcat.dist}" executable="${nsis.exe}" osfamily="windows">
<arg value="/DNSISDIR=${nsis.home}" />
<arg value="tomcat.nsi" />
@@ -398,13 +398,16 @@
todir="${tomcat.release}/v${version}"/>
<copy file="RELEASE-NOTES"
todir="${tomcat.release}/v${version}"
- filtering="true"/>
+ filtering="true"
+ encoding="ISO-8859-1" />
<copy file="res/welcome.main.html"
tofile="${tomcat.release}/v${version}/README.html"
- filtering="true"/>
+ filtering="true"
+ encoding="ISO-8859-1" />
<copy file="res/welcome.bin.html"
tofile="${tomcat.release}/v${version}/bin/README.html"
- filtering="true"/>
+ filtering="true"
+ encoding="ISO-8859-1" />
<mkdir dir="${tomcat.release}/v${version}/bin/extras" />
<copy todir="${tomcat.release}/v${version}/bin/extras">
@@ -459,8 +462,8 @@
<!-- Packages the core tar.gz distro -->
<target name="package-tgz">
- <fixcrlf srcdir="${tomcat.dist}" includes="*.txt,LICENSE,NOTICE" eol="lf"
fixlast="false" />
- <fixcrlf srcdir="${tomcat.dist}/conf" eol="lf" fixlast="false" />
+ <fixcrlf srcdir="${tomcat.dist}" includes="*.txt,LICENSE,NOTICE" eol="lf"
fixlast="false" encoding="ISO-8859-1" />
+ <fixcrlf srcdir="${tomcat.dist}/conf" eol="lf" fixlast="false"
encoding="ISO-8859-1" />
<tar longfile="gnu" compression="gzip"
tarfile="${tomcat.release}/v${version}/bin/${final.name}.tar.gz">
<tarfileset dir="${tomcat.dist}" mode="755" prefix="${final.name}">
@@ -519,8 +522,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" fixlast="false" />
- <fixcrlf srcdir="${tomcat.deployer}" includes="*.xml" eol="lf"
fixlast="false" />
+ includes="*.txt,LICENSE,NOTICE" eol="lf" fixlast="false"
encoding="ISO-8859-1" />
+ <fixcrlf srcdir="${tomcat.deployer}" includes="*.xml" eol="lf"
fixlast="false" encoding="ISO-8859-1" />
<tar longfile="gnu" compression="gzip"
tarfile="${tomcat.release}/v${version}/bin/${final.name}-deployer.tar.gz">
@@ -545,7 +548,7 @@
<target name="package-docs-tgz">
<!-- Package gocs -->
- <fixcrlf srcdir="${tomcat.dist}" includes="*.txt,LICENSE,NOTICE" eol="lf"
fixlast="false" />
+ <fixcrlf srcdir="${tomcat.dist}" includes="*.txt,LICENSE,NOTICE" eol="lf"
fixlast="false" encoding="ISO-8859-1" />
<tar longfile="gnu" compression="gzip"
tarfile="${tomcat.release}/v${version}/bin/${final.name}-fulldocs.tar.gz">
@@ -582,7 +585,7 @@
<target name="package-src-tgz">
<fixcrlf srcdir="${tomcat.dist}/src"
excludes="**/*.jar,**/*.gif,**/*.bmp,**/*.jpg,**/*.ico,**/*.war,**/*.exe,**/*.pdf,**/*.bin,**/*.dia"
- eol="lf" fixlast="false" />
+ eol="lf" fixlast="false" encoding="ISO-8859-1" />
<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=782504&r1=782503&r2=782504&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Mon Jun 8 02:03:41 2009
@@ -99,6 +99,10 @@
Don't add blank lines to end of files when fixing line-endings for
tar.gz distribution. (markt)
</fix>
+ <fix>
+ Use explicit encoding during filtering operations when building Tomcat
+ for distribution. (kkolinko)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
