{"thread":{"id":"11552","subject":"[PATCH] Fix the MacOS X compile of gitk by pinching po2msg.sh from git-gui","startedAt":"2008-01-09T13:29:53Z","lastAt":"2008-01-09T14:06:54Z","messageCount":4,"participants":["Charles Bailey","Johannes Schindelin"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"64848","messageId":"20080109132953.GA12489@hashpling.org","threadId":"11552","inReplyTo":null,"subject":"[PATCH] Fix the MacOS X compile of gitk by pinching po2msg.sh from git-gui","fromName":"Charles Bailey","fromEmail":"charles@hashpling.org","sentAt":"2008-01-09T13:29:53Z","receivedAt":"2008-01-09T13:29:53Z","isPatch":true,"sender":{"key":"charles@hashpling.org","avatar":"https://avatars.githubusercontent.com/u/1668475?v=4"},"body":"Make the behaviour of a top level make NO_MSGFMT=Yes consistent when\nperforming the subdirectory builds in gitk-git and git-gui.\n\nSigned-off-by: Charles Bailey \n---\n gitk-git/Makefile | 7 ++++++-\n {git-gui => gitk-git}/po/.gitignore | 0 \n {git-gui => gitk-git}/po/po2msg.sh | 0 \n 3 files changed, 6 insertions(+), 1 deletions(-)\n copy {git-gui => gitk-git}/po/.gitignore (100%)\n copy {git-gui => gitk-git}/po/po2msg.sh (100%)\n\ndiff --git a/gitk-git/Makefile b/gitk-git/Makefile\nindex 6158504..ae2b80b 100644\n--- a/gitk-git/Makefile\n+++ b/gitk-git/Makefile\n@@ -18,7 +18,12 @@ TCLTK_PATH_SQ = $(subst ','\\'',$(TCLTK_PATH))\n \n ## po-file creation rules\n XGETTEXT ?= xgettext\n-MSGFMT ?= msgfmt\n+ifdef NO_MSGFMT\n+\tMSGFMT ?= $(TCL_PATH) po/po2msg.sh\n+else\n+\tMSGFMT ?= msgfmt\n+endif\n+\n PO_TEMPLATE = po/gitk.pot\n ALL_POFILES = $(wildcard po/*.po)\n ALL_MSGFILES = $(subst .po,.msg,$(ALL_POFILES))\ndiff --git a/git-gui/po/.gitignore b/gitk-git/po/.gitignore\nsimilarity index 100%\ncopy from git-gui/po/.gitignore\ncopy to gitk-git/po/.gitignore\ndiff --git a/git-gui/po/po2msg.sh b/gitk-git/po/po2msg.sh\nsimilarity index 100%\ncopy from git-gui/po/po2msg.sh\ncopy to gitk-git/po/po2msg.sh\n-- \n1.5.4.rc2.60.gb2e62\n"},{"id":"64850","messageId":"alpine.LSU.1.00.0801091339390.31053@racer.site","threadId":"11552","inReplyTo":"20080109132953.GA12489@hashpling.org","subject":"Re: [PATCH] Fix the MacOS X compile of gitk by pinching po2msg.sh from git-gui","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2008-01-09T13:40:46Z","receivedAt":"2008-01-09T13:40:46Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Wed, 9 Jan 2008, Charles Bailey wrote:\n\n> Make the behaviour of a top level make NO_MSGFMT=Yes consistent when \n> performing the subdirectory builds in gitk-git and git-gui.\n> \n> Signed-off-by: Charles Bailey \n> ---\n> gitk-git/Makefile | 7 ++++++-\n> {git-gui => gitk-git}/po/.gitignore | 0 \n> {git-gui => gitk-git}/po/po2msg.sh | 0 \n> 3 files changed, 6 insertions(+), 1 deletions(-)\n> copy {git-gui => gitk-git}/po/.gitignore (100%)\n> copy {git-gui => gitk-git}/po/po2msg.sh (100%)\n\nSince gitk and git-gui are separate projects (pulled at irregular \nintervals into git.git), your patch looks sane, but would be better done \nas a patch against gitk.git.\n\nCiao,\nDscho\n"},{"id":"64851","messageId":"20080109135249.GA12869@hashpling.org","threadId":"11552","inReplyTo":"alpine.LSU.1.00.0801091339390.31053@racer.site","subject":"Re: [PATCH] Fix the MacOS X compile of gitk by pinching po2msg.sh from git-gui","fromName":"Charles Bailey","fromEmail":"charles@hashpling.org","sentAt":"2008-01-09T13:52:49Z","receivedAt":"2008-01-09T13:52:49Z","isPatch":true,"sender":{"key":"charles@hashpling.org","avatar":"https://avatars.githubusercontent.com/u/1668475?v=4"},"body":"On Wed, Jan 09, 2008 at 01:40:46PM +0000, Johannes Schindelin wrote:\n> Hi,\n> \n> On Wed, 9 Jan 2008, Charles Bailey wrote:\n> \n> > --- snip ---\n> \n> Since gitk and git-gui are separate projects (pulled at irregular \n> intervals into git.git), your patch looks sane, but would be better done \n> as a patch against gitk.git.\n> \n> Ciao,\n> Dscho\n\nI'm sorry, I think I knew this once, but had forgotten. Of course, as\na patch against gitk, I think it gets quite verbose as the patch\nincludes a full copy of the po2msg.sh script.\n\nIs there a simple way to generate a gitk.git patch from a git.git\nclone, or do I need to clone a gitk repository from somewhere?\n\nPerhaps I could just flag this as a reasonably important MacOS X\n1.5.4-rc issue until I can sort out a more suitable patch?\n\nThanks,\n\nCharles.\n"},{"id":"64854","messageId":"alpine.LSU.1.00.0801091404040.31053@racer.site","threadId":"11552","inReplyTo":"20080109135249.GA12869@hashpling.org","subject":"Re: [PATCH] Fix the MacOS X compile of gitk by pinching po2msg.sh from git-gui","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2008-01-09T14:06:54Z","receivedAt":"2008-01-09T14:06:54Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Wed, 9 Jan 2008, Charles Bailey wrote:\n\n> On Wed, Jan 09, 2008 at 01:40:46PM +0000, Johannes Schindelin wrote:\n> \n> > On Wed, 9 Jan 2008, Charles Bailey wrote:\n> > \n> > > --- snip ---\n> > \n> > Since gitk and git-gui are separate projects (pulled at irregular \n> > intervals into git.git), your patch looks sane, but would be better \n> > done as a patch against gitk.git.\n> \n> I'm sorry, I think I knew this once, but had forgotten.\n\nOh, my critique was not meant as harsh as it was apparently received: for \nreviewing purposes, your way was perfect, as it shows your intent better \nthan the technically correct patch.\n\nAll I'm saying is that you should send the (verbose) patch, too, possibly \nreferring to the smaller patch in the space between the three dashes and \nthe diffstat.\n\n(I would also prefix this patch with \"gitk:\", instead of writing \"of \ngitk\", so that people reading the log of git.git get a better idea what \nthis is about.)\n\nCiao,\nDscho\n"}]}