summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOliver Kellogg <okellogg@users.sourceforge.net>2018-01-12 00:03:25 +0100
committerOliver Kellogg <okellogg@users.sourceforge.net>2018-01-12 00:03:25 +0100
commit57a3da79bd35109aadaa74110f58440e4a5eab86 (patch)
tree2928c451b28ebcff301f43a63688615b3a0583bf
parent7d0117c30506099a968a0dc0d9229330217ec9ed (diff)
downloadATCD-57a3da79bd35109aadaa74110f58440e4a5eab86.tar.gz
- In section "Building and Installing TAO from git", mention that the
ACE_ROOT and TAO_ROOT env vars are set different from ACE_wrappers. - Fix a few typos. - Add a few missing </LI> tags.
-rw-r--r--TAO/TAO-INSTALL.html31
1 files changed, 22 insertions, 9 deletions
diff --git a/TAO/TAO-INSTALL.html b/TAO/TAO-INSTALL.html
index 878cbc3e590..b36044f6df9 100644
--- a/TAO/TAO-INSTALL.html
+++ b/TAO/TAO-INSTALL.html
@@ -143,7 +143,7 @@ bundle as a single piece instead of trying to mix and match things up.<P>
<LI>Create config.h and platform_macros.GNU at
the right places</LI>
<LI>Delete all the GNUmakefiles (or sln and
- vproj file as the case may be) from the TAO distrbution using
+ vproj file as the case may be) from the TAO distribution using
the 'find' command.</LI>
<LI>Change directory to $TAO_ROOT.</LI>
<LI>Run MPC like this, $ACE_ROOT/bin/mwc.pl TAO_ACE.mwc -type gnuace </LI>
@@ -544,20 +544,30 @@ quickly.
<UL>
<LI> Please see <a href="#MPC"> instructions </a> above to download
- MPC from our git repository <p>
+ MPC from our git repository</LI><p/>
<LI>Please make sure that you have <a href="http://www.perl.org">
perl</a> installed, preferably perl
5.8 or higher. Users on Win32 based platforms are recommended to use
<a href="http://www.activestate.com/Products/ActivePerl/"> Active
State Perl </a>. We use active state perl without problems. We have
ran into problems trying to use the cygwin version of perl on Win32
- based platforms. <p>
+ based platforms.</LI><p/>
+ <LI>When building from git, the ACE_ROOT and TAO_ROOT environment
+ variable settings differ from their settings in the ACE_wrappers
+ prepackaged source distribution:
+ <UL>
+ <LI>ACE_ROOT should point to the ACE subdirectory of the top level
+ ACE_TAO directory</LI>
+ <LI>TAO_ROOT should point to the TAO subdirectory of the top level
+ ACE_TAO directory</LI>
+ </UL>
+ </LI><p/>
<LI>If you just want to build TAO and associated tests, examples,
and associated utility libraries, we recommend the following
alternatives:
<UL>
<LI> Build ACE and TAO separately. ACE needs to be built first and
- instructins for building ACE are available at <a
+ instructions for building ACE are available at <a
href="../ACE/ACE-INSTALL.html#MPC">ACE-INSTALL</a>. GNUmakefiles and
project files for TAO can be generated by using the following
commands:<p>
@@ -565,7 +575,7 @@ quickly.
from <CODE> $TAO_ROOT </CODE> to generate GNUmakefiles. Use <CODE>
-type vc71 </CODE> to generate VC71 project and solution files,
or <CODE>-type vc8</CODE> for VC8 project and solution files, or
- <CODE>-type bmake</CODE> for Borland C++ make files.<p>
+ <CODE>-type bmake</CODE> for Borland C++ make files.</LI><p/>
<LI> Build ACE+TAO together in one shot. To do that please issue
the following commands: <p>
<CODE> $ACE_ROOT/bin/mwc.pl TAO_ACE.mwc </CODE> <p>
@@ -576,13 +586,16 @@ quickly.
generate VC71 project and workspace files. <CODE>TAO_ACE.sln</CODE>
can be used by users to build ACE+TAO from a single workspace
file. Users can use <CODE> -type vc8 </CODE> to generate the VC8
- solutions files. <p>
- </UL>
+ solutions files.
+ </LI>
+ </UL>
+ </LI><p/>
<LI>If you want to build CIAO and its associated libraries
- please see <a href="CIAO/CIAO-INSTALL.html"> CIAO-INSTALL <a> for
+ please see <a href="CIAO/CIAO-INSTALL.html"> CIAO-INSTALL </a> for
details.
+ </LI>
- </UL>
+</UL>
<HR><P>