* msgmft segfaulting on tiger
@ 2008-02-21 23:53 Martin Langhoff
2008-02-21 23:59 ` Martin Langhoff
0 siblings, 1 reply; 21+ messages in thread
From: Martin Langhoff @ 2008-02-21 23:53 UTC (permalink / raw)
To: Git Mailing List, Basilio Brice–ño H., gsaldana
Today I've debugged a compile of git 1.5.4.2 failing on OSX Tiger (on
Basilio's machine). The problem is during the git-gui build, in the PO
file handling. Apparently fmtmsg (from fink) segfaults on de.po so the
fix is to say
make NO_MSGFMT=NoneThere
I don't think we can do much about it -- my guess is that fink has
been built and tested in a different OSX release, and happens to go
bellyup on Tiger. Here's a transcript in case it helps anyone.
Here's the tail of the build message, with make called with -d:
GITGUI_VERSION = 0.9.2
* new locations or Tcl/Tk interpreter
GEN git-gui
INDEX lib/
MSGFMT po/de.msg make[1]: *** [po/de.msg] Error 1
make: *** [all] Error 2
Various versions of things involved:
$ dpkg -S /sw/bin/msgfmt
gettext-tools: /sw/bin/msgfmt
$ dpkg -l gettext-tools
(...)
ii gettext-tools 0.10.40-19
$ uname -a
Darwin developer 8.11.1 Darwin Kernel Version 8.11.1: Wed Oct 10
18:23:28 PDT 2007; root:xnu-792.25.20~1/RELEASE_I386 i386 i386
$ msgfmt -V
msgfmt (GNU gettext) 0.10.40
Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
Written by Ulrich Drepper.
Has anyone got any ideas on how to debug this further? I couldn't find
any core files.
cheers,
martin
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: msgmft segfaulting on tiger
2008-02-21 23:53 msgmft segfaulting on tiger Martin Langhoff
@ 2008-02-21 23:59 ` Martin Langhoff
2008-02-22 6:58 ` Shawn O. Pearce
0 siblings, 1 reply; 21+ messages in thread
From: Martin Langhoff @ 2008-02-21 23:59 UTC (permalink / raw)
To: Git Mailing List, Basilio Brice–ño H., gsaldana
On Fri, Feb 22, 2008 at 12:53 PM, Martin Langhoff
<martin.langhoff@gmail.com> wrote:
> Today I've debugged a compile of git 1.5.4.2 failing on OSX Tiger (on
> Basilio's machine). The problem is during the git-gui build, in the PO
> file handling. Apparently fmtmsg (from fink) segfaults on de.po so the
> fix is to say
Grumble. It seems like msgfmt that fink provides actually does not
support the --tcl flag. So perhaps the right thing is to always say
NO_MSGFMT on OSX?
cheers,
m
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: msgmft segfaulting on tiger
2008-02-21 23:59 ` Martin Langhoff
@ 2008-02-22 6:58 ` Shawn O. Pearce
2008-02-22 17:57 ` Martin Langhoff
0 siblings, 1 reply; 21+ messages in thread
From: Shawn O. Pearce @ 2008-02-22 6:58 UTC (permalink / raw)
To: Martin Langhoff
Cc: Git Mailing List, Basilio Brice–ño H., gsaldana
Martin Langhoff <martin.langhoff@gmail.com> wrote:
> On Fri, Feb 22, 2008 at 12:53 PM, Martin Langhoff
> <martin.langhoff@gmail.com> wrote:
> > Today I've debugged a compile of git 1.5.4.2 failing on OSX Tiger (on
> > Basilio's machine). The problem is during the git-gui build, in the PO
> > file handling. Apparently fmtmsg (from fink) segfaults on de.po so the
> > fix is to say
>
> Grumble. It seems like msgfmt that fink provides actually does not
> support the --tcl flag. So perhaps the right thing is to always say
> NO_MSGFMT on OSX?
I'd hate to do this. GNU msgfmt does better checking on the
messages then po2msg.sh does, and its a tiny bit faster. So
I'd rather stick to the standard tool that is widely used.
Currently we are looking to see if msgfmt generates an exit status
of 127, and if so we fallback to po2msg.sh. Apparently however
that test is passing and thus you are using the fink msgfmt.
Did you try building with `make V=1` to look at the full output and
not the prettied up simplified output the Makefile uses by default?
It won't fix your issue but it may be interesting to see if msgfmt
is failing with a particular message or not.
--
Shawn.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: msgmft segfaulting on tiger
2008-02-22 6:58 ` Shawn O. Pearce
@ 2008-02-22 17:57 ` Martin Langhoff
2008-02-27 18:18 ` Gabriel Saldaña
0 siblings, 1 reply; 21+ messages in thread
From: Martin Langhoff @ 2008-02-22 17:57 UTC (permalink / raw)
To: Shawn O. Pearce
Cc: Git Mailing List, Basilio Brice–ño H., gsaldana
On Fri, Feb 22, 2008 at 7:58 PM, Shawn O. Pearce <spearce@spearce.org> wrote:
> Did you try building with `make V=1` to look at the full output and
> not the prettied up simplified output the Makefile uses by default?
> It won't fix your issue but it may be interesting to see if msgfmt
> is failing with a particular message or not.
I'll track down Basilio (it's his laptop) today and try, I think he's
still at the conference. I also suspect that OSX's own build tools may
include a different msgfmt, but the fink one is earlier in the path.
cheers,
m
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: msgmft segfaulting on tiger
2008-02-22 17:57 ` Martin Langhoff
@ 2008-02-27 18:18 ` Gabriel Saldaña
2008-02-27 18:26 ` Johannes Schindelin
0 siblings, 1 reply; 21+ messages in thread
From: Gabriel Saldaña @ 2008-02-27 18:18 UTC (permalink / raw)
To: Martin Langhoff; +Cc: Shawn O. Pearce, Git Mailing List
We tried to build with make V=1 and this was the output:
msgfmt --statistics --tcl -l de -d po/ po/de.po
msgfmt: unrecognized option `--tcl'
Try `msgfmt --help' for more information.
make[1]: *** [po/de.msg] Error 1
make: *** [all] Error 2
Still the error is in the po/de.po file
Hope this info helps
Gabriel Saldana
Martin Langhoff wrote:
> On Fri, Feb 22, 2008 at 7:58 PM, Shawn O. Pearce <spearce@spearce.org> wrote:
>> Did you try building with `make V=1` to look at the full output and
>> not the prettied up simplified output the Makefile uses by default?
>> It won't fix your issue but it may be interesting to see if msgfmt
>> is failing with a particular message or not.
>
> I'll track down Basilio (it's his laptop) today and try, I think he's
> still at the conference. I also suspect that OSX's own build tools may
> include a different msgfmt, but the fink one is earlier in the path.
>
> cheers,
>
>
>
> m
>
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: msgmft segfaulting on tiger
2008-02-27 18:18 ` Gabriel Saldaña
@ 2008-02-27 18:26 ` Johannes Schindelin
2008-02-27 18:42 ` Gabriel Saldaña
0 siblings, 1 reply; 21+ messages in thread
From: Johannes Schindelin @ 2008-02-27 18:26 UTC (permalink / raw)
To: Gabriel Saldaña; +Cc: Martin Langhoff, Shawn O. Pearce, Git Mailing List
[-- Attachment #1: Type: TEXT/PLAIN, Size: 291 bytes --]
Hi,
On Wed, 27 Feb 2008, Gabriel Saldaña wrote:
> msgfmt --statistics --tcl -l de -d po/ po/de.po msgfmt: unrecognized option
> `--tcl'
Could you try this, please:
$ msgfmt --tcl; echo $?
Maybe we can have a clever autodetection of msgfmt which does not
understand --tcl?
Ciao,
Dscho
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: msgmft segfaulting on tiger
2008-02-27 18:26 ` Johannes Schindelin
@ 2008-02-27 18:42 ` Gabriel Saldaña
2008-02-27 22:04 ` Johannes Schindelin
0 siblings, 1 reply; 21+ messages in thread
From: Gabriel Saldaña @ 2008-02-27 18:42 UTC (permalink / raw)
To: Johannes Schindelin; +Cc: Martin Langhoff, Shawn O. Pearce, Git Mailing List
Here it is:
$ msgfmt --tcl; echo $?
msgfmt: unrecognized option `--tcl'
Try `msgfmt --help' for more information.
1
Gabriel
Johannes Schindelin wrote:
> Hi,
>
> On Wed, 27 Feb 2008, Gabriel Saldaña wrote:
>
>> msgfmt --statistics --tcl -l de -d po/ po/de.po msgfmt: unrecognized option
>> `--tcl'
>
> Could you try this, please:
>
> $ msgfmt --tcl; echo $?
>
> Maybe we can have a clever autodetection of msgfmt which does not
> understand --tcl?
>
> Ciao,
> Dscho
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: msgmft segfaulting on tiger
2008-02-27 18:42 ` Gabriel Saldaña
@ 2008-02-27 22:04 ` Johannes Schindelin
2008-02-27 22:14 ` Junio C Hamano
0 siblings, 1 reply; 21+ messages in thread
From: Johannes Schindelin @ 2008-02-27 22:04 UTC (permalink / raw)
To: Gabriel Saldaña; +Cc: Martin Langhoff, Shawn O. Pearce, Git Mailing List
[-- Attachment #1: Type: TEXT/PLAIN, Size: 365 bytes --]
Hi,
On Wed, 27 Feb 2008, Gabriel Saldaña wrote:
> Here it is:
>
> $ msgfmt --tcl; echo $?
> msgfmt: unrecognized option `--tcl'
> Try `msgfmt --help' for more information.
> 1
Darn. I think that's the same exit code as for any other invocation
without filename.
So it seems that there is no easy way to tell a --tcl aware msgfmt from
the other.
Ciao,
Dscho
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: msgmft segfaulting on tiger
2008-02-27 22:04 ` Johannes Schindelin
@ 2008-02-27 22:14 ` Junio C Hamano
2008-02-28 0:32 ` Shawn O. Pearce
2008-02-28 18:40 ` msgmft segfaulting on tiger Gabriel Saldaña
0 siblings, 2 replies; 21+ messages in thread
From: Junio C Hamano @ 2008-02-27 22:14 UTC (permalink / raw)
To: Johannes Schindelin
Cc: Gabriel Saldaña, Martin Langhoff, Shawn O. Pearce, Git Mailing List
Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
>> $ msgfmt --tcl; echo $?
>> msgfmt: unrecognized option `--tcl'
>> Try `msgfmt --help' for more information.
>> 1
>
> Darn. I think that's the same exit code as for any other invocation
> without filename.
>
> So it seems that there is no easy way to tell a --tcl aware msgfmt from
> the other.
How about...
$ msgfmt --tcl -l C -d . /dev/null; echo $?
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: msgmft segfaulting on tiger
2008-02-27 22:14 ` Junio C Hamano
@ 2008-02-28 0:32 ` Shawn O. Pearce
2008-03-04 7:02 ` msgmft segfaulting on ubuntu gutsy (clean) Gabriel Saldaña
2008-02-28 18:40 ` msgmft segfaulting on tiger Gabriel Saldaña
1 sibling, 1 reply; 21+ messages in thread
From: Shawn O. Pearce @ 2008-02-28 0:32 UTC (permalink / raw)
To: Junio C Hamano
Cc: Johannes Schindelin, Gabriel Saldaña, Martin Langhoff,
Git Mailing List
Junio C Hamano <gitster@pobox.com> wrote:
> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> >> $ msgfmt --tcl; echo $?
> >> msgfmt: unrecognized option `--tcl'
> >> Try `msgfmt --help' for more information.
> >> 1
> >
> > Darn. I think that's the same exit code as for any other invocation
> > without filename.
>
> How about...
>
> $ msgfmt --tcl -l C -d . /dev/null; echo $?
I can't test this, my msgfmt --tcl works properly. Can someone
who has a msgfmt lacking tcl support confirm this will work?
--8<--
[PATCH] git-gui: Gracefully fall back to po2msg.sh if msgfmt --tcl fails
Mac OS X Tiger may have a msgfmt available but it doesn't understand
how to implement --tcl. Falling back to po2msg.sh on such systems
is a reasonable behavior.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
---
Makefile | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/Makefile b/Makefile
index 01e0a46..1bd11eb 100644
--- a/Makefile
+++ b/Makefile
@@ -224,6 +224,11 @@ else
ifeq ($(shell $(MSGFMT) >/dev/null 2>&1 || echo $$?),127)
MSGFMT := $(TCL_PATH) po/po2msg.sh
endif
+ ifeq (msgfmt,$(MSGFMT))
+ ifeq ($(shell $(MSGFMT) --tcl -l C -d . /dev/null || echo $?),1)
+ MSGFMT := $(TCL_PATH) po/po2msg.sh
+ endif
+ endif
endif
msgsdir = $(gg_libdir)/msgs
--
1.5.4.3.295.g6b554
--
Shawn.
^ permalink raw reply related [flat|nested] 21+ messages in thread
* msgmft segfaulting on ubuntu gutsy (clean)
2008-02-28 0:32 ` Shawn O. Pearce
@ 2008-03-04 7:02 ` Gabriel Saldaña
2008-03-04 7:07 ` Shawn O. Pearce
0 siblings, 1 reply; 21+ messages in thread
From: Gabriel Saldaña @ 2008-03-04 7:02 UTC (permalink / raw)
To: Shawn O. Pearce
Cc: Junio C Hamano, Johannes Schindelin, Martin Langhoff, Git Mailing List
I'm getting the msgmft error message when compiling git 1.5.4.3 on a
clean install of Ubuntu Gutsy. Installed dependencies using "apt-get
build-dep git-core".
Here's make output:
GITGUI_VERSION = 0.9.2.7.g3bae
* new locations or Tcl/Tk interpreter
GEN git-gui
INDEX lib/
MSGFMT po/de.msg 371 translated.
MSGFMT po/fr.msg 371 translated.
MSGFMT po/hu.msg 371 translated.
MSGFMT po/it.msg 370 translated, 1 untranslated.
MSGFMT po/ja.msg 371 translated.
MSGFMT po/ru.msg 367 translated, 4 untranslated.
MSGFMT po/sv.msg 371 translated.
MSGFMT po/zh_cn.msg 53 translated, 57 fuzzy, 253 untranslated.
SUBDIR gitk-git
GEN gitk-wish
Generating catalog po/de.msg
msgfmt --statistics --tcl po/de.po -l de -d po/
make[1]: msgfmt: Command not found
make[1]: *** [po/de.msg] Error 127
make: *** [all] Error 2
It is very similar to Tiger's error message.
Gabriel Saldana
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: msgmft segfaulting on ubuntu gutsy (clean)
2008-03-04 7:02 ` msgmft segfaulting on ubuntu gutsy (clean) Gabriel Saldaña
@ 2008-03-04 7:07 ` Shawn O. Pearce
0 siblings, 0 replies; 21+ messages in thread
From: Shawn O. Pearce @ 2008-03-04 7:07 UTC (permalink / raw)
To: Gabriel Saldaña
Cc: Junio C Hamano, Johannes Schindelin, Martin Langhoff, Git Mailing List
Gabriel Saldaa <gsaldana@gmail.com> wrote:
> I'm getting the msgmft error message when compiling git 1.5.4.3 on a
> clean install of Ubuntu Gutsy. Installed dependencies using "apt-get
> build-dep git-core".
>
> Here's make output:
>
> GITGUI_VERSION = 0.9.2.7.g3bae
> * new locations or Tcl/Tk interpreter
> GEN git-gui
> INDEX lib/
> MSGFMT po/de.msg 371 translated.
> MSGFMT po/fr.msg 371 translated.
> MSGFMT po/hu.msg 371 translated.
> MSGFMT po/it.msg 370 translated, 1 untranslated.
> MSGFMT po/ja.msg 371 translated.
> MSGFMT po/ru.msg 367 translated, 4 untranslated.
> MSGFMT po/sv.msg 371 translated.
> MSGFMT po/zh_cn.msg 53 translated, 57 fuzzy, 253 untranslated.
> SUBDIR gitk-git
> GEN gitk-wish
> Generating catalog po/de.msg
> msgfmt --statistics --tcl po/de.po -l de -d po/
> make[1]: msgfmt: Command not found
> make[1]: *** [po/de.msg] Error 127
> make: *** [all] Error 2
>
> It is very similar to Tiger's error message.
Rebuild with "NO_MSGFMT=1", or install GNU msgfmt first.
The issue is gitk's Makefile is missing the fallback rule that
git-gui has, which is use our Tcl based msgfmt work-a-like if msgfmt
is not found. That's exactly what you see above; git-gui fell back
automatically to its work-a-like but gitk did not.
--
Shawn.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: msgmft segfaulting on tiger
2008-02-27 22:14 ` Junio C Hamano
2008-02-28 0:32 ` Shawn O. Pearce
@ 2008-02-28 18:40 ` Gabriel Saldaña
2008-03-05 7:19 ` Shawn O. Pearce
1 sibling, 1 reply; 21+ messages in thread
From: Gabriel Saldaña @ 2008-02-28 18:40 UTC (permalink / raw)
To: Junio C Hamano
Cc: Johannes Schindelin, Martin Langhoff, Shawn O. Pearce, Git Mailing List
Here's the output, hope it helps:
$ msgfmt --tcl -l C -d . /dev/null; echo $?
msgfmt: unrecognized option `--tcl'
Try `msgfmt --help' for more information.
1
somehow msgfmt doesn't recognize the --tcl flag.
Gabriel Saldana
Junio C Hamano wrote:
> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
>
>>> $ msgfmt --tcl; echo $?
>>> msgfmt: unrecognized option `--tcl'
>>> Try `msgfmt --help' for more information.
>>> 1
>> Darn. I think that's the same exit code as for any other invocation
>> without filename.
>>
>> So it seems that there is no easy way to tell a --tcl aware msgfmt from
>> the other.
>
> How about...
>
> $ msgfmt --tcl -l C -d . /dev/null; echo $?
>
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: msgmft segfaulting on tiger
2008-02-28 18:40 ` msgmft segfaulting on tiger Gabriel Saldaña
@ 2008-03-05 7:19 ` Shawn O. Pearce
2008-03-06 8:40 ` Junio C Hamano
0 siblings, 1 reply; 21+ messages in thread
From: Shawn O. Pearce @ 2008-03-05 7:19 UTC (permalink / raw)
To: Gabriel Saldaña
Cc: Junio C Hamano, Johannes Schindelin, Martin Langhoff, Git Mailing List
Gabriel Saldaa <gsaldana@gmail.com> wrote:
> Here's the output, hope it helps:
>
> $ msgfmt --tcl -l C -d . /dev/null; echo $?
> msgfmt: unrecognized option `--tcl'
> Try `msgfmt --help' for more information.
> 1
>
> somehow msgfmt doesn't recognize the --tcl flag.
Just to revive a nearly dead thead... I have a workaround now in
git-gui maint that looks for this case and falls into our po2msg
script when msgfmt doesn't see --tcl.
I also set Paul Mackerras a patch for gitk, so it can do the
same thing. Maybe Git 1.5.4.4 will include both patches.
> Junio C Hamano wrote:
> >Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> >
> >>>$ msgfmt --tcl; echo $?
> >>>msgfmt: unrecognized option `--tcl'
> >>>Try `msgfmt --help' for more information.
> >>>1
> >>Darn. I think that's the same exit code as for any other invocation
> >>without filename.
> >>
> >>So it seems that there is no easy way to tell a --tcl aware msgfmt from
> >>the other.
> >
> >How about...
> >
> > $ msgfmt --tcl -l C -d . /dev/null; echo $?
--
Shawn.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: msgmft segfaulting on tiger
2008-03-05 7:19 ` Shawn O. Pearce
@ 2008-03-06 8:40 ` Junio C Hamano
2008-03-12 5:29 ` [PATCH] Simplify MSGFMT setting in Makefile Junio C Hamano
0 siblings, 1 reply; 21+ messages in thread
From: Junio C Hamano @ 2008-03-06 8:40 UTC (permalink / raw)
To: Shawn O. Pearce, Paul Mackerras
Cc: Gabriel Saldaña, Johannes Schindelin, Martin Langhoff,
Git Mailing List
"Shawn O. Pearce" <spearce@spearce.org> writes:
> Just to revive a nearly dead thead... I have a workaround now in
> git-gui maint that looks for this case and falls into our po2msg
> script when msgfmt doesn't see --tcl.
>
> I also set Paul Mackerras a patch for gitk, so it can do the
> same thing. Maybe Git 1.5.4.4 will include both patches.
I looked at what you have in your Makefile.
It makes me wonder, however, if it makes more sense to squash the two
invocations of msgfmt you make into one, like the attached patch.
The point is that msgfmt you guys want to use _must_ understand --tcl,
and a msgfmt new enough to be usable would exit with 0 on the above
command line.
-- >8 --
gitk i18n: Fall back to po2msg.sh if msgfmt --tcl fails
Some platforms may have a msgfmt that doesn't understand --tcl. Mac OS X
Tiger is an example.
Falling back to po2msg.sh on such systems is a reasonable behavior.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
Makefile | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/Makefile b/Makefile
index ae2b80b..c72e7f7 100644
--- a/Makefile
+++ b/Makefile
@@ -22,6 +22,9 @@ ifdef NO_MSGFMT
MSGFMT ?= $(TCL_PATH) po/po2msg.sh
else
MSGFMT ?= msgfmt
+ ifneq ($(shell $(MSGFMT) --tcl -l C -d . /dev/null 2>/dev/null; echo $?),0)
+ MSGFMT = $(TCL_PATH) po/po2msg.sh
+ endif
endif
PO_TEMPLATE = po/gitk.pot
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH] Simplify MSGFMT setting in Makefile
2008-03-06 8:40 ` Junio C Hamano
@ 2008-03-12 5:29 ` Junio C Hamano
2008-03-12 5:51 ` Shawn O. Pearce
` (2 more replies)
0 siblings, 3 replies; 21+ messages in thread
From: Junio C Hamano @ 2008-03-12 5:29 UTC (permalink / raw)
To: Shawn O. Pearce; +Cc: Paul Mackerras, git
To prepare msg files for Tcl scripts, the command that is set to MSGFMT
make variable needs to be able to grok "--tcl -l <lang> -d <here>" options
correctly. This patch simplifies the tests done in git-gui's Makefile to
directly test this condition. If the test run does not exit properly with
zero status (either because you do not have "msgfmt" itself, or your
"msgfmt" is too old to grok --tcl option --- the reason does not matter),
have it fall back to po/po2msg.sh
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
* I am planning to close 'master' for -rc1 by the end of this week, so
please plan to tell me to pull if you have accumulated changes,
thanks.
Makefile | 7 +------
1 files changed, 1 insertions(+), 6 deletions(-)
diff --git a/Makefile b/Makefile
index 4e32174..95e99f2 100644
--- a/Makefile
+++ b/Makefile
@@ -221,14 +221,9 @@ ifdef NO_MSGFMT
MSGFMT ?= $(TCL_PATH) po/po2msg.sh
else
MSGFMT ?= msgfmt
- ifeq ($(shell $(MSGFMT) >/dev/null 2>&1 || echo $$?),127)
+ ifneq ($(shell $(MSGFMT) --tcl -l C -d . /dev/null 2>/dev/null; echo $?),0)
MSGFMT := $(TCL_PATH) po/po2msg.sh
endif
- ifeq (msgfmt,$(MSGFMT))
- ifeq ($(shell $(MSGFMT) --tcl -l C -d . /dev/null 2>/dev/null || echo $?),1)
- MSGFMT := $(TCL_PATH) po/po2msg.sh
- endif
- endif
endif
msgsdir = $(gg_libdir)/msgs
^ permalink raw reply related [flat|nested] 21+ messages in thread
* Re: [PATCH] Simplify MSGFMT setting in Makefile
2008-03-12 5:29 ` [PATCH] Simplify MSGFMT setting in Makefile Junio C Hamano
@ 2008-03-12 5:51 ` Shawn O. Pearce
2008-03-12 10:19 ` Charles Bailey
2008-03-14 4:44 ` Paul Mackerras
2 siblings, 0 replies; 21+ messages in thread
From: Shawn O. Pearce @ 2008-03-12 5:51 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Paul Mackerras, git
Junio C Hamano <gitster@pobox.com> wrote:
> To prepare msg files for Tcl scripts, the command that is set to MSGFMT
...
Thanks.
> * I am planning to close 'master' for -rc1 by the end of this week, so
> please plan to tell me to pull if you have accumulated changes,
> thanks.
Please pull. What is in my master right now (7276607 which is
this patch) will likely be gitgui-0.10.0. I'm unlikely to have
any further changes (beyond perhaps updated po files) between now
and 1.5.5 final.
> Makefile | 7 +------
> 1 files changed, 1 insertions(+), 6 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index 4e32174..95e99f2 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -221,14 +221,9 @@ ifdef NO_MSGFMT
> MSGFMT ?= $(TCL_PATH) po/po2msg.sh
> else
> MSGFMT ?= msgfmt
> - ifeq ($(shell $(MSGFMT) >/dev/null 2>&1 || echo $$?),127)
> + ifneq ($(shell $(MSGFMT) --tcl -l C -d . /dev/null 2>/dev/null; echo $?),0)
Missing a $ here, it should be $$? not $?. Fixed up when I applied.
--
Shawn.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH] Simplify MSGFMT setting in Makefile
2008-03-12 5:29 ` [PATCH] Simplify MSGFMT setting in Makefile Junio C Hamano
2008-03-12 5:51 ` Shawn O. Pearce
@ 2008-03-12 10:19 ` Charles Bailey
2008-03-14 4:44 ` Paul Mackerras
2 siblings, 0 replies; 21+ messages in thread
From: Charles Bailey @ 2008-03-12 10:19 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Shawn O. Pearce, Paul Mackerras, git
On Tue, Mar 11, 2008 at 10:29:52PM -0700, Junio C Hamano wrote:
> To prepare msg files for Tcl scripts, the command that is set to MSGFMT
> make variable needs to be able to grok "--tcl -l <lang> -d <here>" options
> correctly. This patch simplifies the tests done in git-gui's Makefile to
> directly test this condition. If the test run does not exit properly with
> zero status (either because you do not have "msgfmt" itself, or your
> "msgfmt" is too old to grok --tcl option --- the reason does not matter),
> have it fall back to po/po2msg.sh
>
> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tested-by: Charles Bailey <charles@hashpling.org>
This looks good to me on Mac OS X 10.5.2, would anyone like me to
prepare a patch for gitk as without it we still need to manually
specifiy NO_MSGFMT to the top level git make in any case?
Charles.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH] Simplify MSGFMT setting in Makefile
2008-03-12 5:29 ` [PATCH] Simplify MSGFMT setting in Makefile Junio C Hamano
2008-03-12 5:51 ` Shawn O. Pearce
2008-03-12 10:19 ` Charles Bailey
@ 2008-03-14 4:44 ` Paul Mackerras
2008-03-14 4:50 ` Junio C Hamano
2008-03-14 13:07 ` Andreas Ericsson
2 siblings, 2 replies; 21+ messages in thread
From: Paul Mackerras @ 2008-03-14 4:44 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Shawn O. Pearce, git
Junio C Hamano writes:
> * I am planning to close 'master' for -rc1 by the end of this week, so
> please plan to tell me to pull if you have accumulated changes,
> thanks.
I have a few commits for you to pull, but I am about to push a patch
for gitk like the one you sent for git-gui, so I'll send you a pull
request when I've done that. However, I found that in this line:
> else
> MSGFMT ?= msgfmt
> - ifeq ($(shell $(MSGFMT) >/dev/null 2>&1 || echo $$?),127)
> + ifneq ($(shell $(MSGFMT) --tcl -l C -d . /dev/null 2>/dev/null; echo $?),0)
I had to put "echo $$?" for it to work rather than "echo $?".
Paul.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH] Simplify MSGFMT setting in Makefile
2008-03-14 4:44 ` Paul Mackerras
@ 2008-03-14 4:50 ` Junio C Hamano
2008-03-14 13:07 ` Andreas Ericsson
1 sibling, 0 replies; 21+ messages in thread
From: Junio C Hamano @ 2008-03-14 4:50 UTC (permalink / raw)
To: Paul Mackerras; +Cc: Shawn O. Pearce, git
Paul Mackerras <paulus@samba.org> writes:
> I have a few commits for you to pull, but I am about to push a patch
> for gitk like the one you sent for git-gui, so I'll send you a pull
> request when I've done that.
Thanks.
>> else
>> MSGFMT ?= msgfmt
>> - ifeq ($(shell $(MSGFMT) >/dev/null 2>&1 || echo $$?),127)
>> + ifneq ($(shell $(MSGFMT) --tcl -l C -d . /dev/null 2>/dev/null; echo $?),0)
>
> I had to put "echo $$?" for it to work rather than "echo $?".
Yeah, very sorry about this; Shawn already has pointed it out to me.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH] Simplify MSGFMT setting in Makefile
2008-03-14 4:44 ` Paul Mackerras
2008-03-14 4:50 ` Junio C Hamano
@ 2008-03-14 13:07 ` Andreas Ericsson
1 sibling, 0 replies; 21+ messages in thread
From: Andreas Ericsson @ 2008-03-14 13:07 UTC (permalink / raw)
To: Paul Mackerras; +Cc: Junio C Hamano, Shawn O. Pearce, git
Paul Mackerras wrote:
> Junio C Hamano writes:
>
>> * I am planning to close 'master' for -rc1 by the end of this week, so
>> please plan to tell me to pull if you have accumulated changes,
>> thanks.
>
> I have a few commits for you to pull, but I am about to push a patch
> for gitk like the one you sent for git-gui, so I'll send you a pull
> request when I've done that. However, I found that in this line:
>
>> else
>> MSGFMT ?= msgfmt
>> - ifeq ($(shell $(MSGFMT) >/dev/null 2>&1 || echo $$?),127)
>> + ifneq ($(shell $(MSGFMT) --tcl -l C -d . /dev/null 2>/dev/null; echo $?),0)
>
> I had to put "echo $$?" for it to work rather than "echo $?".
>
$$ is the way to pass a literal $ to the shell in Makefiles, so that
seems in order.
--
Andreas Ericsson andreas.ericsson@op5.se
OP5 AB www.op5.se
Tel: +46 8-230225 Fax: +46 8-230231
^ permalink raw reply [flat|nested] 21+ messages in thread
end of thread, other threads:[~2008-03-14 13:08 UTC | newest]
Thread overview: 21+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-02-21 23:53 msgmft segfaulting on tiger Martin Langhoff
2008-02-21 23:59 ` Martin Langhoff
2008-02-22 6:58 ` Shawn O. Pearce
2008-02-22 17:57 ` Martin Langhoff
2008-02-27 18:18 ` Gabriel Saldaña
2008-02-27 18:26 ` Johannes Schindelin
2008-02-27 18:42 ` Gabriel Saldaña
2008-02-27 22:04 ` Johannes Schindelin
2008-02-27 22:14 ` Junio C Hamano
2008-02-28 0:32 ` Shawn O. Pearce
2008-03-04 7:02 ` msgmft segfaulting on ubuntu gutsy (clean) Gabriel Saldaña
2008-03-04 7:07 ` Shawn O. Pearce
2008-02-28 18:40 ` msgmft segfaulting on tiger Gabriel Saldaña
2008-03-05 7:19 ` Shawn O. Pearce
2008-03-06 8:40 ` Junio C Hamano
2008-03-12 5:29 ` [PATCH] Simplify MSGFMT setting in Makefile Junio C Hamano
2008-03-12 5:51 ` Shawn O. Pearce
2008-03-12 10:19 ` Charles Bailey
2008-03-14 4:44 ` Paul Mackerras
2008-03-14 4:50 ` Junio C Hamano
2008-03-14 13:07 ` Andreas Ericsson
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 NNTP newsgroup(s).