tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kkoli...@apache.org
Subject svn commit: r1310130 - in /tomcat/site/trunk: README.txt build.xml
Date Thu, 05 Apr 2012 23:23:51 GMT
Author: kkolinko
Date: Thu Apr  5 23:23:51 2012
New Revision: 1310130

URL: http://svn.apache.org/viewvc?rev=1310130&view=rev
Log:
Split "release" target into separate targets

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=1310130&r1=1310129&r2=1310130&view=diff
==============================================================================
--- tomcat/site/trunk/README.txt (original)
+++ tomcat/site/trunk/README.txt Thu Apr  5 23:23:51 2012
@@ -26,14 +26,12 @@ This will build the documentation into t
 will show you which files got re-generated.
 
 If you would like to make modifications to the web site documents,
-you simply need to edit the files in the xdocs/ and/or xdocs-faq/ directory.
+you simply need to edit the files in the xdocs/ directory.
 
 The files in xdocs/stylesheets are the global files for the site. If you make a
 modification to project.xml, it will affect the left side navigation for the
 web site and all of your .html files will be re-generated.
 
-The xdocs-faq directory has its own project.xml and tomcat-faq.xsl
-
 Once you have built your documentation and confirmed that your changes are
 ok, you can check your .xml and your .html files back into SVN.
 
@@ -45,27 +43,50 @@ to have the changes reflected on the Tom
 
 
 
-To update the documentation for Tomcat 5.5.x, Tomcat 6.0.x, Tomcat 7.0.x
+To update the documentation for Tomcat 5.5.x, Tomcat 6.0.x, Tomcat 7.0.x:
+==========================================================================
 
 1. Set the version numbers in build.properties.default
-2. cd into your tomcat-site directory and execute:
-   ant release
-3. Check in the changes. Remember there may be deleted / missing files.
-4. In the /www/tomcat.apache.org/ directory on people.a.o execute:
+2. cd into your tomcat-site directory and execute one of the following
+   commands:
+
+   ant release-5
+   ant release-6
+   ant release-7
+
+3. Check the changes with "svn status" command.
+
+   Remember there may be deleted / missing files (shown with '!')
+   and new files (shown with '?').
+
+   Apply "svn delete" and "svn add" on those files as needed.
+
+4. Commit the changes. 
+
+5. In the /www/tomcat.apache.org/ directory on people.a.o execute:
+
    umask 002
    svn up
 
 
 
-To update the documentation for Tomcat Native or the 
-Merging connectors documentation
+To update the documentation for Tomcat Native or Tomcat Connectors:
+====================================================================
 
 1. Update the svn-external for tomcat-site to point to the correct revision.
    This *must* match the tag for the latest released version.
 2. cd into your tomcat-site directory and execute:
+
    svn up
-   ant release
-3. Check in the changes. Remember there may be deleted / missing files.
-4. In the /www/tomcat.apache.org/ directory on people.a.o execute:
+   ant release-native
+   ant release-jk
+
+3. Check the changes with "svn status" command.
+
+   Remember there may be deleted / missing files or new files.
+
+4. Commit the changes.
+5. In the /www/tomcat.apache.org/ directory on people.a.o execute:
+
    umask 002
    svn up

Modified: tomcat/site/trunk/build.xml
URL: http://svn.apache.org/viewvc/tomcat/site/trunk/build.xml?rev=1310130&r1=1310129&r2=1310130&view=diff
==============================================================================
--- tomcat/site/trunk/build.xml (original)
+++ tomcat/site/trunk/build.xml Thu Apr  5 23:23:51 2012
@@ -86,66 +86,98 @@
 
   </target>
 
-  <target name="release"
+  <target name="release-5"
           depends="docs"
-          description="Used after a release to update the version specific docs">
+          description="Used after a release to update the docs for Tomcat 5.5">
 
