From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 1088F3858C5F; Thu, 25 Apr 2024 17:44:01 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1088F3858C5F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1714067041; bh=E+IS5zxGYrkgL4l5XwfilQHim4uWd/V09cmBzVG8jxQ=; h=From:To:Subject:Date:From; b=kSH5mZhSf8MOZroMARaT4+O7nU6qI4q1c5tJDRHEFUY6QDRHh/8tw/JnDoB3kOP9O PNCiMKfjE9j0Cd6BeZ59KhGJngArnz25hU0YPAezhIH18G4SfX4cMewY1lVuyXkNxw 1ILeug5YvIRTbd37Kv+fZ8/fCW7raTuURjqc1W10= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely 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 X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: d5b2c6b32c97e1fd03214771d35f8d67b0d72940 X-Git-Newrev: c9cc1c850c6d084752207b6cf247a0a48bae0d52 Message-Id: <20240425174401.1088F3858C5F@sourceware.org> Date: Thu, 25 Apr 2024 17:44:01 +0000 (GMT) List-Id: https://gcc.gnu.org/g:c9cc1c850c6d084752207b6cf247a0a48bae0d52 commit r14-10127-gc9cc1c850c6d084752207b6cf247a0a48bae0d52 Author: Jonathan Wakely 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 .*/\1/p' $f` + oldh=`sed -n '/f[CR]#include .*/\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