Author: rjung
Date: Wed Jan 6 18:09:56 2010
New Revision: 896588
URL: http://svn.apache.org/viewvc?rev=896588&view=rev
Log:
- add versions filter to ant files, needed for:
- backport r895203
Modified:
tomcat/tc6.0.x/trunk/build.xml
tomcat/tc6.0.x/trunk/dist.xml
Modified: tomcat/tc6.0.x/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.xml?rev=896588&r1=896587&r2=896588&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/build.xml (original)
+++ tomcat/tc6.0.x/trunk/build.xml Wed Jan 6 18:09:56 2010
@@ -104,6 +104,7 @@
<format property="TSTAMP" pattern="hh:mm:ss"/>
</tstamp>
<filterset id="version.filters">
+ <filter token="YEAR" value="${year}"/>
<filter token="VERSION" value="${version}"/>
<filter token="VERSION_NUMBER" value="${version.number}"/>
<filter token="VERSION_MAJOR" value="${version.major}"/>
@@ -148,15 +149,9 @@
<classpath refid="tomcat.classpath" />
<exclude name="org/apache/naming/factory/webservices/**" />
</javac>
- <tstamp>
- <format property="TODAY" pattern="MMM d yyyy" locale="en"/>
- <format property="TSTAMP" pattern="hh:mm:ss"/>
- </tstamp>
<!-- Copy static resource files -->
- <filter token="VERSION" value="${version}"/>
- <filter token="VERSION_NUMBER" value="${version.number}"/>
- <filter token="VERSION_BUILT" value="${TODAY} ${TSTAMP}"/>
- <copy todir="${tomcat.classes}" filtering="true" encoding="ISO-8859-1">
+ <copy todir="${tomcat.classes}" encoding="ISO-8859-1">
+ <filterset refid="version.filters"/>
<fileset dir="java">
<include name="**/*.properties"/>
<include name="**/*.dtd"/>
@@ -422,15 +417,16 @@
<exclude name="docs/architecture/*.xml"/>
</fileset>
</copy>
- <copy todir="${tomcat.build}/webapps/docs">
+ <copy todir="${tomcat.build}/webapps/docs" encoding="ISO-8859-1">
+ <filterset refid="version.filters"/>
<fileset dir=".">
<include name="BUILDING.txt"/>
<include name="RUNNING.txt"/>
</fileset>
</copy>
- <filter token="VERSION" value="${version}"/>
- <copy tofile="${tomcat.build}/webapps/docs/RELEASE-NOTES.txt"
file="RELEASE-NOTES"
- filtering="true" encoding="ISO-8859-1" />
+ <copy tofile="${tomcat.build}/webapps/docs/RELEASE-NOTES.txt"
file="RELEASE-NOTES" encoding="ISO-8859-1">
+ <filterset refid="version.filters"/>
+ </copy>
<copy tofile="${tomcat.build}/webapps/docs/appdev/sample/build.xml"
file="webapps/docs/appdev/build.xml.txt"/>
@@ -507,13 +503,23 @@
<copy todir="${tomcat.build}/bin">
<fileset dir="bin">
<exclude name="**/*.launch"/>
+ <exclude name="**/*.sh"/>
+ <exclude name="**/*.bat"/>
+ </fileset>
+ </copy>
+ <copy todir="${tomcat.build}/bin" encoding="ISO-8859-1">
+ <filterset refid="version.filters"/>
+ <fileset dir="bin">
+ <include name="**/*.sh"/>
+ <include name="**/*.bat"/>
</fileset>
</copy>
<!-- Copy doesn't retain permissions -->
<chmod dir="${tomcat.build}/bin" includes="*.sh" perm="+x"/>
<!-- Copy static resource files -->
- <copy todir="${tomcat.build}/conf">
+ <copy todir="${tomcat.build}/conf" encoding="ISO-8859-1">
+ <filterset refid="version.filters"/>
<fileset dir="conf">
<include name="**/*.policy"/>
<include name="**/*.xml"/>
@@ -525,15 +531,22 @@
<copy todir="${tomcat.build}/webapps">
<fileset dir="webapps">
<include name="ROOT/**"/>
+ <exclude name="ROOT/index.html"/>
<include name="examples/**"/>
<include name="manager/**"/>
<include name="host-manager/**"/>
</fileset>
</copy>
+ <copy todir="${tomcat.build}/webapps" encoding="ISO-8859-1">
+ <filterset refid="version.filters" />
+ <fileset dir="webapps">
+ <include name="ROOT/index.html"/>
+ </fileset>
+ </copy>
- <filter token="VERSION" value="${version}"/>
- <copy tofile="${tomcat.build}/webapps/ROOT/RELEASE-NOTES.txt"
file="RELEASE-NOTES"
- filtering="true" encoding="ISO-8859-1" />
+ <copy tofile="${tomcat.build}/webapps/ROOT/RELEASE-NOTES.txt"
file="RELEASE-NOTES" encoding="ISO-8859-1">
+ <filterset refid="version.filters"/>
+ </copy>
<!-- 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=896588&r1=896587&r2=896588&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/dist.xml (original)
+++ tomcat/tc6.0.x/trunk/dist.xml Wed Jan 6 18:09:56 2010
@@ -86,6 +86,15 @@
<property name="tomcat-dbcp.jar"
value="${tomcat-dbcp.home}/tomcat-dbcp.jar"/>
<property name="jasper-jdt.jar" value="${jasper-jdt.home}/jasper-jdt.jar"/>
+ <!-- Version info filter set -->
+ <filterset id="version.filters">
+ <filter token="YEAR" value="${year}"/>
+ <filter token="VERSION" value="${version}"/>
+ <filter token="VERSION_NUMBER" value="${version.number}"/>
+ <filter token="VERSION_MAJOR" value="${version.major}"/>
+ <filter token="VERSION_MAJOR_MINOR" value="${version.major.minor}"/>
+ </filterset>
+
<!-- Files that need to have their line endings changed for src distros -->
<patternset id="src.files" >
<include name="**/INSTALLLICENSE"/>
@@ -165,8 +174,8 @@
<target name="dist-static" depends="dist-prepare">
<!-- Copy the top-level documentation files -->
- <filter token="VERSION" value="${version}"/>
- <copy todir="${tomcat.dist}" filtering="true" encoding="ISO-8859-1">
+ <copy todir="${tomcat.dist}" encoding="ISO-8859-1">
+ <filterset refid="version.filters"/>
<fileset dir=".">
<include name="INSTALLING.txt"/>
<include name="LICENSE"/>
@@ -313,16 +322,13 @@
<copy file="${tomcat-native.home}/tcnative-1.dll.i64"
tofile="${tomcat.dist}/bin/i64/tcnative-1.dll" />
- <filter token="VERSION" value="${version}"/>
- <filter token="VERSION_NUMBER" value="${version.number}"/>
- <filter token="VERSION_MAJOR" value="${version.major}"/>
- <filter token="VERSION_MAJOR_MINOR" value="${version.major.minor}"/>
-
<!-- Make sure the RELEASE-NOTES has Windows line endings as they may be
displayed post-install -->
<fixcrlf srcdir="${tomcat.dist}/webapps/ROOT"
includes="RELEASE-NOTES.txt" eol="crlf" encoding="ISO-8859-1"
fixlast="false" />
- <copy file="res/tomcat.nsi" tofile="${tomcat.dist}/tomcat.nsi"
filtering="true" overwrite="true" encoding="ISO-8859-1" />
+ <copy file="res/tomcat.nsi" tofile="${tomcat.dist}/tomcat.nsi"
overwrite="true" encoding="ISO-8859-1">
+ <filterset refid="version.filters"/>
+ </copy>
<exec dir="${tomcat.dist}" executable="${nsis.exe}" osfamily="windows">
<arg value="/DNSISDIR=${nsis.home}" />
<arg value="tomcat.nsi" />
@@ -349,21 +355,23 @@
<target name="release"
depends="clean,dist-static,dist-deployer,installer,package-zip,package-winzip,package-tgz,package-deployer-zip,package-deployer-tgz,dist-source,dist-javadoc,package-docs-tgz,package-src-zip,package-src-tgz"
description="Create a Tomcat 6 packaged distribution">
- <filter token="VERSION" value="${version}"/>
<copy file="KEYS"
todir="${tomcat.release}/v${version}"/>
<copy file="RELEASE-NOTES"
todir="${tomcat.release}/v${version}"
- filtering="true"
- encoding="ISO-8859-1" />
+ encoding="ISO-8859-1">
+ <filterset refid="version.filters"/>
+ </copy>
<copy file="res/welcome.main.html"
tofile="${tomcat.release}/v${version}/README.html"
- filtering="true"
- encoding="ISO-8859-1" />
+ encoding="ISO-8859-1">
+ <filterset refid="version.filters"/>
+ </copy>
<copy file="res/welcome.bin.html"
tofile="${tomcat.release}/v${version}/bin/README.html"
- filtering="true"
- encoding="ISO-8859-1" />
+ encoding="ISO-8859-1">
+ <filterset refid="version.filters"/>
+ </copy>
<mkdir dir="${tomcat.release}/v${version}/bin/extras" />
<copy todir="${tomcat.release}/v${version}/bin/extras">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
