2012/3/31 <ma...@apache.org>:
> Author: markt
> Date: Sat Mar 31 18:50:31 2012
> New Revision: 1307872
>
> URL: http://svn.apache.org/viewvc?rev=1307872&view=rev
> Log:
> Build script changes ready for svn pub sub for Tomcat 5,6,7 docs, JK docs,
> native docs
>
> Added:
> tomcat/site/trunk/build.properties.default
> Modified:
> tomcat/site/trunk/README.txt
> tomcat/site/trunk/build.xml
>
> + <!-- Download the latest versions -->
> + <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 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 todir="${docs.dest}/tomcat-5.5-doc" >
> + <fileset dir="${tomcat55.home}/tomcat-5.5-doc" />
> + </copy>
> + <copy todir="${docs.dest}/tomcat-6.0-doc" >
> + <fileset dir="${tomcat60.home}/tomcat-6.0-doc" />
> + </copy>
> + <copy todir="${docs.dest}/tomcat-7.0-doc" >
> + <fileset dir="${tomcat70.home}/tomcat-7.0-doc" />
> + </copy>
> +
> + <!-- 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>
The above expects that you have all versions on your hard drive and
that you want to update all them at the same time.
I think there really should be separate targets for each of the versions.
There are two reasons:
1. RMs release one version at a time. There is little sense in doing
extra work with other versions.
2. I personally would use a sparse checkout, leaving unneeded folders as empty.
Docs for each version are up to 60Mb of small files. It works a bit
faster if you do not have them in your working copy.
I'll add that to README somedays later.
> +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
Regarding the above: I have not seen the externals (they were not
committed?), but I think it is better without them.
What I do not like with externals is that it is hard to exclude them
from your working copy if you do not need them.
Alternatives:
a. Create empty folders, "jk-xdocs", "native-xdocs". You apply "svn
switch" on them if you need those sources.
It is a bit more elaborate, but provides better control on your working copy.
b. Specify path to "jk-xdocs", "native-xdocs" in build.properties. The
files might be somewhere else on your hard drive (where you normally
work on those components).
It is possible to combine a+b.
Best regards,
Konstantin Kolinko
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
