git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH] git-gui (MinGW): make use of MSys2's msgfmt

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Jul 25, 2017, 08:35 UTC
Message-ID
<8a13544743fd5e6a3b3b5fdb35e02c9c34695e25.1500971399.git.johannes.schindelin@gmx.de>

When Git for Windows was still based on MSys1, we had no gettext, ergo no msgfmt, either. Therefore, we introduced a small and simple Tcl script to perform the same task.

However, with MSys2, we no longer need that because we have a proper msgfmt executable. Plus, the po2msg.sh script somehow manages to hang when run in parallel in Git for Windows' SDK (symptom: the Continuous Testing tasks timing out).

Two reasons to use real msgfmt.exe instead.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
	This hopefully fixes the hangs with the Windows builds triggered
	by Travis. It was a tough one to figure out originally, and it is
	my fault for prioritizing other patch contributions of this one;
	Git for Windows has been carrying this patch since April 6th, 2015.
	Pat, I still have a couple of Pull Request open in your repository
	at https://github.com/patthoyts/git-gui/pulls/dscho that await any
	reaction since October 14th last year. Please let me know when you
	are ready to accept code contributions again. In the meantime, I
	will send git-gui patches to this here mailing list, Cc:ing you,
	and hoping that Junio will take the patches.
Published-As: https://github.com/dscho/git/releases/tag/git-gui-msgfmt-on-windows-v1
Fetch-It-Via: git fetch https://github.com/dscho/git git-gui-msgfmt-on-windows-v1
 git-gui/Makefile | 2 ++
 1 file changed, 2 insertions(+)
diff --git a/git-gui/Makefile b/git-gui/Makefile
index fe30be38dc8..918a8de3691 100644
--- a/git-gui/Makefile
+++ b/git-gui/Makefile
@@ -161,7 +161,9 @@ ifeq ($(uname_S),Darwin)
 	endif
 endif
 ifneq (,$(findstring MINGW,$(uname_S)))
+ifeq ($(shell expr "$(uname_R)" : '1\.'),2)
 	NO_MSGFMT=1
+endif
 	GITGUI_WINDOWS_WRAPPER := YesPlease
 	GITGUI_RELATIVE := 1
 endif

base-commit: 5eada8987e79f216f2002a3cd991360a50cd577c
-- 
2.13.3.windows.1.13.gaf0c2223da0
Next: Junio C Hamano
Message 1 of 3 in “git-gui (MinGW): make use of MSys2's msgfmt”
  1. git-gui (MinGW): make use of MSys2's msgfmtJohannes Schindelin, Jul 25, 2017
  2. Junio C HamanoJul 25, 2017
  3. Lars SchneiderJul 26, 2017

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.