This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[libstdc++] Work around doxygen problems with tag files


Apparently very few Doxygen developers test with man pages, because nearly
every other Doxygen feature causes hard errors when man pages are turned on.


2003-09-13  Phil Edwards  <phil@codesourcery.com>

	* docs/doxygen/run_doxygen:  Clear GENERATE_TAGFILE entirely
	if man pages are on.
	* docs/doxygen/user.cfg.in:  And here.


Index: docs/doxygen/run_doxygen
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/docs/doxygen/run_doxygen,v
retrieving revision 1.24
diff -u -3 -p -r1.24 run_doxygen
--- docs/doxygen/run_doxygen	27 Aug 2003 02:31:27 -0000	1.24
+++ docs/doxygen/run_doxygen	13 Sep 2003 20:55:35 -0000
@@ -98,6 +98,7 @@ outdir=unset
 do_html=false
 do_man=false
 enabled_sections=
+generate_tagfile=
 DATEtext=`date '+%Y-%m-%d'`
 
 parse_options $*
@@ -110,15 +111,20 @@ if test $srcdir = unset || test $outdir 
 fi
 
 case x"$mode" in
-    xuser)           do_html=true
-                     LEVELtext='User'
-                     ;;
-    xmaint)          do_html=true
-                     enabled_sections=maint
-                     LEVELtext='Maintainer'
-                     ;;
-    xman)            do_man=true
-                     ;;
+    xuser)
+      do_html=true
+      LEVELtext='User'
+      generate_tagfile="$outdir/html_$mode/libstdc++.tag"
+      ;;
+    xmaint)
+      do_html=true
+      enabled_sections=maint
+      LEVELtext='Maintainer'
+      generate_tagfile="$outdir/html_$mode/libstdc++.tag"
+      ;;
+    xman)
+      do_man=true
+      ;;
     *)
       echo run_doxygen error:  $mode is an invalid mode 1>&2
       exit 1 ;;
@@ -143,6 +149,7 @@ fi
       -e "s=@enabled_sections@=${enabled_sections}=" \
       -e "s=@do_html@=${do_html}=" \
       -e "s=@do_man@=${do_man}=" \
+      -e "s=@generate_tagfile@=${generate_tagfile}=" \
       ${srcdir}/docs/doxygen/user.cfg.in > ${outdir}/${mode}.cfg
   echo :: NOTE that this may take some time...
   echo doxygen ${outdir}/${mode}.cfg
Index: docs/doxygen/user.cfg.in
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/docs/doxygen/user.cfg.in,v
retrieving revision 1.27
diff -u -3 -p -r1.27 user.cfg.in
--- docs/doxygen/user.cfg.in	5 Aug 2003 01:20:15 -0000	1.27
+++ docs/doxygen/user.cfg.in	13 Sep 2003 20:55:35 -0000
@@ -902,7 +902,7 @@ TAGFILES               = 
 # When a file name is specified after GENERATE_TAGFILE, doxygen will create 
 # a tag file that is based on the input files it reads.
 
-GENERATE_TAGFILE       = @outdir@/@html_output_dir@/libstdc++.tag
+GENERATE_TAGFILE       = @generate_tagfile@
 
 # If the ALLEXTERNALS tag is set to YES all external classes will be listed 
 # in the class index. If set to NO only the inherited external classes 


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]