Author: markt
Date: Thu Jun 17 11:22:07 2021
New Revision: 1890866
URL: http://svn.apache.org/viewvc?rev=1890866&view=rev
Log:
Add 10.1.x support. Small renaming to better align with other version
references.
Modified:
tomcat/site/trunk/build.properties.default
tomcat/site/trunk/build.xml
Modified: tomcat/site/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/build.properties.default?rev=1890866&r1=1890865&r2=1890866&view=diff
==============================================================================
--- tomcat/site/trunk/build.properties.default (original)
+++ tomcat/site/trunk/build.properties.default Thu Jun 17 11:22:07 2021
@@ -36,23 +36,27 @@ tomcat.loc=https://downloads.apache.org/
# ----- Tomcat versions -----
-tomcat70=7.0.109
-tomcat85=8.5.68
-tomcat90=9.0.46
-tomcat100=10.0.6
+tomcat7.0=7.0.109
+tomcat8.5=8.5.68
+tomcat9.0=9.0.46
+tomcat10.0=10.0.6
+tomcat10.1=10.1.0-M1
# ----- Download destination -----
tomcat-site-docs.home=${base.path}/tomcat-site-docs/
# ----- Tomcat Docs locations -----
-tomcat70.loc=${tomcat.loc}/tomcat-7/v${tomcat70}/bin/apache-tomcat-${tomcat70}-fulldocs.tar.gz
-tomcat70.home=${tomcat-site-docs.home}/${tomcat70}
+tomcat7.0.loc=${tomcat.loc}/tomcat-7/v${tomcat7.0}/bin/apache-tomcat-${tomcat7.0}-fulldocs.tar.gz
+tomcat7.0.home=${tomcat-site-docs.home}/${tomcat7.0}
-tomcat85.loc=${tomcat.loc}/tomcat-8/v${tomcat85}/bin/apache-tomcat-${tomcat85}-fulldocs.tar.gz
-tomcat85.home=${tomcat-site-docs.home}/${tomcat85}
+tomcat8.5.loc=${tomcat.loc}/tomcat-8/v${tomcat8.5}/bin/apache-tomcat-${tomcat8.5}-fulldocs.tar.gz
+tomcat8.5.home=${tomcat-site-docs.home}/${tomcat8.5}
-tomcat90.loc=${tomcat.loc}/tomcat-9/v${tomcat90}/bin/apache-tomcat-${tomcat90}-fulldocs.tar.gz
-tomcat90.home=${tomcat-site-docs.home}/${tomcat90}
+tomcat9.0.loc=${tomcat.loc}/tomcat-9/v${tomcat9.0}/bin/apache-tomcat-${tomcat9.0}-fulldocs.tar.gz
+tomcat9.0.home=${tomcat-site-docs.home}/${tomcat9.0}
-tomcat100.loc=${tomcat.loc}/tomcat-10/v${tomcat100}/bin/apache-tomcat-${tomcat100}-fulldocs.tar.gz
-tomcat100.home=${tomcat-site-docs.home}/${tomcat100}
+tomcat10.0.loc=${tomcat.loc}/tomcat-10/v${tomcat10.0}/bin/apache-tomcat-${tomcat10.0}-fulldocs.tar.gz
+tomcat10.0.home=${tomcat-site-docs.home}/${tomcat10.0}
+
+tomcat10.1.loc=${tomcat.loc}/tomcat-10/v${tomcat10.1}/bin/apache-tomcat-${tomcat10.1}-fulldocs.tar.gz
+tomcat10.1.home=${tomcat-site-docs.home}/${tomcat10.1}
Modified: tomcat/site/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/build.xml?rev=1890866&r1=1890865&r2=1890866&view=diff
==============================================================================
--- tomcat/site/trunk/build.xml (original)
+++ tomcat/site/trunk/build.xml Thu Jun 17 11:22:07 2021
@@ -91,15 +91,15 @@
</target>
- <target name="release-7"
+ <target name="release-7.0"
depends="docs"
description="Used after a release to update the docs for Tomcat 7.0">
<!-- Download the latest version -->
<antcall target="downloadgz">
- <param name="sourcefile" value="${tomcat70.loc}"/>
- <param name="destfile"
value="${tomcat70.home}/tomcat-7.0-doc/index.html"/>
- <param name="destdir" value="${tomcat70.home}"/>
+ <param name="sourcefile" value="${tomcat7.0.loc}"/>
+ <param name="destfile"
value="${tomcat7.0.home}/tomcat-7.0-doc/index.html"/>
+ <param name="destdir" value="${tomcat7.0.home}"/>
</antcall>
<!-- Delete the old version -->
@@ -107,21 +107,21 @@
<!-- Copy the latest version -->
<copy todir="${docs.dest}/tomcat-7.0-doc" >
- <fileset dir="${tomcat70.home}/tomcat-7.0-doc" >
+ <fileset dir="${tomcat7.0.home}/tomcat-7.0-doc" >
<exclude name="/WEB-INF/**" />
</fileset>
</copy>
</target>
- <target name="release-85"
+ <target name="release-8.5"
depends="docs"
description="Used after a release to update the docs for Tomcat 8.5">
<!-- Download the latest version -->
<antcall target="downloadgz">
- <param name="sourcefile" value="${tomcat85.loc}"/>
- <param name="destfile"
value="${tomcat85.home}/tomcat-8.5-doc/index.html"/>
- <param name="destdir" value="${tomcat85.home}"/>
+ <param name="sourcefile" value="${tomcat8.5.loc}"/>
+ <param name="destfile"
value="${tomcat8.5.home}/tomcat-8.5-doc/index.html"/>
+ <param name="destdir" value="${tomcat8.5.home}"/>
</antcall>
<!-- Delete the old version -->
@@ -129,21 +129,21 @@
<!-- Copy the latest version -->
<copy todir="${docs.dest}/tomcat-8.5-doc" >
- <fileset dir="${tomcat85.home}/tomcat-8.5-doc" >
+ <fileset dir="${tomcat8.5.home}/tomcat-8.5-doc" >
<exclude name="/WEB-INF/**" />
</fileset>
</copy>
</target>
- <target name="release-9"
+ <target name="release-9.0"
depends="docs"
description="Used after a release to update the docs for Tomcat 9.0">
<!-- Download the latest version -->
<antcall target="downloadgz">
- <param name="sourcefile" value="${tomcat90.loc}"/>
- <param name="destfile"
value="${tomcat90.home}/tomcat-9.0-doc/index.html"/>
- <param name="destdir" value="${tomcat90.home}"/>
+ <param name="sourcefile" value="${tomcat9.0.loc}"/>
+ <param name="destfile"
value="${tomcat9.0.home}/tomcat-9.0-doc/index.html"/>
+ <param name="destdir" value="${tomcat9.0.home}"/>
</antcall>
<!-- Delete the old version -->
@@ -151,21 +151,21 @@
<!-- Copy the latest version -->
<copy todir="${docs.dest}/tomcat-9.0-doc" >
- <fileset dir="${tomcat90.home}/tomcat-9.0-doc" >
+ <fileset dir="${tomcat9.0.home}/tomcat-9.0-doc" >
<exclude name="/WEB-INF/**" />
</fileset>
</copy>
</target>
- <target name="release-10"
+ <target name="release-10.0"
depends="docs"
description="Used after a release to update the docs for Tomcat
10.0">
- <!-- Download the latest version -->
+ <!-- Download the latest version -->
<antcall target="downloadgz">
- <param name="sourcefile" value="${tomcat100.loc}"/>
- <param name="destfile"
value="${tomcat100.home}/tomcat-10.0-doc/index.html"/>
- <param name="destdir" value="${tomcat100.home}"/>
+ <param name="sourcefile" value="${tomcat10.0.loc}"/>
+ <param name="destfile"
value="${tomcat10.0.home}/tomcat-10.0-doc/index.html"/>
+ <param name="destdir" value="${tomcat10.0.home}"/>
</antcall>
<!-- Delete the old version -->
@@ -173,7 +173,29 @@
<!-- Copy the latest version -->
<copy todir="${docs.dest}/tomcat-10.0-doc" >
- <fileset dir="${tomcat100.home}/tomcat-10.0-doc" >
+ <fileset dir="${tomcat10.0.home}/tomcat-10.0-doc" >
+ <exclude name="/WEB-INF/**" />
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="release-10.1"
+ depends="docs"
+ description="Used after a release to update the docs for Tomcat
10.1">
+
+ <!-- Download the latest version -->
+ <antcall target="downloadgz">
+ <param name="sourcefile" value="${tomcat10.1.loc}"/>
+ <param name="destfile"
value="${tomcat10.1.home}/tomcat-10.0-doc/index.html"/>
+ <param name="destdir" value="${tomcat10.1.home}"/>
+ </antcall>
+
+ <!-- Delete the old version -->
+ <delete dir="${docs.dest}/tomcat-10.1-doc"/>
+
+ <!-- Copy the latest version -->
+ <copy todir="${docs.dest}/tomcat-10.1-doc" >
+ <fileset dir="${tomcat10.1.home}/tomcat-10.1-doc" >
<exclude name="/WEB-INF/**" />
</fileset>
</copy>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
