run_doxygen: Add --build_alias option, substitute it in docs/doxygen/user.cfg.in.
2004-11-13 Matthias Klose <doko@debian.org> * docs/doxygen/run_doxygen: Add --build_alias option, substitute it in docs/doxygen/user.cfg.in. * docs/doxygen/user.cfg.in: Use build_alias. * Makefile.am: Pass --build_alias to run_doxygen * Makefile.in: Regenerate. From-SVN: r90694
This commit is contained in:
parent
35d7f8f422
commit
3ebf2ebafe
|
@ -1,3 +1,11 @@
|
|||
2004-11-15 Matthias Klose <doko@debian.org>
|
||||
|
||||
* docs/doxygen/run_doxygen: Add --build_alias option,
|
||||
substitute it in docs/doxygen/user.cfg.in.
|
||||
* docs/doxygen/user.cfg.in: Use build_alias.
|
||||
* Makefile.am: Pass --build_alias to run_doxygen
|
||||
* Makefile.in: Regenerate.
|
||||
|
||||
2004-11-15 Benjamin Kosnik <bkoz@redhat.com>
|
||||
|
||||
* testsuite/testsuite_abi.cc (check_version): Add GLIBCXX_3.4.4.
|
||||
|
|
|
@ -35,18 +35,21 @@ doxygen:
|
|||
-(srcdir=`cd ${top_srcdir}; ${PWD_COMMAND}`; \
|
||||
builddir=`${PWD_COMMAND}`; \
|
||||
${SHELL} ${srcdir}/docs/doxygen/run_doxygen \
|
||||
--build_alias=$(build_alias) \
|
||||
--mode=user $${srcdir} $${builddir})
|
||||
|
||||
doxygen-maint:
|
||||
-(srcdir=`cd ${top_srcdir}; ${PWD_COMMAND}`; \
|
||||
builddir=`${PWD_COMMAND}`; \
|
||||
${SHELL} ${srcdir}/docs/doxygen/run_doxygen \
|
||||
--build_alias=$(build_alias) \
|
||||
--mode=maint $${srcdir} $${builddir})
|
||||
|
||||
doxygen-man:
|
||||
-(srcdir=`cd ${top_srcdir}; ${PWD_COMMAND}`; \
|
||||
builddir=`${PWD_COMMAND}`; \
|
||||
${SHELL} ${srcdir}/docs/doxygen/run_doxygen \
|
||||
--build_alias=$(build_alias) \
|
||||
--mode=man $${srcdir} $${builddir})
|
||||
|
||||
.PHONY: doxygen doxygen-maint doxygen-man
|
||||
|
|
|
@ -746,18 +746,21 @@ doxygen:
|
|||
-(srcdir=`cd ${top_srcdir}; ${PWD_COMMAND}`; \
|
||||
builddir=`${PWD_COMMAND}`; \
|
||||
${SHELL} ${srcdir}/docs/doxygen/run_doxygen \
|
||||
--build_alias=$(build_alias) \
|
||||
--mode=user $${srcdir} $${builddir})
|
||||
|
||||
doxygen-maint:
|
||||
-(srcdir=`cd ${top_srcdir}; ${PWD_COMMAND}`; \
|
||||
builddir=`${PWD_COMMAND}`; \
|
||||
${SHELL} ${srcdir}/docs/doxygen/run_doxygen \
|
||||
--build_alias=$(build_alias) \
|
||||
--mode=maint $${srcdir} $${builddir})
|
||||
|
||||
doxygen-man:
|
||||
-(srcdir=`cd ${top_srcdir}; ${PWD_COMMAND}`; \
|
||||
builddir=`${PWD_COMMAND}`; \
|
||||
${SHELL} ${srcdir}/docs/doxygen/run_doxygen \
|
||||
--build_alias=$(build_alias) \
|
||||
--mode=man $${srcdir} $${builddir})
|
||||
|
||||
.PHONY: doxygen doxygen-maint doxygen-man
|
||||
|
|
|
@ -1,15 +1,16 @@
|
|||
#!/bin/bash
|
||||
|
||||
# Runs doxygen and massages the output files.
|
||||
# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
|
||||
# Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
|
||||
#
|
||||
# Synopsis: run_doxygen --mode=[user|maint|man] v3srcdir v3builddir
|
||||
# Synopsis: run_doxygen --mode=[user|maint|man] --build_alias=<alias> \
|
||||
# v3srcdir v3builddir
|
||||
#
|
||||
# Originally hacked together by Phil Edwards <pme@gcc.gnu.org>
|
||||
|
||||
|
||||
# We can check now that the version of doxygen is >= this variable.
|
||||
DOXYVER=1.3.7
|
||||
DOXYVER=1.3.9
|
||||
|
||||
find_doxygen() {
|
||||
local -r v_required=`echo $DOXYVER | \
|
||||
|
@ -43,13 +44,16 @@ find_doxygen() {
|
|||
|
||||
print_usage() {
|
||||
cat 1>&2 <<EOF
|
||||
Usage: run_doxygen --mode=MODE [<options>] <v3-src-dir> <v3-build-dir>
|
||||
Usage: run_doxygen --mode=MODE --build_alias=BUILD_ALIAS [<options>]
|
||||
<v3-src-dir> <v3-build-dir>
|
||||
MODE is one of:
|
||||
user Generate user-level HTML library documentation.
|
||||
maint Generate maintainers' HTML documentation (lots more;
|
||||
exposes non-public members, etc).
|
||||
man Generate user-level man pages.
|
||||
|
||||
BUILD_ALIAS is the GCC build alias set at configure time.
|
||||
|
||||
more options when i think of them
|
||||
|
||||
Note: Requires Doxygen ${DOXYVER} or later; get it at
|
||||
|
@ -72,7 +76,9 @@ parse_options() {
|
|||
case "$o" in
|
||||
--mode=*)
|
||||
mode=$arg ;;
|
||||
--mode | --help | -h)
|
||||
--build_alias=*)
|
||||
build_alias=$arg ;;
|
||||
--mode | --build_alias | --help | -h)
|
||||
print_usage ;;
|
||||
*)
|
||||
# this turned out to be a mess, maybe change to --srcdir=, etc
|
||||
|
@ -93,6 +99,7 @@ parse_options() {
|
|||
|
||||
# script begins here
|
||||
mode=unset
|
||||
build_alias=unset
|
||||
srcdir=unset
|
||||
outdir=unset
|
||||
do_html=false
|
||||
|
@ -104,7 +111,7 @@ DATEtext=`date '+%Y-%m-%d'`
|
|||
parse_options $*
|
||||
find_doxygen
|
||||
|
||||
if test $srcdir = unset || test $outdir = unset || test $mode = unset; then
|
||||
if test $srcdir = unset || test $outdir = unset || test $mode = unset || test $build_alias = unset; then
|
||||
# this could be better
|
||||
echo run_doxygen error: You have not given enough information...! 1>&2
|
||||
print_usage
|
||||
|
@ -145,6 +152,7 @@ fi
|
|||
cd $builddir
|
||||
sed -e "s=@outdir@=${outdir}=g" \
|
||||
-e "s=@srcdir@=${srcdir}=g" \
|
||||
-e "s=@build_alias@=${build_alias}=g" \
|
||||
-e "s=@html_output_dir@=html_${mode}=" \
|
||||
-e "s=@enabled_sections@=${enabled_sections}=" \
|
||||
-e "s=@do_html@=${do_html}=" \
|
||||
|
|
|
@ -113,7 +113,7 @@ INPUT = @srcdir@/docs/doxygen/doxygroups.cc \
|
|||
include/ext/slist \
|
||||
include/tr1/array \
|
||||
include/tr1/tuple \
|
||||
include/i686-pc-linux-gnu/bits
|
||||
include/@build_alias@/bits
|
||||
FILE_PATTERNS = *.h \
|
||||
*.tcc
|
||||
RECURSIVE = NO
|
||||
|
@ -254,7 +254,7 @@ PERL_PATH = /usr/bin/perl
|
|||
#---------------------------------------------------------------------------
|
||||
CLASS_DIAGRAMS = YES
|
||||
HIDE_UNDOC_RELATIONS = YES
|
||||
HAVE_DOT = NO
|
||||
HAVE_DOT = YES
|
||||
CLASS_GRAPH = YES
|
||||
COLLABORATION_GRAPH = YES
|
||||
UML_LOOK = NO
|
||||
|
|
Loading…
Reference in New Issue