Author: kkolinko
Date: Tue Jul 7 13:12:05 2009
New Revision: 791821
URL: http://svn.apache.org/viewvc?rev=791821&view=rev
Log:
Document minimum required Ant version to be 1.6.2.
Note, that /tomcat-doc/building.html already mentions 1.6.2,
and that e.g. rev.791806 requires Ant 1.6.1 or later
Modified:
tomcat/build/tc5.5.x/BUILDING.txt
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
tomcat/current/tc5.5.x/STATUS.txt
Modified: tomcat/build/tc5.5.x/BUILDING.txt
URL:
http://svn.apache.org/viewvc/tomcat/build/tc5.5.x/BUILDING.txt?rev=791821&r1=791820&r2=791821&view=diff
==============================================================================
--- tomcat/build/tc5.5.x/BUILDING.txt (original)
+++ tomcat/build/tc5.5.x/BUILDING.txt Tue Jul 7 13:12:05 2009
@@ -40,11 +40,11 @@
into which you installed the JDK release.
-(1) Install Apache Ant 1.5.x on your computer
+(1) Install Apache Ant 1.6.2 or later on your computer
-* If Apache Ant 1.5.x is already installed on your computer, skip to (2).
+* If Apache Ant 1.6.2 or later is already installed on your computer, skip to
(2).
-* Download a binary distribution of Ant 1.5.x from:
+* Download a binary distribution of Ant 1.6.2 or later from:
http://ant.apache.org/bindownload.cgi
@@ -62,13 +62,13 @@
available, which will be used to actually perform the build.
-(2) Install Subversion 1.3.x on your computer
+(2) Install Subversion 1.3.x or later on your computer
-* If Subversion 1.3.x is already installed on your computer, skip to (3).
+* If Subversion 1.3.x or later is already installed on your computer, skip to
(3).
-* Download a binary distribution of Subversion 1.3.x from:
+* Download a binary distribution of Subversion 1.3.x or later from:
- http://subversion.tigris.org/project_packages.html
+ http://subversion.tigris.org/getting.html
* Unpack the binary distribution into a convenient location so that the
Subversion release resides in its own directory.
@@ -143,22 +143,22 @@
In addition, "ant build-depends" will build packages that
tomcat depends on ( commons-logging for now ), to ease fixes
-and debuging in those packages.
+and debugging in those packages.
(6) Building The "compat" Package
Tomcat 5.5 is designed to run on J2SE 5.0, but will run on
-J2SE versions 1.3 and 1.4 as well as long as the compatability
-package is placed in the server classpath. See "RUNNING.txt"
-in this directory for running instructions. To build the
-compat package, do
+J2SE version 1.4 as well as long as the compatibility package
+is placed in the server classpath. See "RUNNING.txt" in this
+directory for running instructions. To build the compat
+package, do
cd ${tomcat.source}
ant build-compat
(7) Building the servlet and jsp API documentation
-The documentation can be easly rebuild, do
+The documentation can be easily rebuild, do
cd ${tomcat.source}/build
ant dist-javadoc
Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=791821&r1=791820&r2=791821&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Tue Jul 7 13:12:05 2009
@@ -73,6 +73,9 @@
files when fixing line endings. Explicitly specify encoding when
compiling (issue <bug>47149</bug>). (kkolinko)
</fix>
+ <docs>
+ Document that building Tomcat requires Ant 1.6.2 or later. (kkolinko)
+ </docs>
</changelog>
</subsection>
<subsection name="Catalina">
Modified: tomcat/current/tc5.5.x/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=791821&r1=791820&r2=791821&view=diff
==============================================================================
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Tue Jul 7 13:12:05 2009
@@ -65,16 +65,6 @@
+1: markt
-1:
-* Document minimum required Ant version to be 1.6.2, instead of 1.5.x
- Note, that http://tomcat.apache.org/tomcat-5.5-doc/building.html already
- mentions 1.6.2 since rev.351798, thus for more than 3.5 years.
- (Though it is a docs patch, I think it is an important change)
- Patch for BUILDING.txt:
- http://people.apache.org/~kkolinko/patches/2009-07-04_tc55_antversion.patch
- +1: kkolinko, rjung
- +1: markt - min JRE version is 1.4, even with the compat package
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=38797
Reverts previous fix for
https://issues.apache.org/bugzilla/show_bug.cgi?id=37933 and implements an
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
