summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--TAO/CIAO/CIAO-INSTALL.html26
-rw-r--r--TAO/ChangeLog2
-rw-r--r--TAO/TAO-INSTALL.html2
-rw-r--r--TAO/docs/releasenotes/index.html24
-rw-r--r--THANKS2
6 files changed, 33 insertions, 26 deletions
diff --git a/ChangeLog b/ChangeLog
index ad354c7342f..dc829498017 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -44,12 +44,13 @@ Wed Feb 11 13:14:39 2004 Steve Huston <shuston@riverace.com>
disambiguate it from a 0 char*. Fixes compile error on Windows.
Wed Feb 11 15:39:29 GMT 2004 Paul Morrison <epm@prismtechnologies.com>
+
* examples/APG/Signals/SigAction.cpp
Added a reinterpret_cast to fix a build error with LynxOS.
Wed Feb 11 15:31:06 GMT 2004 Paul Morrison <epm@prismtechnologies.com>
-
+
* TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Makefile
* TAO/orbsvcs/Logging_Service/Event_Logging_Service/Makefile
* TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Makefile
diff --git a/TAO/CIAO/CIAO-INSTALL.html b/TAO/CIAO/CIAO-INSTALL.html
index f1e4d787e03..63ce8f96374 100644
--- a/TAO/CIAO/CIAO-INSTALL.html
+++ b/TAO/CIAO/CIAO-INSTALL.html
@@ -11,13 +11,17 @@
bgcolor = "#ffffff">
<HR><P>
-<H3>Installation of CIAO In General</H3>
+<H3>Building and Installing CIAO</H3>
-Note:
-<br>
-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>. As to how to set <CODE>$TAO_ROOT</CODE> and <CODE>$ACE_ROOT</CODE> please refer to the <a href="../../ACE-INSTALL.html">ACE installation notes</a> and <a href="../TAO-INSTALL.html">TAO installation notes</a>.
+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 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.
-<P>CIAO could be divided into several parts, different installation/building rules apply to different parts of CIAO.
+<P>CIAO is divided into several parts, so different installation/building rules apply to different parts of CIAO.
<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>
@@ -94,14 +98,14 @@ ACE because CIAAO tracks changes to ACE and TAO very closely. <P>
<P>You can choose to either download the binary <CODE>cidlc(exe)</CODE> from <STRONG><A HREF="http://www.dre.vanderbilt.edu/~boris/cidlc/binary">here</A></STRONG> or to build it by yourself.<P>
- <P>There are 3 ways to build CIDL compiler on <Strong>Linux</STRONG>:<P>
+ <P>There are 3 ways to build the CIDL compiler on <Strong>Linux</STRONG>:<P>
<OL>
- <LI>Use GNU Make utility. For detail please see <a href="./CCF/Documentation/Build.html">Build.html</a><p>
+ <LI>Use GNU Make utility. For details please see <a href="./CCF/Documentation/Build.html">Build.html</a><p>
<LI>Use ACE Make uitility.<P>
<UL>
<LI>Install <code>boost_filesystem</code>, <code>boost_regex</code> and <code>Utility Library</code>. For how to do that please see <a href="./CCF/Documentation/Build.html">Build.html</a>.<P>
- <LI>Type <code>make<code> in <code>$CIAO_ROOT/CCF</code> and <code>$CIAO_ROOT/CIDLC</code>.<p>
+ <LI>Type <code>make</code> in <code>$CIAO_ROOT/CCF</code> and <code>$CIAO_ROOT/CIDLC</code>.<p>
</UL>
<LI>Use MPC: (Not supported yet)
</OL>
@@ -149,7 +153,7 @@ To build CIAO core/tools/examples:
</UL><P>
- On <STRONG>Linux</STRONG>: do <code>$ACE_ROOT/bin/mwc.pl</code> at the locations specified above then <code>make<code>.<P>
+ On <STRONG>Linux</STRONG>: do <code>$ACE_ROOT/bin/mwc.pl</code> at the locations specified above then <code>make</code>.<P>
On <STRONG>Windows/VC6</STRONG>: do <code>%ACE_ROOT%/bin/mwc.pl -type vc6</code> at the locations specified above then Open the workspace file and build.<P>
@@ -160,5 +164,9 @@ To build CIAO core/tools/examples:
<Strong>Note:</Strong> You can run <code>mwc.pl</code> at <code>$CIAO_ROOT</code> as long as you don't intend to build CIDL compiler with MPC. If this is the case(default), you can run the mwc.pl command with proper augment once then you can do <code>make</code> at <code>$CIAO_ROOT</code> (Linux) or open the workspace/solution file at <code>$CIAO_ROOT</code> (Windows) to build.
</OL>
+<P><HR><P>
+Back to the <A HREF="http://www.cs.wustl.edu/~schmidt/CIAO.html">CIAO</A> home page.
+
+<!--#include virtual="/~schmidt/cgi-sig.html" -->
</BODY>
</HTML>
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index c9ff06e55c0..9c8fa8e8bf3 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -186,7 +186,7 @@ Wed Feb 11 09:23:13 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl>
* TAOACE_WinCE.vcw:
* tests/CodeSets/libs/IBM1047_ISO8859/IBM1047_ISO8859.vcp:
* tests/CodeSets/libs/IBM1047_ISO8859/IBM1047_ISO8859_Static.vcp:
- Removed these project files from the repo. If you want embedded
+ Removed these procect files from the repo. If you want embedded
Visual C++ project files generate them with MPC. These files where
just not maintained after the first checkin.
diff --git a/TAO/TAO-INSTALL.html b/TAO/TAO-INSTALL.html
index 12639898231..271c561efaf 100644
--- a/TAO/TAO-INSTALL.html
+++ b/TAO/TAO-INSTALL.html
@@ -574,7 +574,7 @@ Please see the
Resource Requirements discussion</a> for information on system resources
required to build ACE and TAO.<p>
-
+<HR><P>
Back to the <A HREF="http://www.cs.wustl.edu/~schmidt/TAO.html">TAO</A> home page.
<!--#include virtual="/~schmidt/cgi-sig.html" -->
diff --git a/TAO/docs/releasenotes/index.html b/TAO/docs/releasenotes/index.html
index 79b90c9da25..ffff39397c2 100644
--- a/TAO/docs/releasenotes/index.html
+++ b/TAO/docs/releasenotes/index.html
@@ -2221,19 +2221,17 @@ local objects.
Point of contact: <a href="mailto:gthaker@atl.lmco.com">Gautam H. Thaker</a>, Lockheed Martin Advanced Technology Labs, Cherry Hill, NJ.
-<p>TAO has support for OMG's GIOP SCTP Protocol mapping
-<a href=http://www.omg.org/cgi-bin/doc?ptc/2003-08-20>spec</a>
-except that SCIOP protocol properties are not yet supported. Extensive
-information about SCTP and how it may be used from both ACE as well
-as from TAO is available in several README files
-in $ACE_ROOT/performance-tests/SCTP/ directory. ACE/TAO's SCTP support
-can be used either with Linux's OpenSS7 SCTP implementation or with
-Linux's LKSCTP SCTP implementation.
-<p>
-A paper describing our implementation and measured results in available
-<a href=http://www.atl.external.lmco.com/projects/QoS/documents/DOA2003_97_Thaker.pdf>
-here
-</a>.
+<p>TAO has support for OMG's GIOP SCTP Protocol mapping <a
+href=http://www.omg.org/cgi-bin/doc?ptc/2003-08-20>spec</a>, except
+that SCIOP protocol properties are not yet supported. Extensive
+information about SCTP and how it may be used from both ACE and TAO is
+available in several README files in $ACE_ROOT/performance-tests/SCTP/
+directory. ACE+TAO's SCTP support can be used either with Linux's
+OpenSS7 SCTP implementation or with Linux's LKSCTP SCTP
+implementation. <p> A paper describing the ACE+TAO SCTP
+implementation and measured results are available <a
+href=http://www.atl.external.lmco.com/projects/QoS/documents/DOA2003_97_Thaker.pdf>
+online</a>.<P>
<hr>
<h3>
diff --git a/THANKS b/THANKS
index 683af6a0382..4d9c3782b5b 100644
--- a/THANKS
+++ b/THANKS
@@ -1252,7 +1252,7 @@ Wayne Erchak <wayne@stentor.com>
Yew Khong See <seeyk@yahoo.com>
Greg Thompson <gregt@ot.com.au>
Mike Pyle <mike.pyle@burning-glass.com>
-Kobi Cohen-Arazi <kobi@mivzak.com>
+Kobi Cohen-Arazi <kobi-co@barak-online.net>
Israel Illescas Gomez <illescas@dycsa.es>
Brodie Thiesfield <brodie.thiesfield@activesky.com>
Erik Toubro Nielsen <enielsen@mdsproteomics.dk>