From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: Jonathan Nieder <jrnieder@gmail.com>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>,
Marcin Cieslak <saper@saper.info>,
Jens Lehmann <Jens.Lehmann@web.de>
Subject: Re: [PATCH/RFC 01/17] Makefile: A variable for options used by xgettext(1) calls
Date: Tue, 31 Aug 2010 16:36:16 +0000 [thread overview]
Message-ID: <AANLkTim6fjMKcULn08G0NqWRhoRRv_J63KtARq6G5ZbG@mail.gmail.com> (raw)
In-Reply-To: <20100831145158.GD2315@burratino>
On Tue, Aug 31, 2010 at 14:51, Jonathan Nieder <jrnieder@gmail.com> wrote:
> Ævar Arnfjörð Bjarmason wrote:
>
>> +++ b/Makefile
>> @@ -2008,10 +2008,11 @@ cscope:
>> $(RM) cscope*
>> $(FIND) . -name '*.[hcS]' -print | xargs cscope -b
>>
>> +XGETTEXT_OPTIONS = --add-comments
>> pot:
>> - $(XGETTEXT) --add-comments --keyword=_ --keyword=N_ --output=po/git.pot --language=C $(C_OBJ:o=c) t/t0200/test.c
>> - $(XGETTEXT) --add-comments --join-existing --output=po/git.pot --language=Shell $(SCRIPT_SH) t/t0200/test.sh
>> - $(XGETTEXT) --add-comments --join-existing --keyword=__ --output=po/git.pot --language=Perl $(SCRIPT_PERL) t/t0200/test.perl
>> + $(XGETTEXT) $(XGETTEXT_OPTIONS) --keyword=_ --keyword=N_ --output=po/git.pot --language=C $(C_OBJ:o=c) t/t0200/test.c
>> + $(XGETTEXT) $(XGETTEXT_OPTIONS) --join-existing --output=po/git.pot --language=Shell $(SCRIPT_SH) t/t0200/test.sh
>> + $(XGETTEXT) $(XGETTEXT_OPTIONS) --join-existing --keyword=__ --output=po/git.pot --language=Perl $(SCRIPT_PERL) t/t0200/test.perl
>
> The long lines are a bit scary. :)
>
> Maybe more of it could be pulled out into variables. As a
> side-effect, users could override some settings from the command line.
> Maybe something like this?
>
> LOCALIZED_C = $(C_OBJ:o=c) t/t0200/test.c
> LOCALIZED_SH = $(SCRIPT_SH) t/t0200/test.sh
> LOCALIZED_PERL = $(SCRIPT_PERL) t/t0200/test.perl
>
> XGETTEXT_OPTIONS = --add-comments
> XGETTEXT_OPTIONS_C = $(XGETTEXT_OPTIONS) -k_ -kN_ -LC
> XGETTEXT_OPTIONS_SH = $(XGETTEXT_OPTIONS) -LShell
> XGETTEXT_OPTIONS_PERL = $(XGETTEXT_OPTIONS) -k__ -LPerl
>
> po/git.pot:
> rm -f $@+
> $(XGETTEXT) -o$@+ $(XGETTEXT_OPTIONS_C) $(LOCALIZED_C)
> $(XGETTEXT) -j -o$@+ $(XGETTEXT_OPTIONS_SH) $(LOCALIZED_SH)
> $(XGETTEXT) -j -o$@+ $(XGETTEXT_OPTIONS_PERL) $(LOCALIZED_PERL)
> mv $@+ $@
Thanks. I worked that into v2.
next prev parent reply other threads:[~2010-08-31 16:36 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-30 21:28 [PATCH/RFC 00/17] Begin gettextizing Git Ævar Arnfjörð Bjarmason
2010-08-30 21:28 ` [PATCH/RFC 01/17] Makefile: A variable for options used by xgettext(1) calls Ævar Arnfjörð Bjarmason
2010-08-31 14:51 ` Jonathan Nieder
2010-08-31 16:36 ` Ævar Arnfjörð Bjarmason [this message]
2010-08-30 21:28 ` [PATCH/RFC 02/17] Makefile: provide a --msgid-bugs-address to xgettext(1) Ævar Arnfjörð Bjarmason
2010-08-30 21:28 ` [PATCH/RFC 03/17] Makefile: tell xgettext(1) that our source is in UTF-8 Ævar Arnfjörð Bjarmason
2010-08-30 21:28 ` [PATCH/RFC 04/17] builtin.h: Include gettext.h Ævar Arnfjörð Bjarmason
2010-08-30 21:28 ` [PATCH/RFC 05/17] gettext: make the simple parts of git-init localizable Ævar Arnfjörð Bjarmason
2010-08-31 15:03 ` Jonathan Nieder
2010-08-31 15:37 ` Ævar Arnfjörð Bjarmason
2010-08-31 15:44 ` Jonathan Nieder
2010-08-31 16:05 ` Ævar Arnfjörð Bjarmason
2010-08-31 16:09 ` Jonathan Nieder
2010-08-31 16:27 ` Junio C Hamano
2010-08-30 21:28 ` [PATCH/RFC 06/17] gettext: localize the main git-init message Ævar Arnfjörð Bjarmason
2010-08-31 15:10 ` Jonathan Nieder
2010-08-31 15:39 ` Ævar Arnfjörð Bjarmason
2010-08-31 15:48 ` Jonathan Nieder
2010-08-30 21:28 ` [PATCH/RFC 07/17] gettext.c: work around us not using setlocale(LC_CTYPE, "") Ævar Arnfjörð Bjarmason
2010-08-31 15:18 ` Jonathan Nieder
2010-08-31 15:37 ` Marcin Cieslak
2010-08-31 15:49 ` Jonathan Nieder
2010-08-31 16:51 ` Ævar Arnfjörð Bjarmason
2010-08-31 22:45 ` Jonathan Nieder
2010-08-31 22:58 ` Erik Faye-Lund
2010-08-30 21:28 ` [PATCH/RFC 08/17] gettext tests: test if $VERSION exists before using it Ævar Arnfjörð Bjarmason
2010-08-30 21:28 ` [PATCH/RFC 09/17] gettext tests: update test/is.po to match t/t0200/test.c Ævar Arnfjörð Bjarmason
2010-08-30 21:28 ` [PATCH/RFC 10/17] gettext tests: add detection for is_IS.ISO-8859-1 locale Ævar Arnfjörð Bjarmason
2010-08-30 21:28 ` [PATCH/RFC 11/17] gettext tests: test message re-encoding under Shell Ævar Arnfjörð Bjarmason
2010-08-30 21:28 ` [PATCH/RFC 12/17] gettext tests: test re-encoding with a UTF-8 msgid " Ævar Arnfjörð Bjarmason
2010-08-30 21:28 ` [PATCH/RFC 13/17] gettext tests: mark a test message as not needing translation Ævar Arnfjörð Bjarmason
2010-08-30 21:28 ` [PATCH/RFC 14/17] po/is.po: msgmerge and add Language: header Ævar Arnfjörð Bjarmason
2010-08-30 21:28 ` [PATCH/RFC 15/17] po/is.po: add Icelandic translation Ævar Arnfjörð Bjarmason
2010-08-31 15:29 ` Jonathan Nieder
2010-08-31 17:01 ` Ævar Arnfjörð Bjarmason
2010-08-31 19:14 ` Erik Faye-Lund
2010-08-31 19:32 ` Ævar Arnfjörð Bjarmason
2010-08-31 19:49 ` Erik Faye-Lund
2010-08-30 21:28 ` [PATCH/RFC 16/17] po/pl.po: add Polish translation Ævar Arnfjörð Bjarmason
2010-08-30 21:28 ` [PATCH/RFC 17/17] gettext tests: test message re-encoding under C Ævar Arnfjörð Bjarmason
2010-08-30 21:42 ` [PATCH/RFC 00/17] Begin gettextizing Git Junio C Hamano
2010-08-31 9:02 ` [PATCH] gettext: Make NO_GETTEXT=YesPlease the default in releases Ævar Arnfjörð Bjarmason
2010-08-31 17:18 ` [PATCH/RFC 00/17] Begin gettextizing Git Ævar Arnfjörð Bjarmason
2010-08-31 18:08 ` Jonathan Nieder
2010-08-31 18:24 ` Ævar Arnfjörð Bjarmason
2010-08-31 19:22 ` Jonathan Nieder
2010-08-31 19:35 ` Ævar Arnfjörð Bjarmason
2010-08-31 19:42 ` Jonathan Nieder
2010-08-31 11:08 ` Peter Krefting
2010-08-31 11:42 ` Ævar Arnfjörð Bjarmason
2010-08-31 11:48 ` Peter Krefting
2010-08-31 12:02 ` Matthieu Moy
2010-08-31 12:43 ` Ævar Arnfjörð Bjarmason
2010-08-31 15:32 ` Jonathan Nieder
2010-08-31 16:05 ` Ævar Arnfjörð Bjarmason
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=AANLkTim6fjMKcULn08G0NqWRhoRRv_J63KtARq6G5ZbG@mail.gmail.com \
--to=avarab@gmail.com \
--cc=Jens.Lehmann@web.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=saper@saper.info \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).