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.schinde...@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
