Changeset 3677


Ignore:
Timestamp:
Jul 22, 2011 11:52:50 AM (8 years ago)
Author:
ismangil
Message:

Fixed #1336 make doc now creates version specific docs

Location:
pjproject/branches/1.x
Files:
17 edited

Legend:

Unmodified
Added
Removed
  • pjproject/branches/1.x

  • pjproject/branches/1.x/Makefile

    r3351 r3677  
    22include build/host-$(HOST_NAME).mak 
    33-include user.mak 
     4include version.mak 
    45 
    56DIRS = pjlib/build pjlib-util/build pjnath/build third_party/build pjmedia/build pjsip/build pjsip-apps/build $(EXTRA_DIRS) 
     
    2425        fi 
    2526        for dir in $(DIRS); do \ 
    26                 if $(MAKE) $(MAKE_FLAGS) -C $$dir/build $@; then \ 
     27                if $(MAKE) $(MAKE_FLAGS) -C $$dir $@; then \ 
    2728                    true; \ 
    2829                else \ 
     
    9394 
    9495prefix = $(ac_prefix) 
    95 include version.mak 
    9696 
    9797install: 
  • pjproject/branches/1.x/pjlib-util/build/Makefile

    r3319 r3677  
    44 
    55include ../../build.mak 
     6include ../../version.mak 
    67include $(PJDIR)/build/common.mak 
    78 
     
    5657 
    5758doc: 
    58         cd .. && rm -rf docs/html docs/latex && doxygen docs/doxygen.cfg 
    59         @if [ -n "$(WWWDIR)" ]; then \ 
    60                 echo "Copying to $(WWWDIR)/pjlib-util/docs/html.." ; \ 
    61                 cp -a ../docs/html/* $(WWWDIR)/pjlib-util/docs/html/ ; \ 
     59        cd .. && rm -rf docs/$(PJ_VERSION) && doxygen docs/doxygen.cfg 
     60        @if [ -n "$(WWWDIR)" ] && ! [ -d "$(WWWDIR)/docs/$(PJ_VERSION)/pjlib-util/docs/html" ] ; then \ 
     61                echo "Creating docs/$(PJ_VERSION)/pjlib-util/docs/html" ; \ 
     62                mkdir -p $(WWWDIR)/docs/$(PJ_VERSION)/pjlib-util/docs/html ; \ 
     63        fi  
     64        @if [ -n "$(WWWDIR)" ] && [ -d "$(WWWDIR)/docs/$(PJ_VERSION)/pjlib-util/docs/html" ] ; then \ 
     65                echo "Copying docs/$(PJ_VERSION) to $(WWWDIR)/docs/$(PJ_VERSION)/pjlib-util/docs/html.." ; \ 
     66                cp -v -a ../docs/$(PJ_VERSION)/html/* $(WWWDIR)/docs/$(PJ_VERSION)/pjlib-util/docs/html/ ; \ 
    6267        fi 
    6368 
  • pjproject/branches/1.x/pjlib-util/docs/doxygen.cfg

    r2037 r3677  
    2424# if some version control system is used. 
    2525 
    26 PROJECT_NUMBER         =  
     26PROJECT_NUMBER         = $(PJ_VERSION) 
    2727 
    2828# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)  
     
    3131# where doxygen was started. If left blank the current directory will be used. 
    3232 
    33 OUTPUT_DIRECTORY       = docs 
     33OUTPUT_DIRECTORY       = docs/$(PJ_VERSION) 
    3434 
    3535# The OUTPUT_LANGUAGE tag is used to specify the language in which all  
  • pjproject/branches/1.x/pjlib-util/docs/header.html

    r755 r3677  
    11<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> 
    22<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1"> 
    3 <title>$title</title> 
     3<title>$title ($projectnumber)</title> 
    44<link href="/style/style.css" rel="stylesheet" type="text/css"> 
    55</head><body> 
  • pjproject/branches/1.x/pjlib/build/Makefile

    r3423 r3677  
    11include ../../build.mak 
     2include ../../version.mak 
    23include $(PJDIR)/build/common.mak 
    34 
     
    5859 
    5960doc: 
    60         cd .. && rm -rf docs/html docs/latex && doxygen docs/doxygen.cfg 
    61         @if [ -n "$(WWWDIR)" ]; then \ 
    62                 echo "Copying to $(WWWDIR)/pjlib/docs/html.." ; \ 
    63                 cp -a ../docs/html/* $(WWWDIR)/pjlib/docs/html/ ; \ 
     61        cd .. && rm -rf docs/$(PJ_VERSION) && doxygen docs/doxygen.cfg 
     62        @if [ -n "$(WWWDIR)" ] && ! [ -d "$(WWWDIR)/docs/$(PJ_VERSION)/pjlib/docs/html" ] ; then \ 
     63                echo "Creating docs/$(PJ_VERSION)/pjlib/docs/html" ; \ 
     64                mkdir -p $(WWWDIR)/docs/$(PJ_VERSION)/pjlib/docs/html ; \ 
     65        fi  
     66        @if [ -n "$(WWWDIR)" ] && [ -d "$(WWWDIR)/docs/$(PJ_VERSION)/pjlib/docs/html" ] ; then \ 
     67                echo "Copying docs/$(PJ_VERSION) to $(WWWDIR)/docs/$(PJ_VERSION)/pjlib/docs/html.." ; \ 
     68                cp -v -a ../docs/$(PJ_VERSION)/html/* $(WWWDIR)/docs/$(PJ_VERSION)/pjlib/docs/html/ ; \ 
    6469        fi 
    65  
    6670print: 
    6771        $(MAKE) -f $(RULES_MAK) APP=PJLIB app=pjlib print_lib 
  • pjproject/branches/1.x/pjlib/docs/doxygen.cfg

    r2037 r3677  
    2424# if some version control system is used. 
    2525 
    26 PROJECT_NUMBER         =  
     26PROJECT_NUMBER         = $(PJ_VERSION) 
    2727 
    2828# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)  
     
    3131# where doxygen was started. If left blank the current directory will be used. 
    3232 
    33 OUTPUT_DIRECTORY       = docs 
     33OUTPUT_DIRECTORY       = docs/$(PJ_VERSION) 
    3434 
    3535# The OUTPUT_LANGUAGE tag is used to specify the language in which all  
  • pjproject/branches/1.x/pjlib/docs/header.html

    r690 r3677  
    11<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> 
    22<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1"> 
    3 <title>$title</title> 
     3<title>$title ($projectnumber)</title> 
    44<link href="/style/style.css" rel="stylesheet" type="text/css"> 
    55</head><body> 
  • pjproject/branches/1.x/pjmedia/build/Makefile

    r3319 r3677  
    11include ../../build.mak 
     2include ../../version.mak 
    23 
    34THIRD_PARTY:=$(PJDIR)/third_party 
     
    123124 
    124125doc: 
    125         cd .. && rm -rf docs/html docs/latex && doxygen docs/doxygen.cfg 
    126         @if [ -n "$(WWWDIR)" ]; then \ 
    127                 echo "Copying to $(WWWDIR)/pjmedia/docs/html.." ; \ 
    128                 rm -rf $(WWWDIR)/pjmedia/docs/html/* ; \ 
    129                 cp -a ../docs/html/* $(WWWDIR)/pjmedia/docs/html/ ; \ 
     126        cd .. && rm -rf docs/$(PJ_VERSION) && doxygen docs/doxygen.cfg 
     127        @if [ -n "$(WWWDIR)" ] && ! [ -d "$(WWWDIR)/docs/$(PJ_VERSION)/pjmedia/docs/html" ] ; then \ 
     128                echo "Creating docs/$(PJ_VERSION)/pjmedia/docs/html" ; \ 
     129                mkdir -p $(WWWDIR)/docs/$(PJ_VERSION)/pjmedia/docs/html ; \ 
     130        fi  
     131        @if [ -n "$(WWWDIR)" ] && [ -d "$(WWWDIR)/docs/$(PJ_VERSION)/pjmedia/docs/html" ] ; then \ 
     132                echo "Copying docs/$(PJ_VERSION) to $(WWWDIR)/docs/$(PJ_VERSION)/pjmedia/docs/html.." ; \ 
     133                cp -v -a ../docs/$(PJ_VERSION)/html/* $(WWWDIR)/docs/$(PJ_VERSION)/pjmedia/docs/html/ ; \ 
    130134        fi 
    131135 
  • pjproject/branches/1.x/pjmedia/docs/doxygen.cfg

    r3313 r3677  
    2424# if some version control system is used. 
    2525 
    26 PROJECT_NUMBER         =  
     26PROJECT_NUMBER         = $(PJ_VERSION) 
    2727 
    2828# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)  
     
    3131# where doxygen was started. If left blank the current directory will be used. 
    3232 
    33 OUTPUT_DIRECTORY       = docs 
     33OUTPUT_DIRECTORY       = docs/$(PJ_VERSION) 
    3434 
    3535# The OUTPUT_LANGUAGE tag is used to specify the language in which all  
  • pjproject/branches/1.x/pjmedia/docs/header.html

    r690 r3677  
    11<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> 
    22<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1"> 
    3 <title>$title</title> 
     3<title>$title ($projectnumber)</title> 
    44<link href="/style/style.css" rel="stylesheet" type="text/css"> 
    55</head><body> 
  • pjproject/branches/1.x/pjnath/build/Makefile

    r3319 r3677  
    44 
    55include ../../build.mak 
     6include ../../version.mak 
    67include $(PJDIR)/build/common.mak 
    78 
     
    7980 
    8081doc: 
    81         cd .. && rm -rf docs/html docs/latex && doxygen docs/doxygen.cfg 
    82         @if [ -n "$(WWWDIR)" ]; then \ 
    83                 echo "Copying to $(WWWDIR)/pjnath/docs/html.." ; \ 
    84                 cp -a ../docs/html/* $(WWWDIR)/pjnath/docs/html/ ; \ 
     82        cd .. && rm -rf docs/$(PJ_VERSION) && doxygen docs/doxygen.cfg 
     83        @if [ -n "$(WWWDIR)" ] && ! [ -d "$(WWWDIR)/docs/$(PJ_VERSION)/pjnath/docs/html" ] ; then \ 
     84                echo "Creating docs/$(PJ_VERSION)/pjnath/docs/html" ; \ 
     85                mkdir -p $(WWWDIR)/docs/$(PJ_VERSION)/pjnath/docs/html ; \ 
     86        fi  
     87        @if [ -n "$(WWWDIR)" ] && [ -d "$(WWWDIR)/docs/$(PJ_VERSION)/pjnath/docs/html" ] ; then \ 
     88                echo "Copying docs/$(PJ_VERSION) to $(WWWDIR)/docs/$(PJ_VERSION)/pjnath/docs/html.." ; \ 
     89                cp -v -a ../docs/$(PJ_VERSION)/html/* $(WWWDIR)/docs/$(PJ_VERSION)/pjnath/docs/html/ ; \ 
    8590        fi 
    8691 
  • pjproject/branches/1.x/pjnath/docs/doxygen.cfg

    r2642 r3677  
    2424# if some version control system is used. 
    2525 
    26 PROJECT_NUMBER         =  
     26PROJECT_NUMBER         = $(PJ_VERSION) 
    2727 
    2828# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)  
     
    3131# where doxygen was started. If left blank the current directory will be used. 
    3232 
    33 OUTPUT_DIRECTORY       = docs 
     33OUTPUT_DIRECTORY       = docs/$(PJ_VERSION) 
    3434 
    3535# The OUTPUT_LANGUAGE tag is used to specify the language in which all  
  • pjproject/branches/1.x/pjnath/docs/header.html

    r2642 r3677  
    11<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> 
    22<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1"> 
    3 <title>$title</title> 
     3<title>$title ($projectnumber)</title> 
    44<link href="/style/style.css" rel="stylesheet" type="text/css"> 
    55</head><body> 
  • pjproject/branches/1.x/pjsip/build/Makefile

    r3319 r3677  
    55 
    66include ../../build.mak 
     7include ../../version.mak 
    78include $(PJDIR)/build/common.mak 
    89 
     
    110111 
    111112doc: 
    112         cd .. && rm -rf docs/html docs/latex && doxygen docs/doxygen.cfg 
    113         @if [ -n "$(WWWDIR)" ]; then \ 
    114                 echo "Copying to $(WWWDIR)/pjsip/docs/html.." ; \ 
    115                 cp -a ../docs/html/* $(WWWDIR)/pjsip/docs/html/ ; \ 
     113        cd .. && rm -rf docs/$(PJ_VERSION) && doxygen docs/doxygen.cfg 
     114        @if [ -n "$(WWWDIR)" ] && ! [ -d "$(WWWDIR)/docs/$(PJ_VERSION)/pjsip/docs/html" ] ; then \ 
     115                echo "Creating docs/$(PJ_VERSION)/pjsip/docs/html" ; \ 
     116                mkdir -p $(WWWDIR)/docs/$(PJ_VERSION)/pjsip/docs/html ; \ 
     117        fi  
     118        @if [ -n "$(WWWDIR)" ] && [ -d "$(WWWDIR)/docs/$(PJ_VERSION)/pjsip/docs/html" ] ; then \ 
     119                echo "Copying docs/$(PJ_VERSION) to $(WWWDIR)/docs/$(PJ_VERSION)/pjsip/docs/html.." ; \ 
     120                cp -v -a ../docs/$(PJ_VERSION)/html/* $(WWWDIR)/docs/$(PJ_VERSION)/pjsip/docs/html/ ; \ 
    116121        fi 
    117122 
  • pjproject/branches/1.x/pjsip/docs/doxygen.cfg

    r3313 r3677  
    2424# if some version control system is used. 
    2525 
    26 PROJECT_NUMBER         =  
     26PROJECT_NUMBER         = $(PJ_VERSION) 
    2727 
    2828# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)  
     
    3131# where doxygen was started. If left blank the current directory will be used. 
    3232 
    33 OUTPUT_DIRECTORY       = docs 
     33OUTPUT_DIRECTORY       = docs/$(PJ_VERSION) 
    3434 
    3535# The OUTPUT_LANGUAGE tag is used to specify the language in which all  
  • pjproject/branches/1.x/pjsip/docs/header.html

    r690 r3677  
    11<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> 
    22<html><head><meta http-equiv="Content-Type" content="text/html;charset=iso-8859-1"> 
    3 <title>$title</title> 
     3<title>$title ($projectnumber)</title> 
    44<link href="/style/style.css" rel="stylesheet" type="text/css"> 
    55</head><body> 
Note: See TracChangeset for help on using the changeset viewer.