*** empty log message ***

2 files changed, 31 insertions, 14 deletions

diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index 6da10c73405..59aad482982 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,7 @@
+Mon Jun 02 12:47:50 2003  Nanbor Wang  <nanbor@cs.wustl.edu>
+
+	* README: Revised the root readme file.
+
 Mon Jun  2 12:42:10 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * CCF/External/Utility/Documentation/Build.html:
@@ -239,7 +243,7 @@ Fri May 30 19:33:36 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
         * CIDLC/Version:
         * CIDLC/cidlc.cpp:
 
-	  Source code, documentation and build files for the 
+	  Source code, documentation and build files for the
 	  CIDL compiler.
 
 Fri May 30 18:18:25 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
@@ -387,7 +391,7 @@ Fri May 30 14:27:55 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
 Fri May 30 14:15:45 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
-	* VERSION: 
+	* VERSION:
 	* PROBLEM-REPORT-FORM (Subject): Files needed for the release.
 
 Fri May 30 14:11:11 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
diff --git a/TAO/CIAO/README b/TAO/CIAO/README
index be0f1e604b7..1ef194107fb 100644
--- a/TAO/CIAO/README
+++ b/TAO/CIAO/README
@@ -2,12 +2,23 @@
 BUILDING CIAO
 ========================
 
-* Compile ACE and TAO:
+* Supported platform:
+
+  We have tried CIAO examples on Win32 using MSVC 6.0 and above and on
+  Linux.
+
+* Documentation:
+
+  Various documents are available under $(CIAO_ROOT)/docs/
+  Commments and suggestions for improving these documents are
+  extremely welcome.
+
+* Preparation - Compiling ACE and TAO:
 
   CIAO depends on many CORBA features to function properly so you need
-to compile them first.  Here is a non-exhaustive list:
+  to compile them first.  Here is a non-exhaustive list:
 
-        ACEXML,
+        ACEXML_Parser,
 
         Valuetype
         IORInterceptor
@@ -18,19 +29,15 @@ to compile them first.  Here is a non-exhaustive list:
 
 and also the libraries they depends on.
 
-  - I have the following defined in my platform_macros.GNU:
+  - On Linux, try defining these in the platform_macros.GNU
 
      exceptions=1
-     rt_corba=1
-     smart_proxies=1
      interface_repo=1
-     interceptors=1
      ssl=1
 
-    Apparently, not all of them are needed to compile CIAO, but that's
-    what I'm using.
+* Compiling CIAO core libraries and tools:
 
-* Assuming CIAO_ROOT = ACE_wrappers/TAO/CIAO/
+  Assuming CIAO_ROOT = ACE_wrappers/TAO/CIAO/
 
   Compile the following directories:
 
@@ -67,7 +74,7 @@ and also the libraries they depends on.
      This is a single component example.  Check out run_test.pl to see
      how you can instantiate a single component using CIAO.
 
-  - $CIAO_ROOT/examples/handcrafted/Display
+  - $CIAO_ROOT/examples/OEP/Display
 
      This is a multiple-component example.  RateGen component
      subdirectory contains a run_test.pl that you can use to
@@ -80,12 +87,18 @@ and also the libraries they depends on.
      distributed application using the Assembly_Deployer.  Change
      directory to
 
-        $CIAO_ROOT/examples/handcrafted/Display/descriptors
+        $CIAO_ROOT/examples/OEP/Display/descriptors
 
      and take a look at the file: NOTE.txt.  This file describes the
      steps to compose the application using various different
      configurations and composition specs.
 
+  - $CIAO_ROOT/examples/OEP/BasicSP
+
+    This is a new multi-component example.  It has the similar
+    struture as the Dsiplay example above.
+
+
 * If you can not find the
   Makefiles for unix platform you are using, you can use mwc to create
   them.  For examples, to compile the multi-component example, use the