From: Eric Blake Date: Fri, 26 Oct 2012 16:19:56 +0000 (-0600) Subject: maint.mk: let packages tweak sc_po_check pattern X-Git-Tag: v0.1~388 X-Git-Url: http://erislabs.net/gitweb/?p=gnulib.git;a=commitdiff_plain;h=4027785526fce3ec49b4c2b2dcd40df07f8a211d maint.mk: let packages tweak sc_po_check pattern libosinfo wants to look for XML files with translation markers of the form <_name>string to translate. Rather than globally adding this to the regex, I thought it would be easier to make it possible for cfg.mk to override the default pattern. https://www.redhat.com/archives/virt-tools-list/2012-October/msg00270.html * top/maint.mk (sc_po_check): Add translation-markers, to allow finding files with other translation markers. Signed-off-by: Eric Blake --- diff --git a/ChangeLog b/ChangeLog index 32c4c3e7d..a379c32ba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2012-10-26 Eric Blake + + maint.mk: let packages tweak sc_po_check pattern + * top/maint.mk (sc_po_check): Add translation-markers, to allow + finding files with other translation markers. + 2012-10-16 Paul Eggert euidaccess: speed up 'configure' on GNU hosts diff --git a/top/maint.mk b/top/maint.mk index e52deb45d..de7a303d3 100644 --- a/top/maint.mk +++ b/top/maint.mk @@ -1121,9 +1121,11 @@ fix_po_file_diag = \ 'you have changed the set of files with translatable diagnostics;\n\ apply the above patch\n' -# Verify that all source files using _() are listed in po/POTFILES.in. +# Verify that all source files using _() (more specifically, files that +# contain the ERE translation-markers) are listed in po/POTFILES.in. po_file ?= $(srcdir)/po/POTFILES.in generated_files ?= $(srcdir)/lib/*.[ch] +translation-markers ?= \b(N?_|gettext *)\([^)"]*("|$$) sc_po_check: @if test -f $(po_file); then \ grep -E -v '^(#|$$)' $(po_file) \ @@ -1143,7 +1145,7 @@ sc_po_check: esac; \ files="$$files $$file"; \ done; \ - grep -E -l '\b(N?_|gettext *)\([^)"]*("|$$)' $$files \ + grep -E -l '$(translation-markers)' $$files \ | sed 's|^$(_dot_escaped_srcdir)/||' | sort -u > $@-2; \ diff -u -L $(po_file) -L $(po_file) $@-1 $@-2 \ || { printf '$(ME): '$(fix_po_file_diag) 1>&2; exit 1; }; \