aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2022-02-11 23:16:33 +0000
committerJoseph Myers <joseph@codesourcery.com>2022-02-11 23:17:24 +0000
commit434b2caf5d44d58cb48c9588d4b70588f6d5965b (patch)
tree4bb74ad4074cd4c3409acf369f33495d4bb4e919
parent8dc2499aa62f768c6395c9754b8cabc1ce25c494 (diff)
downloadgcc-434b2caf5d44d58cb48c9588d4b70588f6d5965b.zip
gcc-434b2caf5d44d58cb48c9588d4b70588f6d5965b.tar.gz
gcc-434b2caf5d44d58cb48c9588d4b70588f6d5965b.tar.bz2
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.
-rw-r--r--gcc/po/exgettext8
1 files changed, 7 insertions, 1 deletions
diff --git a/gcc/po/exgettext b/gcc/po/exgettext
index a69cdac..95cb0e7 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