You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by kk...@apache.org on 2011/11/15 16:54:28 UTC
svn commit: r1202262 - in /tomcat/tc6.0.x/trunk: BUILDING.txt
webapps/docs/building.xml webapps/docs/changelog.xml
Author: kkolinko
Date: Tue Nov 15 15:54:27 2011
New Revision: 1202262
URL: http://svn.apache.org/viewvc?rev=1202262&view=rev
Log:
CTR: docs
Correct wording in build instructions
Simplify instructions for downloading Tomcat source code
Modified:
tomcat/tc6.0.x/trunk/BUILDING.txt
tomcat/tc6.0.x/trunk/webapps/docs/building.xml
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/BUILDING.txt
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/BUILDING.txt?rev=1202262&r1=1202261&r2=1202262&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/BUILDING.txt (original)
+++ tomcat/tc6.0.x/trunk/BUILDING.txt Tue Nov 15 15:54:27 2011
@@ -74,16 +74,15 @@ source distribution, do the following:
(2.1) Checkout or obtain the source code for Tomcat 6.0
* Tomcat 6.0 SVN repository URL:
- http://svn.apache.org/repos/asf/tomcat/tc6.0.x/
+ http://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk/
* Download a source package from:
http://tomcat.apache.org/download-60.cgi
-* Checkout the source using SVN, selecting the desired version or
- branch (current development source is at
- http://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk/), or
- unpack the source package. The location where the source has been
- placed will be referred as ${tomcat.source}.
+* Checkout the source using SVN, selecting a tag for released version or
+ trunk for the current development code, or unpack a source package. The
+ location where the source has been placed will be referred as
+ ${tomcat.source}.
(2.2) Building
@@ -93,10 +92,11 @@ source distribution, do the following:
ant download
ant
-* WARNING: Running this command will download binaries to the /usr/share/java
- directory. On a typical Linux or MacOX system an ordinary user
- will not have access to write to this directory, and, even if you do,
- it may not be appropriate for you to write there.
+* WARNING: Running "ant download" command will download libraries required
+ to build Tomcat to the /usr/share/java directory. On a typical Linux or
+ MacOX system an ordinary user will not have access to write to this
+ directory, and, even if you do, it may not be appropriate for you to
+ write there.
On Windows this usually corresponds to the "C:\usr\share\java"
directory, unless Cygwin is used. Read below to learn how to customize
@@ -147,5 +147,3 @@ The documentation can be easly built:
cd ${tomcat.source}
ant -f dist.xml release
-
-
Modified: tomcat/tc6.0.x/trunk/webapps/docs/building.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/building.xml?rev=1202262&r1=1202261&r2=1202262&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/building.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/building.xml Tue Nov 15 15:54:27 2011
@@ -83,20 +83,19 @@ available, which will be used to actuall
<p>
Tomcat 6.0 SVN repository URL:
- <code>http://svn.apache.org/repos/asf/tomcat/tc6.0.x/</code>
+ <a href="http://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk/">http://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk/</a>
</p>
-
+
<p>
Download a source package from:
- <code>http://tomcat.apache.org/download-60.cgi</code>
+ <a href="http://tomcat.apache.org/download-60.cgi">http://tomcat.apache.org/download-60.cgi</a>
</p>
-
+
<p>
- Checkout the source using SVN, selecting the desired version or
- branch (current development source is at
- <code>http://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk/</code>), or
- unpack the source package. The location where the source has been
- placed will be referred as ${tomcat.source}.
+ Checkout the source using SVN, selecting a tag for released version or
+ trunk for the current development code, or download and unpack a
+ source package. The location where the source has been
+ placed will be referred as <code>${tomcat.source}</code>.
</p>
</section>
@@ -113,8 +112,8 @@ Use the following commands:
</p>
<p>
-<b>WARNING:</b> Running this command will download binary binaries to the
- <code>/usr/share/java</code> directory by default.
+<b>WARNING:</b> Running "ant download" command will download libraries required
+ to build Tomcat to the <code>/usr/share/java</code> directory by default.
On a typical Linux or MacOX system, an ordinary user
will not have access to write to this directory, and, even if you do,
it may not be appropriate for you to write there. On Windows
@@ -161,7 +160,7 @@ and the following steps have been used b
<p>
Note that you <b>must</b> complete all the above steps to fetch
-the repositories and build some JAR files the first time.
+dependent libraries and build some JAR files the first time.
After you have completed the above steps, you can set up an
Eclipse project.
<b>Note</b> that this will not let you build everything under Eclipse;
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1202262&r1=1202261&r2=1202262&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Nov 15 15:54:27 2011
@@ -237,7 +237,7 @@
</fix>
<update>
<bug>52172</bug>: Clarify Tomcat build instructions. Patch provided
- by bimargulies. (kkolinko)
+ by bmargulies. (kkolinko)
</update>
</changelog>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org