Mon Mar 02 11:09:25 2005 Gan Deng <gan.deng@vanderbilt.edu>

1 files changed, 33 insertions, 16 deletions

diff --git a/TAO/CIAO/CIAO-INSTALL.html b/TAO/CIAO/CIAO-INSTALL.html
index 4579b324231..3e3944ab08f 100644
--- a/TAO/CIAO/CIAO-INSTALL.html
+++ b/TAO/CIAO/CIAO-INSTALL.html
@@ -25,21 +25,39 @@ ACE+TAO. Compiling ACE+TAO successfully is the <STRONG> first
 
 <P>CIAO is divided into several parts, so different
 installation/building rules apply to different parts of CIAO. 
+<br>
+<br>
+<font color=#ff0000>IMPORTANT</font>: There are currently 
+<font color=#ff0000>TWO</font> CIAO implementations with this
+distribution of the software. The "old" CIAO is designed and implemented
+based on the orginal <a 
+href="http://www.omg.org/cgi-bin/doc?formal/02-06-65">
+OMG CCM 3.0 specification</a>, the "new" CIAO is designed and implemented
+based on the new <a
+href="http://www.omg.org/cgi-bin/doc?ptc/2003-07-02"> OMG's Deployment and
+Configuration specification</a>. For a temporary solution, we put the "new"
+CIAO implementation in the <code>$CIAO_ROOT/DAnCE</code> directory, which
+contains the CIAO core, CIAO examples and Deployment and Configuration
+Framework. However, both the "old" one and the "new"
+one have the same modules and structures, which are described as below.
+<br><br>
+(We suggest you use this "new" CIAO instead of the "old" one, since the
+"old" CIAO will not be officially supported soon.)
+
 <OL>
 
-  <LI>CIAO core/tools/examples: This part of CIAO include following directories: <CODE>$CIAO_ROOT/ciao</CODE>, <CODE>$CIAO_ROOT/tools</CODE>, <CODE>$CIAO_ROOT/examples</CODE> and all other directories in <CODE>$CIAO_ROOT</CODE> <STRONG>except</STRONG> those listed in the two bullets below.<p>
+  <LI>CIAO core/examples: This part of CIAO include following directories: 
+      <CODE>$CIAO_ROOT/DAnCE/ciao</CODE>, <CODE>$CIAO_ROOT/DAnCE/examples</CODE>.<P>
 
   <LI>CIDL Compiler: This part of CIAO include
-  <CODE>$CIAO_ROOT/CCF</CODE> and <CODE>$CIAO_ROOT/CIDLC</CODE><P> 
+  <CODE>$CIAO_ROOT/CCF</CODE> and <CODE>$CIAO_ROOT/CIDLC</CODE>.<P>
 
-  <LI>CIAO Deployment and Assembly Framework: This part of CIAO
-  includes <CODE>$CIAO_ROOT/DAnCE</CODE> and is a WIP. DAnCE is an
+  <LI>CIAO Deployment and Configuration Framework: This part of CIAO
+  includes all the directories in <CODE>$CIAO_ROOT/DAnCE</CODE> except 
+  the ones mentioned above. DAnCE is an
   implementation of the new <a
   href="http://www.omg.org/cgi-bin/doc?ptc/2003-07-02"> Deployment and
-  Configuration </a> specification. This will eventually replace
-  different pieces in <CODE>$CIAO_ROOT/ciao </CODE> and
-  <CODE>$CIAO_ROOT/tools</CODE>. Please stay tuned to this webpage for
-  details. 
+  Configuration</a> specification. 
 
   We refer, henceforth, to all pieces as CIAO in general. The above
   two pieces will be referred specifically by their names as CIDLC and
@@ -52,11 +70,11 @@ installation/building rules apply to different parts of CIAO.
 <H3>Supported Platforms for CIAO</H3>
 
 <p>CIAO should be usable on all platforms that TAO runs on. Please see
-<a href="../TAO-INSTALL.html"> TAO's installation </a> pages for details<P>
+<a href="../TAO-INSTALL.html"> TAO's installation</a> pages for details<P>
 
 <H3>Supported Platforms for CIDLC</H3>
 <p> CIDLC is supported only on a small subset of platforms. Please
-refer to <a href="CCF/Documentation/Build.html"> this </a> for details
+refer to <a href="CCF/Documentation/Build.html"> this</a> for details
 on how to build CIDLC. 
 <p>
 <table width="100%" border=1>
@@ -89,7 +107,9 @@ closely. <P>
 <HR><P>
 <H3>Install CIDL Compiler</H3>
 
-  <P>You can choose to either download the binary <CODE>cidlc(exe)</CODE> from <STRONG><A HREF="http://www.dre.vanderbilt.edu/cidlc/binary">here</A></STRONG> or to build it yourself.<P>
+  <P>We suggest you download the binary <CODE>cidlc(exe)</CODE> from 
+  <STRONG><A HREF="http://www.dre.vanderbilt.edu/cidlc/binary">here</A></STRONG> 
+  if you are using Windows or Linux, or you can build it by yourself.<P>
 
   <P><a href="../../MPC/README"> MPC</a> is used to build the CIDL
   compiler on <Strong>Linux</STRONG>. The procedure is outlined
@@ -148,9 +168,7 @@ To build CIAO core/tools/examples:
       For the supported build tools please see <a href="http://downloads.ociweb.com/MPC/MakeProjectCreator.pdf">MPC manual</a>.<P>
    You have to execute the MPC command in the following directories if you only want to build the examples and have a peek at CIAO:
    <UL>
-     <LI> <code>$CIAO_ROOT/ciao</code>
-     <LI> <code>$CIAO_ROOT/tools</code>
-     <LI> <code>$CIAO_ROOT/examples</code>
+     <LI> <code>$CIAO_ROOT/DAnCE/
    </UL><P>
 
 
@@ -167,8 +185,7 @@ To build CIAO core/tools/examples:
    quickly by doing the following:
    <LI> Remove all the GNUmakefiles or project files that are shipped
    with the release. </LI>
-   <LI> Open up <CODE> $CIAO_ROOT/CIAOTAO.mwc </CODE> and remove DAnCE
-   from the list. 
+   <LI> Open up <CODE> $CIAO_ROOT/CIAOTAO.mwc </CODE>.
    <LI> Run <CODE>$ACE_ROOT/bin/mwc.pl CIAOTAO.mwc</CODE> from <CODE>
    $CIAO_ROOT </CODE>. </LI>
    <LI> Type 'make' </LI>