youys
/
ant
Not watched
1
0
Fork 1
Code
Releases 0 Wiki Activity
Issues 0 Pull Requests 0 Datasets Model Cloudbrain
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-ffa450edef68
master
Stefan Bodewig 23 years ago
parent
e9029b083b
commit
f7cf153214
3 changed files with 21 additions and 17 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +7
    -4
      docs/faq.html
  2. +6
    -9
      docs/manual/CoreTasks/javac.html
  3. +8
    -4
      xdocs/faq.xml

+ 7
- 4
docs/faq.html View File

@@ -771,6 +771,9 @@
</td> </td>
</tr> </tr>
</table> </table>
<p>With Ant &gt;= 1.5, you can also use nested
<code>&lt;compilerarg&gt;</code> elements with the
<code>&lt;javac&gt;</code> task.</p>
</blockquote> </blockquote>
</td></tr> </td></tr>
</table> </table>
@@ -1290,8 +1293,8 @@ shell-prompt&gt; cat &lt; 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 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> declaration</a>.</p>
<p>By default the parser assumes you are using the UTF-8 <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 <code>ISO-8859-1</code>. To do so, make the very first line
of you build file read like</p> of you build file read like</p>
<div align="left"> <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 * Determine the status of the build and the actions to follow, now that
* the build has completed. * the build has completed.
* *
* @param e Event describing the build tatus.
* @param e Event describing the build status.
*/ */
public void buildFinished(BuildEvent e) { public void buildFinished(BuildEvent e) {
Throwable th = e.getException(); Throwable th = e.getException();
@@ -1994,7 +1997,7 @@ mv /tmp/foo $ANT_HOME/bin/antRun
is in <code>CLASSPATH</code> as well.</p> is in <code>CLASSPATH</code> as well.</p>
<p>To solve this, you have two major options:</p> <p>To solve this, you have two major options:</p>
<ol> <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, <code>CLASSPATH</code> as well this is not what you want,
otherwise you wouldn't have found this FAQ entry.</li> 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> <head>
<meta http-equiv="Content-Language" content="en-us"> <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 from the source file, and so on. See the
<a href="../OptionalTasks/depend.html"><code>&lt;depend&gt;</code></a> task <a href="../OptionalTasks/depend.html"><code>&lt;depend&gt;</code></a> task
for dependency checking based on other than just 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 <p>When the source files are part of a package, the directory structure of
the source tree should follow the package the source tree should follow the package
hierarchy.</p> hierarchy.</p>
@@ -47,7 +47,7 @@ setting the <code>compiler</code> attribute, specific to the current
<code>&lt;javac&gt;</code> task. <code>&lt;javac&gt;</code> task.
<a name="compilervalues">Valid values for either the <a name="compilervalues">Valid values for either the
<code>build.compiler</code> property or the <code>compiler</code> <code>build.compiler</code> property or the <code>compiler</code>
attribute are:</p>
attribute are:</a></p>
<ul> <ul>
<li><code>classic</code> (the standard compiler of JDK 1.1/1.2) &ndash; <li><code>classic</code> (the standard compiler of JDK 1.1/1.2) &ndash;
<code>javac1.1</code> and <code>javac1.1</code> and
@@ -56,7 +56,7 @@ attribute are:</p>
<code>javac1.3</code> and <code>javac1.3</code> and
<code>javac1.4</code> can be used as aliases.</li> <code>javac1.4</code> can be used as aliases.</li>
<li><code>jikes</code> (the <a <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> compiler).</li>
<li><code>jvc</code> (the Command-Line Compiler from Microsoft's SDK <li><code>jvc</code> (the Command-Line Compiler from Microsoft's SDK
for Java / Visual J++) &ndash; <code>microsoft</code> can be used for Java / Visual J++) &ndash; <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 <li><code>extJavac</code> (run either modern or classic in a JVM of
its own).</li> its own).</li>
</ul> </ul>
</a>
<p>The default is <code>javac1.x</code> with <code>x</code> depending <p>The default is <code>javac1.x</code> with <code>x</code> depending
on the JDK version you use while you are running Ant. on the JDK version you use while you are running Ant.
If you wish to use a different compiler interface than those If you wish to use a different compiler interface than those
@@ -98,7 +97,6 @@ classpath of the <code>&lt;javac&gt;</code> task, and does not release them.
The side effect of this is that you will not be able to delete or move 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 those files later on in the build. The workaround is to fork when
invoking the compiler.</p> invoking the compiler.</p>
</p>
<h3>Parameters</h3> <h3>Parameters</h3>
<table border="1" cellpadding="2" cellspacing="0"> <table border="1" cellpadding="2" cellspacing="0">
<tr> <tr>
@@ -109,7 +107,7 @@ invoking the compiler.</p>
<tr> <tr>
<td valign="top">srcdir</td> <td valign="top">srcdir</td>
<td valign="top">Location of the java files. (See the <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>&lt;src&gt;</code> elements are present.</td> <td align="center" valign="top">Yes, unless nested <code>&lt;src&gt;</code> elements are present.</td>
</tr> </tr>
<tr> <tr>
@@ -492,7 +490,7 @@ using. This problem may occur with all JDKs &lt; 1.2.</p>


<h3>Jikes Notes</h3> <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 the properties shown below prior to invoking the task. The setting
for each property will be in affect for all <code>&lt;javac&gt;</code> for each property will be in affect for all <code>&lt;javac&gt;</code>
tasks throughout the build. tasks throughout the build.
@@ -559,7 +557,6 @@ while all others are <code>false</code>.</p>
</td> </td>
</tr> </tr>
</table> </table>
</p>


<hr> <hr>
<p align="center">Copyright &copy; 2000-2002 Apache Software Foundation. <p align="center">Copyright &copy; 2000-2002 Apache Software Foundation.


+ 8
- 4
xdocs/faq.xml View File

@@ -270,6 +270,10 @@


</table> </table>


<p>With Ant &gt;= 1.5, you can also use nested
<code>&lt;compilerarg&gt;</code> elements with the
<code>&lt;javac&gt;</code> task.</p>

</answer> </answer>
</faq> </faq>


@@ -580,8 +584,8 @@ shell-prompt> cat < foo
declaration</a>.</p> declaration</a>.</p>


<p>By default the parser assumes you are using the UTF-8 <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 <code>ISO-8859-1</code>. To do so, make the very first line
of you build file read like</p> 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 * Determine the status of the build and the actions to follow, now that
* the build has completed. * the build has completed.
* *
* @param e Event describing the build tatus.
* @param e Event describing the build status.
*/ */
public void buildFinished(BuildEvent e) { public void buildFinished(BuildEvent e) {
Throwable th = e.getException(); 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> <p>To solve this, you have two major options:</p>


<ol> <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, <code>CLASSPATH</code> as well this is not what you want,
otherwise you wouldn&apos;t have found this FAQ entry.</li> otherwise you wouldn&apos;t have found this FAQ entry.</li>




Write Preview
Loading…
Cancel
Save