diff options
| author | Perry Ismangil <perry@teluu.com> | 2011-07-22 11:52:50 +0000 |
|---|---|---|
| committer | Perry Ismangil <perry@teluu.com> | 2011-07-22 11:52:50 +0000 |
| commit | dcd416b3403767b56b5bcbc7c1cc03dd5bbf878a (patch) | |
| tree | e500ba85b30b3a076daa5831a068aa7445d2b877 /pjlib | |
| parent | a25a91ecc867db804d45b2c517925eef18e781f6 (diff) | |
Fixed #1336 make doc now creates version specific docs
git-svn-id: http://svn.pjsip.org/repos/pjproject/branches/1.x@3677 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjlib')
| -rw-r--r-- | pjlib/build/Makefile | 14 | ||||
| -rw-r--r-- | pjlib/docs/doxygen.cfg | 4 | ||||
| -rw-r--r-- | pjlib/docs/header.html | 2 |
3 files changed, 12 insertions, 8 deletions
diff --git a/pjlib/build/Makefile b/pjlib/build/Makefile index 6e95003e..91836445 100644 --- a/pjlib/build/Makefile +++ b/pjlib/build/Makefile @@ -1,4 +1,5 @@ include ../../build.mak +include ../../version.mak include $(PJDIR)/build/common.mak RULES_MAK := $(PJDIR)/build/rules.mak @@ -57,12 +58,15 @@ export CC_OUT CC AR RANLIB HOST_MV HOST_RM HOST_RMDIR HOST_MKDIR OBJEXT LD LDOUT all: $(TARGETS) doc: - cd .. && rm -rf docs/html docs/latex && doxygen docs/doxygen.cfg - @if [ -n "$(WWWDIR)" ]; then \ - echo "Copying to $(WWWDIR)/pjlib/docs/html.." ; \ - cp -a ../docs/html/* $(WWWDIR)/pjlib/docs/html/ ; \ + cd .. && rm -rf docs/$(PJ_VERSION) && doxygen docs/doxygen.cfg + @if [ -n "$(WWWDIR)" ] && ! [ -d "$(WWWDIR)/docs/$(PJ_VERSION)/pjlib/docs/html" ] ; then \ + echo "Creating docs/$(PJ_VERSION)/pjlib/docs/html" ; \ + mkdir -p $(WWWDIR)/docs/$(PJ_VERSION)/pjlib/docs/html ; \ + fi + @if [ -n "$(WWWDIR)" ] && [ -d "$(WWWDIR)/docs/$(PJ_VERSION)/pjlib/docs/html" ] ; then \ + echo "Copying docs/$(PJ_VERSION) to $(WWWDIR)/docs/$(PJ_VERSION)/pjlib/docs/html.." ; \ + cp -v -a ../docs/$(PJ_VERSION)/html/* $(WWWDIR)/docs/$(PJ_VERSION)/pjlib/docs/html/ ; \ fi - print: $(MAKE) -f $(RULES_MAK) APP=PJLIB app=pjlib print_lib $(MAKE) -f $(RULES_MAK) APP=TEST app=pjlib-test print_bin diff --git a/pjlib/docs/doxygen.cfg b/pjlib/docs/doxygen.cfg index 6b6a8d3e..88a032d8 100644 --- a/pjlib/docs/doxygen.cfg +++ b/pjlib/docs/doxygen.cfg @@ -23,14 +23,14 @@ PROJECT_NAME = "PJLIB 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/pjlib/docs/header.html b/pjlib/docs/header.html index 5517dc34..60db3f71 100644 --- a/pjlib/docs/header.html +++ b/pjlib/docs/header.html @@ -1,6 +1,6 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1">
-<title>$title</title>
+<title>$title ($projectnumber)</title>
<link href="/style/style.css" rel="stylesheet" type="text/css">
</head><body>
<!--#include virtual="/header.html" -->
|