From 696aa95c9f5578deedee609adba701d3b88957cc Mon Sep 17 00:00:00 2001 From: fgerlits Date: Fri, 12 Nov 2004 10:19:21 +0000 Subject: [PATCH] moved doxytag generation to the root Makefile --- livesupport/Makefile | 18 ++++++++++++++---- livesupport/etc/doxygen.config | 7 ++++--- .../LiveSupport/Core/StorageClientInterface.h | 6 +++--- .../products/scheduler/etc/doxygen.config | 4 ++-- .../xmlrpc++/xmlrpc++-20040713/bin/install.sh | 11 +---------- 5 files changed, 24 insertions(+), 22 deletions(-) diff --git a/livesupport/Makefile b/livesupport/Makefile index 1abbaba4b..577f90ae9 100644 --- a/livesupport/Makefile +++ b/livesupport/Makefile @@ -20,8 +20,8 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # -# Author : $Author: maroy $ -# Version : $Revision: 1.8 $ +# Author : $Author: fgerlits $ +# Version : $Revision: 1.9 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/Attic/Makefile,v $ #------------------------------------------------------------------------------- @@ -32,6 +32,7 @@ MKDIR = mkdir -p RM = rm -f RMDIR = rm -rf DOXYGEN = doxygen +DOXYTAG = doxytag XSLTPROC = xsltproc ECHO = @echo FLAWFINDER = flawfinder @@ -48,6 +49,12 @@ ETC_DIR = ${BASE_DIR}/etc DOXYGEN_CONFIG = ${ETC_DIR}/doxygen.config +XMLRPCXX_DOC_DIR = ${BASE_DIR}/usr/share/doc/xmlrpc++ +EXTERNAL_DOC_PAGES = ${XMLRPCXX_DOC_DIR}/XmlRpcServerMethod_8h-source.html \ + ${XMLRPCXX_DOC_DIR}/classXmlRpc_1_1XmlRpcServerMethod.html \ + ${XMLRPCXX_DOC_DIR}/classXmlRpc_1_1XmlRpcServerMethod-members.html +TAGFILE = ${DOXYGEN_DIR}/xmlrpc++.tag + TESTRESULTS_XSLT = ${ETC_DIR}/testResultsToHtml.xsl TESTRESULTS_IN = ${ETC_DIR}/testResults.xml TESTRESULTS_FILE = ${DOC_DIR}/testResults.html @@ -86,7 +93,7 @@ SCHEDULER_DIR = ${PRODUCTS_DIR}/scheduler # Targets #------------------------------------------------------------------------------- .PHONY: all doc clean docclean depclean distclean doxygen testresults -.PHONY: setup tools_setup modules_setup products_setup +.PHONY: setup tools_setup doxytag_setup modules_setup products_setup all: printusage @@ -123,7 +130,7 @@ clean: ${RMDIR} ${DOXYGEN_DIR}/html ${RMDIR} ${COVERAGE_DIR}/* -setup: tools_setup modules_setup products_setup +setup: tools_setup doxytag_setup modules_setup products_setup tools_setup: ${BOOST_DIR}/${BOOST_VERSION}/bin/install.sh @@ -134,6 +141,9 @@ tools_setup: ${LCOV_DIR}/${LCOV_VERSION}/bin/install.sh ${HELIX_DIR}/${HELIX_VERSION}/bin/install.sh +doxytag_setup: + ${DOXYTAG} -t ${TAGFILE} ${EXTERNAL_DOC_PAGES} + modules_setup: ${CORE_DIR}/bin/autogen.sh ${DB_DIR}/bin/autogen.sh diff --git a/livesupport/etc/doxygen.config b/livesupport/etc/doxygen.config index 9fd08cb67..533bf1c35 100644 --- a/livesupport/etc/doxygen.config +++ b/livesupport/etc/doxygen.config @@ -20,8 +20,8 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # -# Author : $Author: maroy $ -# Version : $Revision: 1.4 $ +# Author : $Author: fgerlits $ +# Version : $Revision: 1.5 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/etc/doxygen.config,v $ #------------------------------------------------------------------------------- @@ -984,7 +984,8 @@ SKIP_FUNCTION_MACROS = YES # If a tag file is not located in the directory in which doxygen # is run, you must also specify the path to the tagfile here. -TAGFILES = +TAGFILES = \ +./doc/doxygen/xmlrpc++.tag=../../../usr/share/doc/xmlrpc++ # When a file name is specified after GENERATE_TAGFILE, doxygen will create # a tag file that is based on the input files it reads. diff --git a/livesupport/modules/core/include/LiveSupport/Core/StorageClientInterface.h b/livesupport/modules/core/include/LiveSupport/Core/StorageClientInterface.h index 815c44b4f..f2b80bc0b 100644 --- a/livesupport/modules/core/include/LiveSupport/Core/StorageClientInterface.h +++ b/livesupport/modules/core/include/LiveSupport/Core/StorageClientInterface.h @@ -22,7 +22,7 @@ Author : $Author: fgerlits $ - Version : $Revision: 1.12 $ + Version : $Revision: 1.13 $ Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/core/include/LiveSupport/Core/Attic/StorageClientInterface.h,v $ ------------------------------------------------------------------------------*/ @@ -61,7 +61,7 @@ namespace Core { * An interface for storage clients. * * @author $Author: fgerlits $ - * @version $Revision: 1.12 $ + * @version $Revision: 1.13 $ */ class StorageClientInterface { @@ -186,7 +186,7 @@ class StorageClientInterface /** * Release the resource (sound file) used by an audio clip. * - * @param id the id of the audio clip to release. + * @param audioClip the id of the audio clip to release. * @exception std::logic_error if the audio clip has no uri field, * or the file does not exist, etc. */ diff --git a/livesupport/products/scheduler/etc/doxygen.config b/livesupport/products/scheduler/etc/doxygen.config index 62d963815..157e14361 100644 --- a/livesupport/products/scheduler/etc/doxygen.config +++ b/livesupport/products/scheduler/etc/doxygen.config @@ -21,7 +21,7 @@ # # # Author : $Author: fgerlits $ -# Version : $Revision: 1.4 $ +# Version : $Revision: 1.5 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/etc/doxygen.config,v $ #------------------------------------------------------------------------------- @@ -978,7 +978,7 @@ SKIP_FUNCTION_MACROS = YES # is run, you must also specify the path to the tagfile here. TAGFILES = \ -../../usr/share/doc/xmlrpc++/xmlrpc++.tag=../../../../../usr/share/doc/xmlrpc++ +../../doc/doxygen/xmlrpc++.tag=../../../../../usr/share/doc/xmlrpc++ # When a file name is specified after GENERATE_TAGFILE, doxygen will create # a tag file that is based on the input files it reads. diff --git a/livesupport/tools/xmlrpc++/xmlrpc++-20040713/bin/install.sh b/livesupport/tools/xmlrpc++/xmlrpc++-20040713/bin/install.sh index f6f2aa4a6..a03418fd0 100755 --- a/livesupport/tools/xmlrpc++/xmlrpc++-20040713/bin/install.sh +++ b/livesupport/tools/xmlrpc++/xmlrpc++-20040713/bin/install.sh @@ -22,7 +22,7 @@ # # # Author : $Author: fgerlits $ -# Version : $Revision: 1.3 $ +# Version : $Revision: 1.4 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/tools/xmlrpc++/xmlrpc++-20040713/bin/Attic/install.sh,v $ #------------------------------------------------------------------------------- #------------------------------------------------------------------------------- @@ -38,12 +38,6 @@ tmpdir=$basedir/tmp etcdir=$basedir/etc tar=$basedir/src/$product.tar.gz -docdir=$installdir/share/doc/xmlrpc++ -tagfile="xmlrpc++.tag" -external_doc_pages="XmlRpcServerMethod_8h-source.html \ - classXmlRpc_1_1XmlRpcServerMethod.html \ - classXmlRpc_1_1XmlRpcServerMethod-members.html" - echo "installing $product from $basedir to $installdir" mkdir -p $tmpdir @@ -55,9 +49,6 @@ patch -p1 < $etcdir/xmlrpc++-automake.patch patch -p1 < $etcdir/uninitialised_XmlRpcSource_ssl_ssl.patch sh autogen.sh --prefix=$installdir make install - -cd $docdir -doxytag -t $tagfile $external_doc_pages cd $basedir rm -rf tmp