From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1105) id 9FE8D385841B; Fri, 11 Feb 2022 23:18:12 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9FE8D385841B MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Joseph Myers To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-7206] i18n: fix exgettext handling of C++ sources X-Act-Checkin: gcc X-Git-Author: Joseph Myers X-Git-Refname: refs/heads/master X-Git-Oldrev: 8dc2499aa62f768c6395c9754b8cabc1ce25c494 X-Git-Newrev: 434b2caf5d44d58cb48c9588d4b70588f6d5965b Message-Id: <20220211231812.9FE8D385841B@sourceware.org> Date: Fri, 11 Feb 2022 23:18:12 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Feb 2022 23:18:12 -0000 https://gcc.gnu.org/g:434b2caf5d44d58cb48c9588d4b70588f6d5965b commit r12-7206-g434b2caf5d44d58cb48c9588d4b70588f6d5965b Author: Joseph Myers Date: Fri Feb 11 23:16:33 2022 +0000 i18n: fix exgettext handling of C++ sources The move of source files to .cc names broke most message extraction by exgettext because it processed .c files with --language=GCC-source but didn't process .cc files that way. Fix to process files identified as C++ that way as well. Tested with "make gcc.pot". * exgettext: Also process C++ sources with --language=GCC-source. Diff: --- gcc/po/exgettext | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gcc/po/exgettext b/gcc/po/exgettext index a69cdacb9bf..95cb0e75554 100644 --- a/gcc/po/exgettext +++ b/gcc/po/exgettext @@ -69,6 +69,7 @@ posrcxx=$pwd/$T/po-cxx-sources pottmp1=$pwd/$T/tmp1.pot pottmp2=$pwd/$T/tmp2.pot pottmp3=$pwd/$T/tmp3.pot +pottmp4=$pwd/$T/tmp4.pot pottmp=$pwd/$T/tmp.pot # Locate files to scan. We scan the following directories: @@ -312,8 +313,13 @@ $xgettext --default-domain=$package --directory=$srcdir \ --copyright-holder="Free Software Foundation, Inc." \ --msgid-bugs-address="$BUGURL" \ --language=GCC-source -o $pottmp3 +$xgettext --default-domain=$package --directory=$srcdir \ + --add-comments --keyword= `cat $kopt2` --files-from=$posrcxx \ + --copyright-holder="Free Software Foundation, Inc." \ + --msgid-bugs-address="$BUGURL" \ + --language=GCC-source -o $pottmp4 $xgettext --default-domain=$package \ - --add-comments $pottmp1 $pottmp2 $pottmp3 \ + --add-comments $pottmp1 $pottmp2 $pottmp3 $pottmp4 \ --copyright-holder="Free Software Foundation, Inc." \ --msgid-bugs-address="$BUGURL" \ --language=PO -o $pottmp