summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam R. Otte <wotte@dre.vanderbilt.edu>2009-06-15 02:23:32 +0000
committerWilliam R. Otte <wotte@dre.vanderbilt.edu>2009-06-15 02:23:32 +0000
commite91dcfca956182f7276383af56b3973b6e24806a (patch)
tree9edfbac6cbc6229e93a1b3a8abce7a8912034158
parente52aa82eef0cd182bce580c2f7dcec43150d90b3 (diff)
downloadATCD-e91dcfca956182f7276383af56b3973b6e24806a.tar.gz
Mon Jun 15 02:22:01 UTC 2009 William R. Otte <wotte@william-r-ottes-macbook-pro-2.local>
-rw-r--r--CIAO/CIAO-INSTALL.html38
-rw-r--r--CIAO/ChangeLog6
-rw-r--r--CIAO/NEWS2
3 files changed, 24 insertions, 22 deletions
diff --git a/CIAO/CIAO-INSTALL.html b/CIAO/CIAO-INSTALL.html
index 6927f341a47..799328ea00a 100644
--- a/CIAO/CIAO-INSTALL.html
+++ b/CIAO/CIAO-INSTALL.html
@@ -4,10 +4,13 @@
<LINK rev="made" href="mailto:schmidt@cs.wustl.edu"></head>
<body text="#000000" vLink="#ff0f0f" link="#000fff" bgColor="#ffffff">
<hr>
- <h3>Building and Installing CIAO
- </h3>
+ <h3>Building and Installing CIAO</h3>
<p>The first thing you should do to install CIAO is to set the environment
- variable <code>CIAO_ROOT</code> to be <code>$TAO_ROOT/CIAO</code>. Please refer
+ variable <code>CIAO_ROOT</code> to
+ be <code>$TAO_ROOT/CIAO</code>, or whereever you have installed
+ the CIAO sources. The <code>DANCE_ROOT</code> environment
+ variable should also be set to <code>$CIAO_ROOT/DAnCE</code>, or
+ wherever you have installed the DAnCE sources. Please refer
to the <A href="../../ACE-INSTALL.html">ACE installation notes</A> and <A href="../TAO-INSTALL.html">
TAO installation notes</A> for instructions on setting <code>$ACE_ROOT</code>
and <code>$TAO_ROOT</code>, respectively. They are needed since CIAO sits on
@@ -34,13 +37,11 @@
</li>
</ol>
<hr>
- <h3>Supported Platforms for CIAO
- </h3>
+ <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>
- <h3>Supported Platforms for CIDLC
- </h3>
+ <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 on how to build CIDLC.
</p>
@@ -74,9 +75,8 @@
version of ACE and TAO because CIAO tracks changes to ACE and TAO very closely.
</p>
<hr>
- <h3>Install CIDL Compiler
- </h3>
- <p>We suggest you download the prebuilt binary <code>cidlc(exe)</code> from <strong>
+ <h3>Install CIDL Compiler</h3>
+ <p>We suggest you download the prebuilt binary <code>cidlc(.exe)</code> from <strong>
<a href="http://www.dre.vanderbilt.edu/cidlc/">here</a></strong> or, if you
are using Windows or Linux, you can build it by yourself.
</p>
@@ -125,9 +125,9 @@
<code>ACE_ROOT</code>
- [path&nbsp;ending with&nbsp;ACE_wrappers directory] (this should already be
set if you're using CIAO)
- <li>
+<!-- <li>
<code>BOOST_CFG</code> - <code>_vc7_mdsd</code>
- <li>
+ <li> -->
<code>BOOST_ROOT</code>
- [path ending with Boost directory]
<li>
@@ -144,16 +144,14 @@
</li>
</ul>
<hr>
- <h3>Obtaining and Installing Xerces-C
- </h3>
+ <h3>Obtaining and Installing Xerces-C</h3>
<p>The Xerces-C XML parsing library is a necessary component to build parts of
DAnCE that need to process XML based descriptor files, which include the <b>Plan
Launcher</b> and the <b>Repository Manager</b>. Currently, the only Xerces-C
- version supported by the DOC group is version 2.6 or later.
+ versions supported by the DOC group is version 2.6 or later or 3.0 or later.
Earlier versions of the Xerces-C library may work.
</p>
- <h4>Building Xerces-C
- </h4>
+ <h4>Building Xerces-C</h4>
<p>You may check <a href="http://www.dre.vanderbilt.edu/~wotte/xerces/">here</a> to
see if there is a prebuilt binary available for your platform. Otherwise, you
will have to obtain the source from the <a href="http://xml.apache.org/xerces-c/download.cgi">
@@ -168,8 +166,7 @@
build tool will expect these libraries to be named xerces-c for non debug
versions, and xerces-cd for debug versions.
</ul>
- <h4>Xerces-C Environment Settings
- </h4>
+ <h4>Xerces-C Environment Settings</h4>
<p>If the Xerces includes and libraries are in your system include and library
paths, respectively, then you need not set up any environment and may proceed
to the next step. If not, you will need to set an environment variable named
@@ -179,8 +176,7 @@
for dynamically linked libraries.
</p>
<hr>
- <h3>Install CIAO core/tools/examples
- </h3>
+ <h3>Install CIAO core/tools/examples</h3>
<p>Most of the GNUmakefiles/project files/solution files required to build CIAO
are available in the release. If you don't like the configurations used, please
feel free to regenerate them using MPC. Please see <A href="../../MPC/README">this</A>
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 73b8f52f02b..d957c964556 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,9 @@
+Mon Jun 15 02:22:01 UTC 2009 William R. Otte <wotte@william-r-ottes-macbook-pro-2.local>
+
+ * CIAO-INSTALL.html:
+ * NEWS:
+ Minor updates.
+
Sun Jun 14 06:58:05 2009 Johnny Willemsen <jwillemsen@remedy.nl>
* tools/Config_Handlers/XSCRT/Elements.hpp:
diff --git a/CIAO/NEWS b/CIAO/NEWS
index 9c2444fce68..2f6e8a6c05a 100644
--- a/CIAO/NEWS
+++ b/CIAO/NEWS
@@ -5,7 +5,7 @@ PLANNED CHANGES BEFORE NEXT RELEASE
. The TargetManager will be ported to the new DAnCE.
-. The CIDL Compiler may be deprecated in the near future to be replaced by
+. The CIDL Compiler will be deprecated in the next version to be replaced by
code generation being handled entirely by tao_idl. As a result, CIDL will
no longer be used to specify containers and local executor mappings for component
implementations, to be instead handled by either command line options to the