undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Johannes Schindelin 2017-07-25 10:35:57 +02:00 committed by Junio C Hamano
parent 5ab72271e1
commit 492595cfc7
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -161,7 +161,9 @@ ifeq ($(uname_S),Darwin)
endif endif
endif endif
ifneq (,$(findstring MINGW,$(uname_S))) ifneq (,$(findstring MINGW,$(uname_S)))
ifeq ($(shell expr "$(uname_R)" : '1\.'),2)
NO_MSGFMT=1 NO_MSGFMT=1
endif
GITGUI_WINDOWS_WRAPPER := YesPlease GITGUI_WINDOWS_WRAPPER := YesPlease
GITGUI_RELATIVE := 1 GITGUI_RELATIVE := 1
endif endif