You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2015/12/16 11:52:39 UTC
svn commit: r1720320 - in /tomcat/site/trunk: README.txt build.xml
native-1.1-xdocs/
Author: markt
Date: Wed Dec 16 10:52:39 2015
New Revision: 1720320
URL: http://svn.apache.org/viewvc?rev=1720320&view=rev
Log:
First attempt at adding native-1.1 docs to the build script
Added:
tomcat/site/trunk/native-1.1-xdocs/
Modified:
tomcat/site/trunk/README.txt
tomcat/site/trunk/build.xml
Modified: tomcat/site/trunk/README.txt
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/README.txt?rev=1720320&r1=1720319&r2=1720320&view=diff
==============================================================================
--- tomcat/site/trunk/README.txt (original)
+++ tomcat/site/trunk/README.txt Wed Dec 16 10:52:39 2015
@@ -130,6 +130,7 @@ relevant Tomcat components are fully pre
cd tomcat-site
svn up --set-depth infinity docs/connectors-doc
svn up --set-depth infinity docs/native-doc
+ svn up --set-depth infinity docs/native-1.1-doc
One way to update documentation is to:
@@ -146,7 +147,7 @@ For the latter:
A)
- Use "svn switch" command to switch jk-xdocs or native-xdocs
+ Use "svn switch" command to switch jk-xdocs, native-xdocs or native-1.1-xdocs
directories to xdocs directory of trunk or tag in those projects.
The command looks like the following:
@@ -155,22 +156,26 @@ A)
svn switch "^/tomcat/jk/trunk/xdocs" jk-xdocs
svn switch "^/tomcat/native/trunk/xdocs" native-xdocs
+ svn switch "^/tomcat/native/branches/1.1.x/xdocs" native-1.1-xdocs
To switch to tags for released versions:
svn switch "^/tomcat/jk/tags/JK_1_2_xx/xdocs" jk-xdocs
svn switch "^/tomcat/native/tags/TOMCAT_NATIVE_1_2_xx/xdocs" native-xdocs
+ svn switch "^/tomcat/native/tags/TOMCAT_NATIVE_1_1_xx/xdocs" native-1.1-xdocs
To switch back to empty directories:
svn switch "^/tomcat/site/trunk/jk-xdocs" jk-xdocs
svn switch "^/tomcat/site/trunk/native-xdocs" native-xdocs
+ svn switch "^/tomcat/site/trunk/native-1.1-xdocs" native-1.1-xdocs
To check to what URLs switched directories are mapped:
svn info jk-xdocs
svn info native-xdocs
+ svn info native-1.1-xdocs
B)
@@ -183,6 +188,7 @@ commands:
ant release-jk
ant release-native
+ ant release-native-1.1
3. Check the changes with "svn status" command.
Modified: tomcat/site/trunk/build.xml
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/build.xml?rev=1720320&r1=1720319&r2=1720320&view=diff
==============================================================================
--- tomcat/site/trunk/build.xml (original)
+++ tomcat/site/trunk/build.xml Wed Dec 16 10:52:39 2015
@@ -176,7 +176,7 @@
<target name="release-native"
depends="docs"
- description="Used after a release to update the docs for Tomcat Native">
+ description="Used after a 1.2.x release to update the docs for Tomcat Native">
<!-- Delete the old version -->
<delete dir="${docs.dest}/native-doc"/>
@@ -188,6 +188,20 @@
</ant>
</target>
+ <target name="release-native-1.1"
+ depends="docs"
+ description="Used after a 1.1.x release to update the docs for Tomcat Native">
+
+ <!-- Delete the old version -->
+ <delete dir="${docs.dest}/native-1.1-doc"/>
+
+ <!-- Update the Tomcat native docs -->
+ <ant dir="native-1.1-xdocs" antfile="build.xml" target="build-main">
+ <property name="build.dir" value="../docs" />
+ <property name="dist.name" value="native-1.1-doc" />
+ </ant>
+ </target>
+
<target name="release-jk"
depends="docs"
description="Used after a release to update the docs for Tomcat Connectors">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org