]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
libstdc++: Fix run_doxygen for Doxygen 1.10 man page format
authorJonathan Wakely <jwakely@redhat.com>
Thu, 25 Apr 2024 12:24:56 +0000 (13:24 +0100)
committerJonathan Wakely <jwakely@redhat.com>
Tue, 14 May 2024 09:50:49 +0000 (10:50 +0100)
Doxygen switched from \fC to \fR in its man page output:
https://github.com/doxygen/doxygen/pull/10497

This breaks our script that expects \fC so change the regaulr expression
to work with either style.

libstdc++-v3/ChangeLog:

* scripts/run_doxygen: Adjust sed pattern to match '\fR' for
new man output that Doxygen 1.10 generates.

(cherry picked from commit c9cc1c850c6d084752207b6cf247a0a48bae0d52)

libstdc++-v3/scripts/run_doxygen

index 42ed9eb4f5dfa8ed7697f4ac50353133ff6a8e6b..9c11a0cfa1fd1a786ac6d5164cee035d10c5009d 100644 (file)
@@ -294,7 +294,11 @@ $gxx $cppflags $cxxflags ${srcdir}/doc/doxygen/stdheader.cc -o ./stdheader || ex
 problematic=`grep -E -l '#include <.*h>' [a-z]*.3`
 for f in $problematic; do
     # this is also slow, but safe and easy to debug
-    oldh=`sed -n '/fC#include </s/.*<\(.*\)>.*/\1/p' $f`
+    oldh=`sed -n '/f[CR]#include </s/.*<\(.*\)>.*/\1/p' $f`
+    if [ "$oldh" == "" ]; then
+      echo "ERROR: Doxygen man page formatting changed" 2>&1
+      continue
+    fi
     newh=`echo $oldh | sed 's/\\\\&\\././g' | ./stdheader`
     sed "s=${oldh/\\/.}=${newh}=" $f > TEMP && mv TEMP $f
 done