public inbox for libstdc++-cvs@sourceware.org
help / color / mirror / Atom feed
From: Jonathan Wakely <redi@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org
Subject: [gcc r14-10127] libstdc++: Fix run_doxygen for Doxygen 1.10 man page format
Date: Thu, 25 Apr 2024 17:44:01 +0000 (GMT)	[thread overview]
Message-ID: <20240425174401.1088F3858C5F@sourceware.org> (raw)

https://gcc.gnu.org/g:c9cc1c850c6d084752207b6cf247a0a48bae0d52

commit r14-10127-gc9cc1c850c6d084752207b6cf247a0a48bae0d52
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Thu Apr 25 13:24:56 2024 +0100

    libstdc++: Fix run_doxygen for Doxygen 1.10 man page format
    
    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.

Diff:
---
 libstdc++-v3/scripts/run_doxygen | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/libstdc++-v3/scripts/run_doxygen b/libstdc++-v3/scripts/run_doxygen
index fbd601b11cc..ea9bcb56553 100644
--- a/libstdc++-v3/scripts/run_doxygen
+++ b/libstdc++-v3/scripts/run_doxygen
@@ -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

                 reply	other threads:[~2024-04-25 17:44 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240425174401.1088F3858C5F@sourceware.org \
    --to=redi@gcc.gnu.org \
    --cc=gcc-cvs@gcc.gnu.org \
    --cc=libstdc++-cvs@gcc.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).