[C-MPI-commits] SF.net SVN: c-mpi:[113] docs/manual

[<jmw...@us...>]

Revision: 113
          http://c-mpi.svn.sourceforge.net/c-mpi/?rev=113&view=rev
Author:   jmwozniak
Date:     2010-05-14 15:39:05 +0000 (Fri, 14 May 2010)

Log Message:
-----------
Start using XInclude for code samples

Modified Paths:
--------------
    docs/manual/Makefile
    docs/manual/manual.xml

Added Paths:
-----------
    docs/manual/cmpi_client_code.c

Modified: docs/manual/Makefile
===================================================================
--- docs/manual/Makefile	2010-05-14 15:05:52 UTC (rev 112)
+++ docs/manual/Makefile	2010-05-14 15:39:05 UTC (rev 113)
@@ -1,4 +1,3 @@
-#!/bin/sh
 
 all: htmls
 # phps pdfs
@@ -12,12 +11,21 @@
 # chunked-userguide: userguide.xml
 #	./build-chunked-userguide.sh
 
-%.php: %.xml formatting/swiftsh_html.xsl
+manual.inc.xml: manual.xml
+	xmllint --xinclude $(<) > $(@)
+
+manual.html: manual.inc.xml formatting/swiftsh_html.xsl
 	xsltproc --nonet formatting/swiftsh_html.xsl $<
-	sed -e "s/index.html#/#/g" index.html >$@
 
+index.html: manual.html
+	sed -e "s/index.html#/#/g" $(<) > $(@)
+
 #%.pdf: %.xml formatting/vdl2_fo.xsl
 #	fop/fop -xsl formatting/vdl2_fo.xsl -xml $< -pdf $@
 
 %.html: %.php
 	cp $< $@
+
+clean:
+	rm -fv index.html manual.html manual.inc.xml
+

Added: docs/manual/cmpi_client_code.c
===================================================================
--- docs/manual/cmpi_client_code.c	                        (rev 0)
+++ docs/manual/cmpi_client_code.c	2010-05-14 15:39:05 UTC (rev 113)
@@ -0,0 +1,14 @@
+
+#include <cmpi.h>
+
+cmpi_client_code()
+{
+  sprintf(key,   "key_%i",   mpi_rank);
+  sprintf(value, "value_%i", mpi_rank);
+  cmpi_put(key, value, strlen(value)+1);
+
+  rank = (mpi_rank+1)%mpi_size;
+  sprintf(key, "key_%i", rank);
+  cmpi_get(key, &result, &length);
+  printf("result(%i): %s\n", length, result);
+}

Modified: docs/manual/manual.xml
===================================================================
--- docs/manual/manual.xml	2010-05-14 15:05:52 UTC (rev 112)
+++ docs/manual/manual.xml	2010-05-14 15:39:05 UTC (rev 113)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [] >
+<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook V4.5//EN"
+ "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [] >
 
 <article>
   <articleinfo revision="0.1">
@@ -33,26 +34,18 @@
 	C-MPI can be used as an MPI library:
       </para>
 
+      <programlisting>
+      <xi:include href="cmpi_client_code.c" parse="text"
+      xmlns:xi="http://www.w3.org/2001/XInclude" /></programlisting>
+
+<!--
       <programlisting> <![CDATA[
 
       #include <cmpi.h>
 
-      int main(int argc, char* argv[])
+      cmpi_client_code()
       {
-      int mpi_rank;
-      int mpi_size;
-      char key[10];
-      char value[30];
-      int   length;
-      char* result;
-
-      MPI_Init(&argc, &argv);
-      MPI_Comm_rank(MPI_COMM_WORLD, &rank);
-      MPI_Comm_size(MPI_COMM_WORLD, &size);
-
-      cmpi_init();
-
-      sprintf(key,   "key_%i",   mpi_rank);
+          sprintf(key,   "key_%i",   mpi_rank);
       sprintf(value, "value_%i", mpi_rank);
       cmpi_put(key, value, strlen(value)+1);
 
@@ -67,6 +60,8 @@
       }
       ]]>
       </programlisting>
+
+-->
     </section>
   </section>
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.