Daiki Ueno [Thu, 5 Dec 2013 09:47:46 +0000 (18:47 +0900)]
autopoint: Allow user to specify custom autom4te executable
* autopoint.in (func_trace): Allow user to specify autom4te
executable name through $AUTOM4TE envvar.
* gettextize.in (func_trace): Likewise.
Suggested by Eric Blake at
<https://lists.gnu.org/archive/html/bug-gettext/2013-12/msg00006.html>.
Daiki Ueno [Wed, 20 Nov 2013 03:41:20 +0000 (12:41 +0900)]
xgettext: Add E4X support to JavaScript scanner
Reported by Piotr Drąg at: <https://savannah.gnu.org/bugs/?40125>.
* src/xgettext.h (enum lexical_context_ty): New enumeration items
lc_xml_open_tag, lc_xml_close_tag, lc_xml_content.
* src/x-javascript.c (phase5_scan_xml_markup): New
function.
(phase5_get): Handle '<', '>', '/', '=', '{', and '}' specially
to support E4X.
(enum token_type_ty): New enumeration item token_type_equal.
(xml_element_depth): New variable.
(inside_embedded_in_xml): New variable.
(extract_javascript): Initialize those variables.
* tests/Makefile.am (TESTS): Add xgettext-javascript-6.
* tests/xgettext-javascript-6: New file.
Daiki Ueno [Tue, 19 Nov 2013 03:08:10 +0000 (12:08 +0900)]
autopoint: disable m4_include and m4_esyscmd when tracing
* autopoint.in (func_trace): Disable m4_include and m4_esyscmd.
* gettextize.in (func_trace): Likewise.
Reported by Bernhard Voelker in
<https://lists.gnu.org/archive/html/bug-gettext/2013-11/msg00011.html>
and suggested by Eric Blake at <https://savannah.gnu.org/bugs/?40083>.
Daiki Ueno [Thu, 14 Nov 2013 07:10:03 +0000 (16:10 +0900)]
javascript: fix translator comment extraction in C++-style comments
* src/x-javascript.c (phase3_getc): Make sure to call comment_line_end
after parsing C++ style comment line.
Reported by Illimar Tambek at: <http://savannah.gnu.org/bugs/?40572>.
* tests/xgettext-javascript-1: Add a test to extract translator comments
from C++ style comment lines; only extract comments with
TRANSLATORS: tag.
* tests/xgettext-javascript-3: Only extract comments with TRANSLATORS:
tag.
* autopoint.in (omitintl): Don't set it 'no' when no
AM_GNU_GETTEXT call is found.
Reported by Sebastien Helleu in <http://savannah.gnu.org/bugs/?39536>.
The comments in that script state that its use is only required to
work around issues in aclocal from Automake 1.10, while the rest
of the Gettext build infrastructure assumes Automake >= 1.11 anyway.
* autogen.sh: Drop invocations of 'fixaclocal', simply invoke the
'aclocal' program directly.
* build-aux/fixaclocal: Remove.
* Makefile.am (EXTRA_DIST): Stop distributing it.
(ACLOCAL): Drop redefinition in function of 'fixaclocal'.
* gettext-runtime/Makefile.am (ACLOCAL): Likewise.
* gettext-runtime/libasprintf/Makefile.am (ACLOCAL): Likewise.
* gettext-tools/Makefile.am (ACLOCAL): Likewise.
* gettext-tools/examples/Makefile.am (ACLOCAL): Likewise.
build: enable parallel tests harness from Automake
This way, we'll be able to run test cases in parallel (useful
on multicore systems), and output from test cases will be
saved in log files, which should simplify debugging and bug
reporting.
* configure.ac (AM_INIT_AUTOMAKE): Add 'parallel-tests' option.
Require Automake 1.11.1 or later, so that the 'parallel-tests'
will be certainly available.
(AC_INIT): Require Autoconf 2.62 or later; that is the minimal
version supported by Automake 1.11.1 or later.
* gettext-runtime/configure.ac: Likewise.
* gettext-tools/configure.ac: Likewise.
* autogen.sh: Update version number requirement for Autoconf.
* gettext-tools/tests/Makefile.am (TESTS_ENVIRONMENT): Remove
trailing '$(SHELL)'. With the parallel-tests harness, this is
no longer the correct way to define a custom test runner for
the test scripts; to do so, we have to ...
(LOG_COMPILER): ... define this to $(SHELL).
Stefan Beller [Mon, 22 Apr 2013 19:04:05 +0000 (21:04 +0200)]
Add the .mailmap file
The .mailmap feature is used to coalesce together commits by the same
person in the shortlog, where their name and/or email address was
spelled differently.
For further reference see the man page of git shortlog