From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 08A8A3858416 for ; Thu, 25 Apr 2024 17:44:36 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 08A8A3858416 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 08A8A3858416 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1714067080; cv=none; b=UzV7Afjqs9uE+Mait6HXCIeW2wYH0nrQ0XoOjYa+oYjSL/OgN1jDfb/qcdEJbbuS0U62MbJ0wFN00Ium+03No/ZpZ/xbVriu7k0CePV205kCXWmmt1zbYa7/S+S4Vo8IhIJ7Be2zH/xL4prLDtQRyWShrSH2eQIlYxA8RE7rDhA= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1714067080; c=relaxed/simple; bh=WJoZk3nOiN3Kx0/E7mwmpk0iC/ilJwqYa3epgTvATkk=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=XnwbMJr20lU92GfVlsXwlDy5eW7RPEG6G4hglq2ArNa8wM9y+6uiPmuhicCUb2Pv5WciGP+9Fm5uFR4ASC5yWF01q073Zde4RmW3KIy1bpwovnlaEiwm1Hwm1b4GqWslIpDrI24ryv05Yh3cwXNp02h2oHiPdAHC/ZONrMiFvx8= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1714067076; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uGSO+/nM/djMbaSt21eebzNRdNwCMpECdpuXBwhHIe0=; b=W5sFFi0HTNZAMDJ3FY6VzcLTp3BVL84cqqkcEU2FJIR3wFTHxNPGUehRbeoywwUlhtpZaQ +lu5W3xG7YhC0HnoO87g/tbyUfXAYfAgercYwlQH//3Vuyl1yW8yiWUqOSXgtXnzUhHeP/ U7l6AIUVqx829o3HRVnGUFVvhGbWnOg= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-400-8hwFupS0OsKkR0RE5TmQdA-1; Thu, 25 Apr 2024 13:44:34 -0400 X-MC-Unique: 8hwFupS0OsKkR0RE5TmQdA-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id AC27C8032FA; Thu, 25 Apr 2024 17:44:33 +0000 (UTC) Received: from localhost (unknown [10.42.28.238]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7B62A1121312; Thu, 25 Apr 2024 17:44:33 +0000 (UTC) From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Fix run_doxygen for Doxygen 1.10 man page format Date: Thu, 25 Apr 2024 18:44:25 +0100 Message-ID: <20240425174432.2559042-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.3 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-12.2 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Tested x86_64-linux, and docs regenerated. Pushed to trunk. -- >8 -- 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. --- 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 -- 2.44.0