Skip to content
Snippets Groups Projects
Commit 7b0fae75 authored by Brutzman, Don's avatar Brutzman, Don
Browse files

Merge origin/master

parents 9c2e63cd 809d6199
No related branches found
No related tags found
No related merge requests found
......@@ -124,11 +124,11 @@
<i>List of tasks</i>.
</li>
<li>
<a href="https://ant-contrib.sourceforge.net">Ant-contrib</a>
<a href="http://ant-contrib.sourceforge.net">Ant-contrib</a>
site including
<a hre="https://sourceforge.net/projects/ant-contrib/files/ant-contrib">downloads</a>
plus documentation for
<a href="https://ant-contrib.sourceforge.net/tasks/index.html">installation and tasks</a>.
<a href="http://ant-contrib.sourceforge.net/tasks/index.html">installation and tasks</a>.
</li>
<li>
<a href="https://ant.apache.org/ant_in_anger.html">Ant in Anger</a>
......@@ -150,7 +150,7 @@
binary distribution.
The default installation directory referred to by various Savage and X3D build files is
<br />
<code style="color:darkgreen"><b>C:\apache-ant-1.10.7</b></code>
<code style="color:darkgreen"><b>C:\apache-ant-1.10.8</b></code>
</li>
<li>
Prepend the following executable paths to the
......@@ -163,7 +163,7 @@
system environment variables
as follows:
<br />
<code style="color:darkgreen"><b>ANT_HOME=C:\apache-ant-1.10.7</b></code>
<code style="color:darkgreen"><b>ANT_HOME=C:\apache-ant-1.10.8</b></code>
<br />
If system memory is limited, additional options might be needed:
<br />
......@@ -188,11 +188,11 @@
to install libraries for optional ant tasks as follows
(<a href="antConfigurationFetchOutput.txt">example&nbsp;output</a>):
<br />
<code style="color:darkgreen"><b>C:\apache-ant-1.10.7&gt; ant -f fetch.xml -Ddest=system</b></code>
<code style="color:darkgreen"><b>C:\apache-ant-1.10.8&gt; ant -f fetch.xml -Ddest=system</b></code>
</li>
<li>Confirm proper path and installation:
<pre><b>ant -version</b>
Apache Ant(TM) version 1.10.7 compiled on September 1 2019
Apache Ant(TM) version 1.10.8 compiled on May 10 2020
</pre>
</li>
<li>
......@@ -207,14 +207,14 @@ Apache Ant(TM) version 1.10.7 compiled on September 1 2019
<ul>
<li>
Extract and install the
<a href="https://ant-contrib.sourceforge.net">ant-contribs package</a>
<a href="http://ant-contrib.sourceforge.net">ant-contribs package</a>
under <code style="color:darkgreen"><b>ANT_HOME</b></code>,
then copy
<code style="color:darkgreen"><b>ant-contrib-*.jar</b></code>
into the
<code style="color:darkgreen"><b>ANT_HOME/lib/</b></code>
subdirectory. You can now use any of the
<a href="https://ant-contrib.sourceforge.net/tasks/tasks" target="antcontrib">ant-contrib tasks</a>
<a href="http://ant-contrib.sourceforge.net/tasks/tasks" target="antcontrib">ant-contrib tasks</a>
by including the following top-level statement in your build.xml file.
<br />
<code style="color:darkgreen"><b>&lt;taskdef resource="net/sf/antcontrib/antcontrib.properties"/&gt;</b></code>
......@@ -244,7 +244,7 @@ Apache Ant(TM) version 1.10.7 compiled on September 1 2019
</ul>
<li>
NetBeans users can reset the default directory referred to by NetBeans:
<i>Tools</i> menu, <i>Options</i> panel, <i>Miscellaneous</i> tab, <i>Ant</i> subtab, <i>Ant&nbsp;home</i>&nbsp;&nbsp;<code style="color:darkgreen"><b>C:\apache-ant-1.10.7</b></code>
<i>Tools</i> menu, <i>Options</i> panel, <i>Miscellaneous</i> tab, <i>Ant</i> subtab, <i>Ant&nbsp;home</i>&nbsp;&nbsp;<code style="color:darkgreen"><b>C:\apache-ant-1.10.8</b></code>
</li>
<li>
For server-side installations (including <a href="#Jenkins">Jenkins</a>),
......@@ -2950,7 +2950,7 @@ which can lead to the Internet of Things becoming the Web of Things. </i>
<a href="https://savage.nps.edu/developers.html">https://savage.nps.edu/developers.html</a>
</blockquote>
<blockquote>
Revised 30 March 2020.
Revised 19 July 2020.
</blockquote>
<p>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment