Browse Source
Fixing some typos - has been submitted as part of
PR: 11056 git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@273186 13f79535-47bb-0310-9956-ffa450edef68master
Stefan Bodewig
23 years ago
3 changed files with 21 additions and 17 deletions
Split View
Diff Options
-
+7 -4docs/faq.html
-
+6 -9docs/manual/CoreTasks/javac.html
-
+8 -4xdocs/faq.xml
+ 7
- 4
docs/faq.html
View File
| @@ -771,6 +771,9 @@ | |||
| </td> | |||
| </tr> | |||
| </table> | |||
| <p>With Ant >= 1.5, you can also use nested | |||
| <code><compilerarg></code> elements with the | |||
| <code><javac></code> task.</p> | |||
| </blockquote> | |||
| </td></tr> | |||
| </table> | |||
| @@ -1290,8 +1293,8 @@ shell-prompt> cat < foo | |||
| your build file uses, this is done inside the <a href="http://www.w3.org/TR/2000/REC-xml-20001006#sec-prolog-dtd">XML | |||
| declaration</a>.</p> | |||
| <p>By default the parser assumes you are using the UTF-8 | |||
| encoding instead of your platform's default. For most western | |||
| european contries you should set the encoding to | |||
| encoding instead of your platform's default. For most Western | |||
| European countries you should set the encoding to | |||
| <code>ISO-8859-1</code>. To do so, make the very first line | |||
| of you build file read like</p> | |||
| <div align="left"> | |||
| @@ -1666,7 +1669,7 @@ public class BuildMonitor implements BuildListener { | |||
| * Determine the status of the build and the actions to follow, now that | |||
| * the build has completed. | |||
| * | |||
| * @param e Event describing the build tatus. | |||
| * @param e Event describing the build status. | |||
| */ | |||
| public void buildFinished(BuildEvent e) { | |||
| Throwable th = e.getException(); | |||
| @@ -1994,7 +1997,7 @@ mv /tmp/foo $ANT_HOME/bin/antRun | |||
| is in <code>CLASSPATH</code> as well.</p> | |||
| <p>To solve this, you have two major options:</p> | |||
| <ol> | |||
| <li>put all external libaries you need in | |||
| <li>put all external libraries you need in | |||
| <code>CLASSPATH</code> as well this is not what you want, | |||
| otherwise you wouldn't have found this FAQ entry.</li> | |||
+ 6
- 9
docs/manual/CoreTasks/javac.html
View File
| @@ -1,4 +1,4 @@ | |||
| <html> | |||
| <html lang="en-us"> | |||
| <head> | |||
| <meta http-equiv="Content-Language" content="en-us"> | |||
| @@ -21,7 +21,7 @@ will have no knowledge about nested classes, classes that are named different | |||
| from the source file, and so on. See the | |||
| <a href="../OptionalTasks/depend.html"><code><depend></code></a> task | |||
| for dependency checking based on other than just | |||
| existence/modification times. | |||
| existence/modification times.</p> | |||
| <p>When the source files are part of a package, the directory structure of | |||
| the source tree should follow the package | |||
| hierarchy.</p> | |||
| @@ -47,7 +47,7 @@ setting the <code>compiler</code> attribute, specific to the current | |||
| <code><javac></code> task. | |||
| <a name="compilervalues">Valid values for either the | |||
| <code>build.compiler</code> property or the <code>compiler</code> | |||
| attribute are:</p> | |||
| attribute are:</a></p> | |||
| <ul> | |||
| <li><code>classic</code> (the standard compiler of JDK 1.1/1.2) – | |||
| <code>javac1.1</code> and | |||
| @@ -56,7 +56,7 @@ attribute are:</p> | |||
| <code>javac1.3</code> and | |||
| <code>javac1.4</code> can be used as aliases.</li> | |||
| <li><code>jikes</code> (the <a | |||
| href="http://oss.software.ibm.com/developerworks/opensource/jikes/project" target="_top">Jikes</a> | |||
| href="http://oss.software.ibm.com/developerworks/opensource/jikes/" target="_top">Jikes</a> | |||
| compiler).</li> | |||
| <li><code>jvc</code> (the Command-Line Compiler from Microsoft's SDK | |||
| for Java / Visual J++) – <code>microsoft</code> can be used | |||
| @@ -69,7 +69,6 @@ attribute are:</p> | |||
| <li><code>extJavac</code> (run either modern or classic in a JVM of | |||
| its own).</li> | |||
| </ul> | |||
| </a> | |||
| <p>The default is <code>javac1.x</code> with <code>x</code> depending | |||
| on the JDK version you use while you are running Ant. | |||
| If you wish to use a different compiler interface than those | |||
| @@ -98,7 +97,6 @@ classpath of the <code><javac></code> task, and does not release them. | |||
| The side effect of this is that you will not be able to delete or move | |||
| those files later on in the build. The workaround is to fork when | |||
| invoking the compiler.</p> | |||
| </p> | |||
| <h3>Parameters</h3> | |||
| <table border="1" cellpadding="2" cellspacing="0"> | |||
| <tr> | |||
| @@ -109,7 +107,7 @@ invoking the compiler.</p> | |||
| <tr> | |||
| <td valign="top">srcdir</td> | |||
| <td valign="top">Location of the java files. (See the | |||
| <a href="#srcdirnote">Note</a> below.)</td> | |||
| <a href="#srcdirnote">note</a> below.)</td> | |||
| <td align="center" valign="top">Yes, unless nested <code><src></code> elements are present.</td> | |||
| </tr> | |||
| <tr> | |||
| @@ -492,7 +490,7 @@ using. This problem may occur with all JDKs < 1.2.</p> | |||
| <h3>Jikes Notes</h3> | |||
| Jikes supports some extra options, which can be set be defining | |||
| <p>Jikes supports some extra options, which can be set be defining | |||
| the properties shown below prior to invoking the task. The setting | |||
| for each property will be in affect for all <code><javac></code> | |||
| tasks throughout the build. | |||
| @@ -559,7 +557,6 @@ while all others are <code>false</code>.</p> | |||
| </td> | |||
| </tr> | |||
| </table> | |||
| </p> | |||
| <hr> | |||
| <p align="center">Copyright © 2000-2002 Apache Software Foundation. | |||
+ 8
- 4
xdocs/faq.xml
View File
| @@ -270,6 +270,10 @@ | |||
| </table> | |||
| <p>With Ant >= 1.5, you can also use nested | |||
| <code><compilerarg></code> elements with the | |||
| <code><javac></code> task.</p> | |||
| </answer> | |||
| </faq> | |||
| @@ -580,8 +584,8 @@ shell-prompt> cat < foo | |||
| declaration</a>.</p> | |||
| <p>By default the parser assumes you are using the UTF-8 | |||
| encoding instead of your platform's default. For most western | |||
| european contries you should set the encoding to | |||
| encoding instead of your platform's default. For most Western | |||
| European countries you should set the encoding to | |||
| <code>ISO-8859-1</code>. To do so, make the very first line | |||
| of you build file read like</p> | |||
| @@ -802,7 +806,7 @@ public class BuildMonitor implements BuildListener { | |||
| * Determine the status of the build and the actions to follow, now that | |||
| * the build has completed. | |||
| * | |||
| * @param e Event describing the build tatus. | |||
| * @param e Event describing the build status. | |||
| */ | |||
| public void buildFinished(BuildEvent e) { | |||
| Throwable th = e.getException(); | |||
| @@ -1041,7 +1045,7 @@ mv /tmp/foo $ANT_HOME/bin/antRun | |||
| <p>To solve this, you have two major options:</p> | |||
| <ol> | |||
| <li>put all external libaries you need in | |||
| <li>put all external libraries you need in | |||
| <code>CLASSPATH</code> as well this is not what you want, | |||
| otherwise you wouldn't have found this FAQ entry.</li> | |||