summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormsmit <msmit@remedy.nl>2010-06-18 06:43:09 +0000
committermsmit <msmit@remedy.nl>2010-06-18 06:43:09 +0000
commit737cd2a033ef7a679b189fcb7dccce217e58c082 (patch)
treeaae5d6a253a4dc06b8c871551c1c9348e4021b00
parent1a4131d77eef6122f48dd33b40b7938be580d656 (diff)
downloadATCD-737cd2a033ef7a679b189fcb7dccce217e58c082.tar.gz
Fri Jun 18 06:39:39 UTC 2010 Marcel Smit <msmit@remedy.nl>
* connectors/dds4ccm/tutorials/Shapes/Tutorial/coding.html: * connectors/dds4ccm/tutorials/Shapes/Tutorial/compilation.html: * connectors/dds4ccm/tutorials/Shapes/Tutorial/dds4ccm.html: * connectors/dds4ccm/tutorials/Shapes/Tutorial/executors.html: * connectors/dds4ccm/tutorials/Shapes/Tutorial/general.html: * connectors/dds4ccm/tutorials/Shapes/Tutorial/idl.html: Outline of this tutorial.
-rw-r--r--CIAO/ChangeLog10
-rw-r--r--CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/coding.html28
-rw-r--r--CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/compilation.html63
-rw-r--r--CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/dds4ccm.html28
-rw-r--r--CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/executors.html10
-rw-r--r--CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/general.html5
-rw-r--r--CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/idl.html2
7 files changed, 135 insertions, 11 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 7c25c7276b4..f45f8041240 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,13 @@
+Fri Jun 18 06:39:39 UTC 2010 Marcel Smit <msmit@remedy.nl>
+
+ * connectors/dds4ccm/tutorials/Shapes/Tutorial/coding.html:
+ * connectors/dds4ccm/tutorials/Shapes/Tutorial/compilation.html:
+ * connectors/dds4ccm/tutorials/Shapes/Tutorial/dds4ccm.html:
+ * connectors/dds4ccm/tutorials/Shapes/Tutorial/executors.html:
+ * connectors/dds4ccm/tutorials/Shapes/Tutorial/general.html:
+ * connectors/dds4ccm/tutorials/Shapes/Tutorial/idl.html:
+ Outline of this tutorial.
+
Fri Jun 18 03:30:20 UTC 2010 William R. Otte <wotte@dre.vanderbilt.edu>
* DAnCE/LocalityManager/Scheduler/Deployment_Event.inl:
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/coding.html b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/coding.html
new file mode 100644
index 00000000000..2e557b87e6c
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/coding.html
@@ -0,0 +1,28 @@
+<!--//$Id$ -->
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+ <title>DDS4CCM Tutorial Shapes - Coding guidelines</title>
+</head>
+
+<body>
+ <table width="100%" border="0">
+ <tr>
+ <td align="left"><a href="./dds4ccm.html">Previous<a></td>
+ <td align="center"><img width="4%" height="5%" src="./images/images.png"/></td>
+ <td align="right"><a href="./compilation.html"><a></td>
+ </tr>
+ </table>
+ <hr />
+
+ <h1>Coding guidelines</h1>
+
+ <hr />
+ <table width="100%" border="0">
+ <tr>
+ <td align="left"><a href="./dds4ccm.html">Previous<a></td>
+ <td align="center"><img width="4%" height="5%" src="./images/images.png"/></td>
+ <td align="right"><a href="./compilation.html"><a></td>
+ </tr>
+ </table>
+</body>
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/compilation.html b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/compilation.html
new file mode 100644
index 00000000000..b99a1531095
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/compilation.html
@@ -0,0 +1,63 @@
+<!--//$Id$ -->
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+ <title>DDS4CCM Tutorial Shapes - Compilation and deployment</title>
+</head>
+
+<body>
+ <table width="100%" border="0">
+ <tr>
+ <td align="left"><a href="./coding.html">Previous<a></td>
+ <td align="center"><img width="4%" height="5%" src="./images/images.png"/></td>
+ <td align="right"></td>
+ </tr>
+ </table>
+ <hr />
+
+ <h1>Compilation and deployment<h2>
+
+ <h2>Compilation</h2>
+ <p>
+ Once all the code has been written, compilation of the code would be the next
+ step.<br/>
+ MPC is used in order to create the Makefiles and projects files. All MPC files
+ that are needed for this tutorial are in the same directory as the accompanying
+ IDL and executor files.<br/>
+
+ In order to make the GNU make files or the Visual Studio project files,
+ the following steps should be performed :
+ <ul>
+ <li>Start a command shell and navigate to : <br/>
+ <code>%CIAO_ROOT%/connectors/dds4ccm/tutorials/Shapes/Shapes_asm</code>
+ </li>
+ <li>Run<br/>
+ <ul>
+ <li><code>perl %ACE_ROOT%/bin/mwc.pl -type vc9</code> to create Visual
+ Studio 2008 project files.
+ </li>
+ <li><code>perl %ACE_ROOT%/bin/mwc.pl -type gnuace</code> to create
+ the GNU make files.
+ </li>
+ </ul>
+ <li>Now compile the code like you're used to.
+ </li>
+ </li>
+ </ul>
+ </p>
+ <p>
+ If all went well, all libraries are in the Shapes_asm/lib directory.
+ </p>
+ <h2>Deployment</h2>
+ <p>
+ </p>
+
+ <hr />
+ <table width="100%" border="0">
+ <tr>
+ <td align="left"><a href="./coding.html">Previous<a></td>
+ <td align="center"><img width="4%" height="5%" src="./images/images.png"/></td>
+ <td align="right"></td>
+ </tr>
+ </table>
+</body>
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/dds4ccm.html b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/dds4ccm.html
new file mode 100644
index 00000000000..af79ac41e4c
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/dds4ccm.html
@@ -0,0 +1,28 @@
+<!--//$Id$ -->
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+ <title>DDS4CCM Tutorial Shapes - DDS4CCM</title>
+</head>
+
+<body>
+ <table width="100%" border="0">
+ <tr>
+ <td align="left"><a href="./executors.html">Previous<a></td>
+ <td align="center"><img width="4%" height="5%" src="./images/images.png"/></td>
+ <td align="right"><a href="./coding.html"><a></td>
+ </tr>
+ </table>
+ <hr />
+
+ <h1>DDS4CCM</h1>
+
+ <hr />
+ <table width="100%" border="0">
+ <tr>
+ <td align="left"><a href="./executors.html">Previous<a></td>
+ <td align="center"><img width="4%" height="5%" src="./images/images.png"/></td>
+ <td align="right"><a href="./coding.html"><a></td>
+ </tr>
+ </table>
+</body>
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/executors.html b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/executors.html
index 9894004e2ed..01538118790 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/executors.html
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/executors.html
@@ -10,7 +10,7 @@
<tr>
<td align="left"><a href="./idl.html">Previous<a></td>
<td align="center"><img width="4%" height="5%" src="./images/images.png"/></td>
- <td align="right"></td>
+ <td align="right"><a href="./dds4ccm.html">Next<a></td>
</tr>
</table>
<hr />
@@ -18,9 +18,9 @@
<h1>Executors</h1>
<p>
Once the IDL files are created, the business logic for the components should
- implemented. Since components can be complex, we can use the IDL compiler to
- create empty executor files. This part of the tutorial explains how this can
- be done.
+ be implemented. Since components can be complex, we can use the IDL compiler
+ to create empty executor files. This part of the tutorial explains how this
+ can be done.
</p>
<h2>Controller</h2>
@@ -97,7 +97,7 @@
<tr>
<td align="left"><a href="./idl.html">Previous<a></td>
<td align="center"><img width="4%" height="5%" src="./images/images.png"/></td>
- <td align="right"></td>
+ <td align="right"><a href="./dds4ccm.html">Next<a></td>
</tr>
</table>
</body>
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/general.html b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/general.html
index 4e2f62e9cb9..17d36994e4e 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/general.html
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/general.html
@@ -21,11 +21,6 @@
combination with a CCM component.<br/>
</p>
- <p>
- TODO: <b><i>short explanation of the DDS4CCM connector.</i></b>
- TODO: <b><i>short explanation of ports/mirrorports.</i></b>
- </p>
-
<h2>System</h2>
<p>
The system consists of three components:
diff --git a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/idl.html b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/idl.html
index 687163bad6f..fbad4397a46 100644
--- a/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/idl.html
+++ b/CIAO/connectors/dds4ccm/tutorials/Shapes/Tutorial/idl.html
@@ -107,7 +107,7 @@
&nbsp;&nbsp;&nbsp;&nbsp;<b>attribute unsigned</b> <font color="red">short</font> max_x;<br/>
&nbsp;&nbsp;&nbsp;&nbsp;<b>attribute unsigned</b> <font color="red">short</font> max_y;<br/>
&nbsp;&nbsp;&nbsp;&nbsp;<b>attribute unsigned</b> <font color="red">short</font> max_size;<br/>
- &nbsp;&nbsp;&nbsp;&nbsp;<b>attribute</b><font color="red">boolean</font> resize_shape;<br/>
+ &nbsp;&nbsp;&nbsp;&nbsp;<b>attribute</b> <font color="red">boolean</font> resize_shape;<br/>
&nbsp;&nbsp;};<br/>};<br/>
</code>
</p>