From 56ad672022b3d9b4f962d4bf038c6f898c0f38a7 Mon Sep 17 00:00:00 2001
From: Ian Craggs <icraggs@uk.ibm.com>
Date: Mon, 2 Sep 2013 12:31:10 +0100
Subject: [PATCH] Product Doxygen doc

---
 build.xml               | 37 ++++++++++++++-----------------------
 doc/DoxyfileV3AsyncAPI  |  4 ++--
 doc/DoxyfileV3ClientAPI |  4 ++--
 3 files changed, 18 insertions(+), 27 deletions(-)

diff --git a/build.xml b/build.xml
index 8f587c57..398880f4 100644
--- a/build.xml
+++ b/build.xml
@@ -182,30 +182,22 @@
 
   <target name="doc" >
     <if>
-      <available file="${doxygen}"/>
+      <available file="/usr/bin/doxygen"/>
       <then>
-	<exec executable="${doxygen}" dir="${mqttclient_src}">
-	  <arg value="${source.folder}/mqttv3c/doc/DoxyfileV3ClientAPI"/>
+        <mkdir dir="${output.folder}/doc"/>
+	<exec executable="doxygen" dir="src">
+	  <arg value="../doc/DoxyfileV3ClientAPI"/>
 	</exec>
-	<mkdir dir="${ship.folder}/doc/html"/>
-	<copy todir="${ship.folder}/doc/html">
-	  <fileset dir="${mqttclient_src}/MQTTClient/html"/>
-	</copy>
-	<!-- <zip destfile="${output.folder}/doc/MQTTClient.zip">
-	     <zipfileset dir="${mqttclient_src}/MQTTClient" />
-	</zip> -->
-	<exec executable="${doxygen}" dir="${mqttclient_src}">
-	  <arg value="${source.folder}/mqttv3c/doc/DoxyfileV3AsyncAPI"/>
+	<exec executable="doxygen" dir="src">
+	  <arg value="../doc/DoxyfileV3AsyncAPI"/>
 	</exec>
-	<mkdir dir="${ship.folder}/doc/html/MQTTAsync"/>
-	<copy todir="${ship.folder}/doc/html/MQTTAsync">
-	  <fileset dir="${mqttclient_src}/MQTTAsync"/>
-	</copy>
-	<!-- <zip destfile="${output.folder}/doc/MQTTAsync.zip">
-	     <zipfileset dir="${mqttclient_src}/MQTTAsync" prefix="MQTTAsync/"/>
-	</zip> -->
-	<delete dir="${mqttclient_src}/MQTTClient" />
-	<delete dir="${mqttclient_src}/MQTTAsync" />
+	<zip destfile="${output.folder}/MQTTClient_doc.zip">
+	     <zipfileset dir="${output.folder}/doc/MQTTClient" />
+	</zip> 
+	<zip destfile="${output.folder}/MQTTAsync_doc.zip">
+	     <zipfileset dir="${output.folder}/doc/MQTTAsync" prefix="MQTTAsync/"/>
+	</zip> 
+	<delete dir="${output.folder}/doc" />
       </then>
       <else>
 	<echo message="doxygen is not available" />
@@ -232,7 +224,6 @@
     </copy>
   </target>
 
-  <!-- target name="full" depends="init, version, compile, test, doc, copy" -->
-  <target name="full" depends="init, version, compile, test" />
+  <target name="full" depends="init, version, compile, test, doc" />
 
 </project>
diff --git a/doc/DoxyfileV3AsyncAPI b/doc/DoxyfileV3AsyncAPI
index 1fa4872d..91aea104 100644
--- a/doc/DoxyfileV3AsyncAPI
+++ b/doc/DoxyfileV3AsyncAPI
@@ -26,7 +26,7 @@ DOXYFILE_ENCODING      = UTF-8
 # identify the project. Note that if you do not use Doxywizard you need
 # to put quotes around the project name if it contains spaces.
 
-PROJECT_NAME           = "Asynchronous MQTT Client"
+PROJECT_NAME           = "Paho Asynchronous MQTT C Client Library"
 
 # The PROJECT_NUMBER tag can be used to enter a project or revision number.
 # This could be handy for archiving the generated documentation or
@@ -52,7 +52,7 @@ PROJECT_LOGO           = "../doc/pahologo.png"
 # If a relative path is entered, it will be relative to the location
 # where doxygen was started. If left blank the current directory will be used.
 
-OUTPUT_DIRECTORY       = "MQTTAsync/"
+OUTPUT_DIRECTORY       = "../build/output/doc/MQTTAsync/"
 
 # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
 # 4096 sub-directories (in 2 levels) under the output directory of each output
diff --git a/doc/DoxyfileV3ClientAPI b/doc/DoxyfileV3ClientAPI
index 25413c9b..70268565 100644
--- a/doc/DoxyfileV3ClientAPI
+++ b/doc/DoxyfileV3ClientAPI
@@ -26,7 +26,7 @@ DOXYFILE_ENCODING      = UTF-8
 # identify the project. Note that if you do not use Doxywizard you need
 # to put quotes around the project name if it contains spaces.
 
-PROJECT_NAME           = "MQTT Client"
+PROJECT_NAME           = "Paho MQTT C Client Library"
 
 # The PROJECT_NUMBER tag can be used to enter a project or revision number.
 # This could be handy for archiving the generated documentation or
@@ -52,7 +52,7 @@ PROJECT_LOGO           = "../doc/pahologo.png"
 # If a relative path is entered, it will be relative to the location
 # where doxygen was started. If left blank the current directory will be used.
 
-OUTPUT_DIRECTORY       = "MQTTClient/"
+OUTPUT_DIRECTORY       = "../build/output/doc/MQTTClient/"
 
 # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
 # 4096 sub-directories (in 2 levels) under the output directory of each output