-    <!-- NOTE: This task only updates the docs for the currently supported
-               versions. The older releases (3.2, 3.3, 4.0 & 4.1) will not
-               be updated. -->
-
-    <!-- Download the latest versions -->
+    <!-- Download the latest version -->
     <antcall target="downloadgz">
       <param name="sourcefile" value="${tomcat55.loc}"/>
       <param name="destfile" value="${tomcat55.home}/tomcat-5.5-doc/index.html"/>
       <param name="destdir" value="${tomcat55.home}"/>
     </antcall>
-    <antcall target="downloadgz">
-      <param name="sourcefile" value="${tomcat60.loc}"/>
-      <param name="destfile" value="${tomcat60.home}/tomcat-6.0-doc/index.html"/>
-      <param name="destdir" value="${tomcat60.home}"/>
-    </antcall>
-    <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}"/>
-    </antcall>
 
-    <!-- Delete the old versions -->
+    <!-- Delete the old version -->
     <delete dir="${docs.dest}/tomcat-5.5-doc"/>
-    <delete dir="${docs.dest}/tomcat-6.0-doc"/>
-    <delete dir="${docs.dest}/tomcat-7.0-doc"/>
-    <delete dir="${docs.dest}/native-doc"/>
-    <delete dir="${docs.dest}/connectors-doc"/>
 
-    <!-- Copy the latest versions -->
+    <!-- Copy the latest version -->
     <copy todir="${docs.dest}/tomcat-5.5-doc" >
       <fileset dir="${tomcat55.home}/tomcat-5.5-doc" >
         <exclude name="/WEB-INF/**" />
       </fileset>
     </copy>
+  </target>
+
+  <target name="release-6"
+          depends="docs"
+          description="Used after a release to update the docs for Tomcat 6.0">
+
+    <!-- Download the latest version -->
+    <antcall target="downloadgz">
+      <param name="sourcefile" value="${tomcat60.loc}"/>
+      <param name="destfile" value="${tomcat60.home}/tomcat-6.0-doc/index.html"/>
+      <param name="destdir" value="${tomcat60.home}"/>
+    </antcall>
+
+    <!-- Delete the old version -->
+    <delete dir="${docs.dest}/tomcat-6.0-doc"/>
+
+    <!-- Copy the latest version -->
     <copy todir="${docs.dest}/tomcat-6.0-doc" >
       <fileset dir="${tomcat60.home}/tomcat-6.0-doc" >
         <exclude name="/WEB-INF/**" />
       </fileset>
     </copy>
+  </target>
+
+  <target name="release-7"
+          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}"/>
+    </antcall>
+
+    <!-- Delete the old version -->
+    <delete dir="${docs.dest}/tomcat-7.0-doc"/>
+
+    <!-- Copy the latest version -->
     <copy todir="${docs.dest}/tomcat-7.0-doc" >
       <fileset dir="${tomcat70.home}/tomcat-7.0-doc" >
         <exclude name="/WEB-INF/**" />
       </fileset>
     </copy>
+  </target>
+
+  <target name="release-native"
+          depends="docs"
+          description="Used after a release to update the docs for Tomcat Native">
+
+    <!-- Delete the old version -->
+    <delete dir="${docs.dest}/native-doc"/>
 
-    <!-- Update the JK connectors docs -->
-    <ant dir="jk-xdocs" antfile="build.xml" target="build-main">
-      <property name="build.dir" value="../docs" />
-      <property name="dist.name" value="connectors-doc" />
-    </ant>
     <!-- Update the Tomcat native docs -->
     <ant dir="native-xdocs" antfile="build.xml" target="build-main">
       <property name="build.dir" value="../docs" />
       <property name="dist.name" value="native-doc" />
     </ant>
+  </target>
+
+  <target name="release-jk"
+          depends="docs"
+          description="Used after a release to update the docs for Tomcat Connectors">
 
+    <!-- Delete the old version -->
+    <delete dir="${docs.dest}/connectors-doc"/>
+
+    <!-- Update the JK connectors docs -->
+    <ant dir="jk-xdocs" antfile="build.xml" target="build-main">
+      <property name="build.dir" value="../docs" />
+      <property name="dist.name" value="connectors-doc" />
+    </ant>
   </target>
 
   <!-- =============== Utility Targets to support downloads ================ -->



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message