From 6ad90be1df339da1ae65328c738d60e142b13efe Mon Sep 17 00:00:00 2001 From: Perry Ismangil Date: Tue, 19 Jul 2011 21:42:58 +0000 Subject: Re #1254 Doxygen configuration and makefile changes to support version specific documentation git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3669 74dad513-b988-da41-8d7b-12977e46ad98 --- pjnath/build/Makefile | 13 +++++++++---- pjnath/docs/doxygen.cfg | 4 ++-- pjnath/docs/header.html | 2 +- 3 files changed, 12 insertions(+), 7 deletions(-) (limited to 'pjnath') diff --git a/pjnath/build/Makefile b/pjnath/build/Makefile index 46fda2ff..573d9579 100644 --- a/pjnath/build/Makefile +++ b/pjnath/build/Makefile @@ -3,6 +3,7 @@ export PJNATH_TEST_OBJS = main.o include ../../build.mak +include ../../version.mak include $(PJDIR)/build/common.mak RULES_MAK := $(PJDIR)/build/rules.mak @@ -78,10 +79,14 @@ TARGETS := pjnath pjnath-test pjturn-client pjturn-srv all: $(TARGETS) doc: - cd .. && rm -rf docs/html docs/latex && doxygen docs/doxygen.cfg - @if [ -n "$(WWWDIR)" ]; then \ - echo "Copying to $(WWWDIR)/pjnath/docs/html.." ; \ - cp -a ../docs/html/* $(WWWDIR)/pjnath/docs/html/ ; \ + cd .. && rm -rf docs/$(PJ_VERSION) && doxygen docs/doxygen.cfg + @if [ -n "$(WWWDIR)" ] && ! [ -d "$(WWWDIR)/docs/$(PJ_VERSION)/pjnath/docs/html" ] ; then \ + echo "Creating docs/$(PJ_VERSION)/pjnath/docs/html" ; \ + mkdir -p $(WWWDIR)/docs/$(PJ_VERSION)/pjnath/docs/html ; \ + fi + @if [ -n "$(WWWDIR)" ] && [ -d "$(WWWDIR)/docs/$(PJ_VERSION)/pjnath/docs/html" ] ; then \ + echo "Copying docs/$(PJ_VERSION) to $(WWWDIR)/docs/$(PJ_VERSION)/pjnath/docs/html.." ; \ + cp -v -a ../docs/$(PJ_VERSION)/html/* $(WWWDIR)/docs/$(PJ_VERSION)/pjnath/docs/html/ ; \ fi dep: depend diff --git a/pjnath/docs/doxygen.cfg b/pjnath/docs/doxygen.cfg index 9a75d091..70bf6f7e 100644 --- a/pjnath/docs/doxygen.cfg +++ b/pjnath/docs/doxygen.cfg @@ -23,14 +23,14 @@ PROJECT_NAME = "PJNATH Reference" # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = +PROJECT_NUMBER = $(PJ_VERSION) # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. # 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 = docs +OUTPUT_DIRECTORY = docs/$(PJ_VERSION) # The OUTPUT_LANGUAGE tag is used to specify the language in which all # documentation generated by doxygen is written. Doxygen will use this diff --git a/pjnath/docs/header.html b/pjnath/docs/header.html index 40d412d4..4d7e2636 100644 --- a/pjnath/docs/header.html +++ b/pjnath/docs/header.html @@ -1,6 +1,6 @@ -$title +$title ($projectnumber) -- cgit v1.2.3