[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[5300] Update to gettext 0.18.3.
|
From: |
Patrice Dumas |
|
Subject: |
[5300] Update to gettext 0.18.3. |
|
Date: |
Sun, 11 Aug 2013 11:43:28 +0000 |
Revision: 5300
http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5300
Author: pertusus
Date: 2013-08-11 11:43:27 +0000 (Sun, 11 Aug 2013)
Log Message:
-----------
Update to gettext 0.18.3.
Disable tests that lead to warnings with perl 5.12.
texi2html.pl:
Do not look at system directories for htmlxref.cnf when doing
tests.
Do not set T2H_DEBUG everytime DUMP_TEXI is set.
test/many_input_files: improve tex related tests, but also disable
them since they are not reproducible.
Modified Paths:
--------------
trunk/texi2html/configure.ac
trunk/texi2html/po_document/Makefile.in.in
trunk/texi2html/po_document/Makevars.template
trunk/texi2html/po_document/Rules-quot
trunk/texi2html/po_messages/Makefile.in.in
trunk/texi2html/po_messages/Makevars.template
trunk/texi2html/po_messages/Rules-quot
trunk/texi2html/test/encodings/tests.txt
trunk/texi2html/test/many_input_files/Makefile.am
trunk/texi2html/test/many_input_files/tex_l2h.sh
trunk/texi2html/test/many_input_files/tex_t4ht.sh
trunk/texi2html/texi2html.pl
Modified: trunk/texi2html/configure.ac
===================================================================
--- trunk/texi2html/configure.ac 2013-08-11 10:51:17 UTC (rev 5299)
+++ trunk/texi2html/configure.ac 2013-08-11 11:43:27 UTC (rev 5300)
@@ -13,8 +13,8 @@
AM_GNU_GETTEXT([external])
dnl it is not completly clear that we need that or not, since gettext is
-dnl not fully used. Set to 0.18.1 to match the version in texinfo.
-AM_GNU_GETTEXT_VERSION([0.18.1])
+dnl not fully used. Set to whatever gettextize inserts.
+AM_GNU_GETTEXT_VERSION([0.18.3])
dnl Misc variable settings
PACKAGE_DATE=`${SHELL} "$srcdir"/mdate-sh "$srcdir"/configure.ac`
Modified: trunk/texi2html/po_document/Makefile.in.in
===================================================================
--- trunk/texi2html/po_document/Makefile.in.in 2013-08-11 10:51:17 UTC (rev
5299)
+++ trunk/texi2html/po_document/Makefile.in.in 2013-08-11 11:43:27 UTC (rev
5300)
@@ -8,13 +8,14 @@
# Please note that the actual code of GNU gettext is covered by the GNU
# General Public License and is *not* in the public domain.
#
-# Origin: gettext-0.18
+# Origin: gettext-0.18.3
GETTEXT_MACRO_VERSION = 0.18
PACKAGE = @PACKAGE@
VERSION = @VERSION@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+SED = @SED@
SHELL = /bin/sh
@SET_MAKE@
@@ -96,14 +97,14 @@
mv t-$@ $@
-all: check-macro-version address@hidden@
+all: address@hidden@
all-yes: stamp-po
all-no:
# Ensure that the gettext macros and this Makefile.in.in are in sync.
-check-macro-version:
- @test "$(GETTEXT_MACRO_VERSION)" = "@GETTEXT_MACRO_VERSION@" \
+CHECK_MACRO_VERSION = \
+ test "$(GETTEXT_MACRO_VERSION)" = "@GETTEXT_MACRO_VERSION@" \
|| { echo "*** error: gettext infrastructure mismatch: using a
Makefile.in.in from gettext version $(GETTEXT_MACRO_VERSION) but the autoconf
macros are from gettext version @GETTEXT_MACRO_VERSION@" 1>&2; \
exit 1; \
}
@@ -123,6 +124,7 @@
# $(POFILES) has been designed to not touch files that don't need to be
# changed.
stamp-po: $(srcdir)/$(DOMAIN).pot
+ @$(CHECK_MACRO_VERSION)
test ! -f $(srcdir)/$(DOMAIN).pot || \
test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES)
@test ! -f $(srcdir)/$(DOMAIN).pot || { \
@@ -137,8 +139,16 @@
# This target rebuilds $(DOMAIN).pot; it is an expensive operation.
# Note that $(DOMAIN).pot is not touched if it doesn't need to be changed.
+# The determination of whether the package xyz is a GNU one is based on the
+# heuristic whether some file in the top level directory mentions "GNU xyz".
+# If GNU 'find' is available, we avoid grepping through monster files.
$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
- if LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null | grep -v
'libtool:' >/dev/null; then \
+ if { if (LC_ALL=C find --version) 2>/dev/null | grep GNU >/dev/null;
then \
+ LC_ALL=C find -L $(top_srcdir) -maxdepth 1 -type f -size
-10000000c -exec grep 'GNU @PACKAGE@' /dev/null '{}' ';' 2>/dev/null; \
+ else \
+ LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null; \
+ fi; \
+ } | grep -v 'libtool:' >/dev/null; then \
package_gnu='GNU '; \
else \
package_gnu=''; \
Modified: trunk/texi2html/po_document/Makevars.template
===================================================================
--- trunk/texi2html/po_document/Makevars.template 2013-08-11 10:51:17 UTC
(rev 5299)
+++ trunk/texi2html/po_document/Makevars.template 2013-08-11 11:43:27 UTC
(rev 5300)
@@ -39,3 +39,15 @@
# This is the list of locale categories, beyond LC_MESSAGES, for which the
# message catalogs shall be used. It is usually empty.
EXTRA_LOCALE_CATEGORIES =
+
+# This tells whether the $(DOMAIN).pot file contains messages with an 'msgctxt'
+# context. Possible values are "yes" and "no". Set this to yes if the
+# package uses functions taking also a message context, like pgettext(), or
+# if in $(XGETTEXT_OPTIONS) you define keywords with a context argument.
+USE_MSGCTXT = no
+
+# These options get passed to msgmerge.
+# Useful options are in particular:
+# --previous to keep previous msgids of translated messages,
+# --quiet to reduce the verbosity.
+MSGMERGE_OPTIONS =
Modified: trunk/texi2html/po_document/Rules-quot
===================================================================
--- trunk/texi2html/po_document/Rules-quot 2013-08-11 10:51:17 UTC (rev
5299)
+++ trunk/texi2html/po_document/Rules-quot 2013-08-11 11:43:27 UTC (rev
5300)
@@ -14,13 +14,13 @@
.insert-header.po-update-en:
@lang=`echo $@ | sed -e 's/\.po-update-en$$//'`; \
- if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH;
GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \
+ if test "$(PACKAGE)" = "gettext-tools"; then PATH=`pwd`/../src:$$PATH;
GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \
tmpdir=`pwd`; \
echo "$$lang:"; \
ll=`echo $$lang | sed -e 's/@.*//'`; \
LC_ALL=C; export LC_ALL; \
cd $(srcdir); \
- if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$lang -o -
2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 |
$(MSGFILTER) sed -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null >
$$tmpdir/$$lang.new.po; then \
+ if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$lang -o -
2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 |
$(MSGFILTER) $(SED) -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null >
$$tmpdir/$$lang.new.po; then \
if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
rm -f $$tmpdir/$$lang.new.po; \
else \
Modified: trunk/texi2html/po_messages/Makefile.in.in
===================================================================
--- trunk/texi2html/po_messages/Makefile.in.in 2013-08-11 10:51:17 UTC (rev
5299)
+++ trunk/texi2html/po_messages/Makefile.in.in 2013-08-11 11:43:27 UTC (rev
5300)
@@ -8,13 +8,14 @@
# Please note that the actual code of GNU gettext is covered by the GNU
# General Public License and is *not* in the public domain.
#
-# Origin: gettext-0.18
+# Origin: gettext-0.18.3
GETTEXT_MACRO_VERSION = 0.18
PACKAGE = @PACKAGE@
VERSION = @VERSION@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+SED = @SED@
SHELL = /bin/sh
@SET_MAKE@
@@ -96,14 +97,14 @@
mv t-$@ $@
-all: check-macro-version address@hidden@
+all: address@hidden@
all-yes: stamp-po
all-no:
# Ensure that the gettext macros and this Makefile.in.in are in sync.
-check-macro-version:
- @test "$(GETTEXT_MACRO_VERSION)" = "@GETTEXT_MACRO_VERSION@" \
+CHECK_MACRO_VERSION = \
+ test "$(GETTEXT_MACRO_VERSION)" = "@GETTEXT_MACRO_VERSION@" \
|| { echo "*** error: gettext infrastructure mismatch: using a
Makefile.in.in from gettext version $(GETTEXT_MACRO_VERSION) but the autoconf
macros are from gettext version @GETTEXT_MACRO_VERSION@" 1>&2; \
exit 1; \
}
@@ -123,6 +124,7 @@
# $(POFILES) has been designed to not touch files that don't need to be
# changed.
stamp-po: $(srcdir)/$(DOMAIN).pot
+ @$(CHECK_MACRO_VERSION)
test ! -f $(srcdir)/$(DOMAIN).pot || \
test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES)
@test ! -f $(srcdir)/$(DOMAIN).pot || { \
@@ -137,8 +139,16 @@
# This target rebuilds $(DOMAIN).pot; it is an expensive operation.
# Note that $(DOMAIN).pot is not touched if it doesn't need to be changed.
+# The determination of whether the package xyz is a GNU one is based on the
+# heuristic whether some file in the top level directory mentions "GNU xyz".
+# If GNU 'find' is available, we avoid grepping through monster files.
$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
- if LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null | grep -v
'libtool:' >/dev/null; then \
+ if { if (LC_ALL=C find --version) 2>/dev/null | grep GNU >/dev/null;
then \
+ LC_ALL=C find -L $(top_srcdir) -maxdepth 1 -type f -size
-10000000c -exec grep 'GNU @PACKAGE@' /dev/null '{}' ';' 2>/dev/null; \
+ else \
+ LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null; \
+ fi; \
+ } | grep -v 'libtool:' >/dev/null; then \
package_gnu='GNU '; \
else \
package_gnu=''; \
Modified: trunk/texi2html/po_messages/Makevars.template
===================================================================
--- trunk/texi2html/po_messages/Makevars.template 2013-08-11 10:51:17 UTC
(rev 5299)
+++ trunk/texi2html/po_messages/Makevars.template 2013-08-11 11:43:27 UTC
(rev 5300)
@@ -39,3 +39,15 @@
# This is the list of locale categories, beyond LC_MESSAGES, for which the
# message catalogs shall be used. It is usually empty.
EXTRA_LOCALE_CATEGORIES =
+
+# This tells whether the $(DOMAIN).pot file contains messages with an 'msgctxt'
+# context. Possible values are "yes" and "no". Set this to yes if the
+# package uses functions taking also a message context, like pgettext(), or
+# if in $(XGETTEXT_OPTIONS) you define keywords with a context argument.
+USE_MSGCTXT = no
+
+# These options get passed to msgmerge.
+# Useful options are in particular:
+# --previous to keep previous msgids of translated messages,
+# --quiet to reduce the verbosity.
+MSGMERGE_OPTIONS =
Modified: trunk/texi2html/po_messages/Rules-quot
===================================================================
--- trunk/texi2html/po_messages/Rules-quot 2013-08-11 10:51:17 UTC (rev
5299)
+++ trunk/texi2html/po_messages/Rules-quot 2013-08-11 11:43:27 UTC (rev
5300)
@@ -14,13 +14,13 @@
.insert-header.po-update-en:
@lang=`echo $@ | sed -e 's/\.po-update-en$$//'`; \
- if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH;
GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \
+ if test "$(PACKAGE)" = "gettext-tools"; then PATH=`pwd`/../src:$$PATH;
GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \
tmpdir=`pwd`; \
echo "$$lang:"; \
ll=`echo $$lang | sed -e 's/@.*//'`; \
LC_ALL=C; export LC_ALL; \
cd $(srcdir); \
- if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$lang -o -
2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 |
$(MSGFILTER) sed -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null >
$$tmpdir/$$lang.new.po; then \
+ if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$lang -o -
2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 |
$(MSGFILTER) $(SED) -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null >
$$tmpdir/$$lang.new.po; then \
if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
rm -f $$tmpdir/$$lang.new.po; \
else \
Modified: trunk/texi2html/test/encodings/tests.txt
===================================================================
--- trunk/texi2html/test/encodings/tests.txt 2013-08-11 10:51:17 UTC (rev
5299)
+++ trunk/texi2html/test/encodings/tests.txt 2013-08-11 11:43:27 UTC (rev
5300)
@@ -42,7 +42,8 @@
umlaut umlaut.texi
formatting_fr ../coverage/formatting.texi --document-language fr
formatting_fr_icons ../coverage/formatting.texi --document-language fr --init
icons.init
-formatting_converted_to_utf8 ../coverage/formatting.texi --init utf8.pm
+# FIXME Wide character in warn?
+#formatting_converted_to_utf8 ../coverage/formatting.texi --init utf8.pm
accentenc accentenc.texi
#accentenc_encoding accentenc.texi --init enable_encoding.pm
accentenc_encoding accentenc.texi --enable-encoding --set-init-var
'ENABLE_ENCODING_USE_ENTITY 0' --set-init-var 'USE_ISO 0'
@@ -68,6 +69,7 @@
encoding_index-latin1_toutf8 encoding_index-latin1.texi --init utf8.pm
accentenc_info accentenc.texi --info
sample_utf8 sample_utf8.texi
-formatting_utf8_enable_encoding formatting_utf8.texi --enable-encoding
+# FIXME Wide character in warn?
+#formatting_utf8_enable_encoding formatting_utf8.texi --enable-encoding
encoding_index-utf8_enable_encoding encoding_index-utf8.texi --enable-encoding
encoding_index-latin1_enable_encoding encoding_index-latin1.texi
--enable-encoding
Modified: trunk/texi2html/test/many_input_files/Makefile.am
===================================================================
--- trunk/texi2html/test/many_input_files/Makefile.am 2013-08-11 10:51:17 UTC
(rev 5299)
+++ trunk/texi2html/test/many_input_files/Makefile.am 2013-08-11 11:43:27 UTC
(rev 5300)
@@ -1,6 +1,9 @@
-EXTRA_DIST = $(TESTS) indices_res index_split_res tex_l2h_res tex_t4ht_res
+html_tex_tests = tex_l2h.sh tex_t4ht.sh
-TESTS = indices.sh tex_l2h.sh tex_t4ht.sh
+EXTRA_DIST = $(TESTS) indices_res index_split_res tex_l2h_res tex_t4ht_res
$(html_tex_tests)
+
+TESTS = indices.sh
+# $(html_tex_tests)
#TESTS = tex_l2h.sh tex_t4ht.sh
test_dirs = indices index_split tex_l2h tex_t4ht
Modified: trunk/texi2html/test/many_input_files/tex_l2h.sh
===================================================================
--- trunk/texi2html/test/many_input_files/tex_l2h.sh 2013-08-11 10:51:17 UTC
(rev 5299)
+++ trunk/texi2html/test/many_input_files/tex_l2h.sh 2013-08-11 11:43:27 UTC
(rev 5300)
@@ -1,5 +1,7 @@
#! /bin/sh
+LC_ALL=C; export LC_ALL
+
basename=tex_l2h
diffs_dir=diffs
logfile=$basename.log
@@ -41,7 +43,7 @@
sed -i -e 's/CONTENT="LaTeX2HTML.*/CONTENT="LaTeX2HTML">/' -e \
's/with LaTeX2HTML.*/with LaTeX2HTML/' "$basename/"*"_l2h.html"
sed -i -e 's/^# LaTeX2HTML.*/# LaTeX2HTML/' "$basename/"*"_l2h_images.pl"
"$basename/"*"_l2h_labels.pl"
- sed -i -e 's/WIDTH="\([0-9]*\)\([0-9]\)"/WIDTH="100"/'
"$basename/"*"_l2h_images.pl" "$basename/"*.html "$basename/"*-l2h_cache.pm
+ sed -i -e 's/WIDTH="\([0-9]*\)\([0-9]\)"/WIDTH="100"/' -e
's/HEIGHT="\([0-9]*\)\([0-9]\)"/HEIGHT="12"/' "$basename/"*"_l2h_images.pl"
"$basename/"*.html "$basename/"*-l2h_cache.pm
rm -f "$basename/"*".aux" "$basename/"*"_l2h_images.out"
for dir in ${basename}; do
if [ -d $srcdir/${dir}_res ]; then
Modified: trunk/texi2html/test/many_input_files/tex_t4ht.sh
===================================================================
--- trunk/texi2html/test/many_input_files/tex_t4ht.sh 2013-08-11 10:51:17 UTC
(rev 5299)
+++ trunk/texi2html/test/many_input_files/tex_t4ht.sh 2013-08-11 11:43:27 UTC
(rev 5300)
@@ -1,5 +1,7 @@
#! /bin/sh
+LC_ALL=C; export LC_ALL
+
basename=tex_t4ht
diffs_dir=diffs
logfile=$basename.log
@@ -26,8 +28,8 @@
[ -d $basename ] && rm -rf $basename
mkdir $basename
-echo "perl -w -x $srcdir/../../texi2html.pl --set-init-var 'TEST 1'
--set-init-var 'L2H_TMP $tmp_dir' --conf-dir $srcdir/../../maintained_extra
--init-file tex4ht.init --expand tex --out $basename/
$srcdir/../manuals/mini_ker.texi $srcdir/../formatting/tex.texi >> $stdout_file
2>$basename/${basename}.2" >> $logfile
-perl -w -x $srcdir/../../texi2html.pl --set-init-var 'TEST 1' --set-init-var
"L2H_TMP $tmp_dir" --conf-dir $srcdir/../../maintained_extra --init tex4ht.init
--expand tex --out $basename/ $srcdir/../manuals/mini_ker.texi
$srcdir/../formatting/tex.texi >> $stdout_file 2>$basename/${basename}.2
+echo "perl -w -x $srcdir/../../texi2html.pl --set-init-var 'TEST 1'
--set-init-var 'L2H_TMP $tmp_dir' --conf-dir $srcdir/../../maintained_extra
--init-file tex4ht.pm --expand tex --out $basename/
$srcdir/../manuals/mini_ker.texi $srcdir/../formatting/tex.texi >> $stdout_file
2>$basename/${basename}.2" >> $logfile
+perl -w -x $srcdir/../../texi2html.pl --set-init-var 'TEST 1' --set-init-var
"L2H_TMP $tmp_dir" --conf-dir $srcdir/../../maintained_extra --init tex4ht.pm
--expand tex --out $basename/ $srcdir/../manuals/mini_ker.texi
$srcdir/../formatting/tex.texi >> $stdout_file 2>$basename/${basename}.2
return_code=0
ret=$?
Modified: trunk/texi2html/texi2html.pl
===================================================================
--- trunk/texi2html/texi2html.pl 2013-08-11 10:51:17 UTC (rev 5299)
+++ trunk/texi2html/texi2html.pl 2013-08-11 11:43:27 UTC (rev 5300)
@@ -4248,7 +4248,9 @@
print STDERR "\n";
}
-$T2H_DEBUG |= $DEBUG_TEXI if (get_conf('DUMP_TEXI'));
+# The following lines seems to be incorrect. We don't wat to set T2H_DEBUG
+# everytime DUMP_TEXI is set.
+#$T2H_DEBUG |= $DEBUG_TEXI if (get_conf('DUMP_TEXI'));
# no user provided USE_UNICODE, use configure provided
if (!defined(get_conf('USE_UNICODE')))
@@ -4461,6 +4463,10 @@
{
my $input_directory = shift;
my @htmlxref_dirs = @language_config_dirs;
+ if (get_conf('TEST'))
+ {
+ @htmlxref_dirs = ('./.texinfo');
+ }
if ($input_directory ne '.' and $input_directory ne '')
{
unshift @htmlxref_dirs, $input_directory;
@@ -17152,7 +17158,8 @@
collect_renamed_nodes() if (get_conf('RENAMED_NODES_REDIRECTIONS'));
- dump_texi($texi_lines, 'texi', $lines_numbers) if ($T2H_DEBUG &
$DEBUG_TEXI);
+ dump_texi($texi_lines, 'texi', $lines_numbers) if (($T2H_DEBUG &
$DEBUG_TEXI)
+ or
get_conf('DUMP_TEXI'));
if (defined(get_conf('MACRO_EXPAND')))
{
my @texi_lines = (@$first_texi_lines, @$texi_lines);
@@ -17274,7 +17281,7 @@
&$handler;
}
- if ($T2H_DEBUG & $DEBUG_TEXI)
+ if (($T2H_DEBUG & $DEBUG_TEXI) or get_conf('DUMP_TEXI'))
{
dump_texi($doc_lines, 'first', $doc_numbers);
if (defined(get_conf('MACRO_EXPAND') and get_conf('DUMP_TEXI')))
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [5300] Update to gettext 0.18.3.,
Patrice Dumas <=