[PATCH] Fix the MacOS X compile of gitk by pinching po2msg.sh from git-gui

[PATCH] Fix the MacOS X compile of gitk by pinching po2msg.sh from git-gui

[Charles Bailey]

Make the behaviour of a top level make NO_MSGFMT=Yes consistent when
performing the subdirectory builds in gitk-git and git-gui.

Signed-off-by: Charles Bailey <charles@hashpling.org>
---
 gitk-git/Makefile                   |    7 ++++++-
 {git-gui => gitk-git}/po/.gitignore |    0 
 {git-gui => gitk-git}/po/po2msg.sh  |    0 
 3 files changed, 6 insertions(+), 1 deletions(-)
 copy {git-gui => gitk-git}/po/.gitignore (100%)
 copy {git-gui => gitk-git}/po/po2msg.sh (100%)

diff --git a/gitk-git/Makefile b/gitk-git/Makefile
index 6158504..ae2b80b 100644
--- a/gitk-git/Makefile
+++ b/gitk-git/Makefile
@@ -18,7 +18,12 @@ TCLTK_PATH_SQ = $(subst ','\'',$(TCLTK_PATH))
 
 ## po-file creation rules
 XGETTEXT   ?= xgettext
-MSGFMT     ?= msgfmt
+ifdef NO_MSGFMT
+	MSGFMT ?= $(TCL_PATH) po/po2msg.sh
+else
+	MSGFMT ?= msgfmt
+endif
+
 PO_TEMPLATE = po/gitk.pot
 ALL_POFILES = $(wildcard po/*.po)
 ALL_MSGFILES = $(subst .po,.msg,$(ALL_POFILES))
diff --git a/git-gui/po/.gitignore b/gitk-git/po/.gitignore
similarity index 100%
copy from git-gui/po/.gitignore
copy to gitk-git/po/.gitignore
diff --git a/git-gui/po/po2msg.sh b/gitk-git/po/po2msg.sh
similarity index 100%
copy from git-gui/po/po2msg.sh
copy to gitk-git/po/po2msg.sh
-- 
1.5.4.rc2.60.gb2e62

Re: [PATCH] Fix the MacOS X compile of gitk by pinching po2msg.sh from git-gui

[Johannes Schindelin]

Hi,

On Wed, 9 Jan 2008, Charles Bailey wrote:

> Make the behaviour of a top level make NO_MSGFMT=Yes consistent when 
> performing the subdirectory builds in gitk-git and git-gui.
> 
> Signed-off-by: Charles Bailey <charles@hashpling.org>
> ---
>  gitk-git/Makefile                   |    7 ++++++-
>  {git-gui => gitk-git}/po/.gitignore |    0 
>  {git-gui => gitk-git}/po/po2msg.sh  |    0 
>  3 files changed, 6 insertions(+), 1 deletions(-)
>  copy {git-gui => gitk-git}/po/.gitignore (100%)
>  copy {git-gui => gitk-git}/po/po2msg.sh (100%)

Since gitk and git-gui are separate projects (pulled at irregular 
intervals into git.git), your patch looks sane, but would be better done 
as a patch against gitk.git.

Ciao,
Dscho

Re: [PATCH] Fix the MacOS X compile of gitk by pinching po2msg.sh from git-gui

[Charles Bailey]

On Wed, Jan 09, 2008 at 01:40:46PM +0000, Johannes Schindelin wrote:
> Hi,
> 
> On Wed, 9 Jan 2008, Charles Bailey wrote:
> 
> > --- snip ---
> 
> Since gitk and git-gui are separate projects (pulled at irregular 
> intervals into git.git), your patch looks sane, but would be better done 
> as a patch against gitk.git.
> 
> Ciao,
> Dscho

I'm sorry, I think I knew this once, but had forgotten.  Of course, as
a patch against gitk, I think it gets quite verbose as the patch
includes a full copy of the po2msg.sh script.

Is there a simple way to generate a gitk.git patch from a git.git
clone, or do I need to clone a gitk repository from somewhere?

Perhaps I could just flag this as a reasonably important MacOS X
1.5.4-rc issue until I can sort out a more suitable patch?

Thanks,

Charles.

Re: [PATCH] Fix the MacOS X compile of gitk by pinching po2msg.sh from git-gui

[Johannes Schindelin]

Hi,

On Wed, 9 Jan 2008, Charles Bailey wrote:

> On Wed, Jan 09, 2008 at 01:40:46PM +0000, Johannes Schindelin wrote:
> 
> > On Wed, 9 Jan 2008, Charles Bailey wrote:
> > 
> > > --- snip ---
> > 
> > Since gitk and git-gui are separate projects (pulled at irregular 
> > intervals into git.git), your patch looks sane, but would be better 
> > done as a patch against gitk.git.
> 
> I'm sorry, I think I knew this once, but had forgotten.

Oh, my critique was not meant as harsh as it was apparently received: for 
reviewing purposes, your way was perfect, as it shows your intent better 
than the technically correct patch.

All I'm saying is that you should send the (verbose) patch, too, possibly 
referring to the smaller patch in the space between the three dashes and 
the diffstat.

(I would also prefix this patch with "gitk:", instead of writing "of 
gitk", so that people reading the log of git.git get a better idea what 
this is about.)

Ciao,
Dscho