patch 8.0.1252: incomplete translations makefile for MinGW/Cygwin

Problem:    Incomplete translations makefile for MinGW/Cygwin.
Solution:   Add missing source files.  Make it work with msys2's bash. (Ken
            Takata)

diff --git a/src/po/Make_cyg.mak b/src/po/Make_cyg.mak
index 4a86d28df20b30540bd1fe65745c86f85f307c01..f8e45badfeb95599207b94935101c52df1e80190 100644 (file)
--- a/src/po/Make_cyg.mak
+++ b/src/po/Make_cyg.mak
@@ -128,11 +128,11 @@ all: $(MOFILES)
 
 first_time:
        $(XGETTEXT) --default-domain=$(LANGUAGE) \
-               --add-comments --keyword=_ --keyword=N_ $(wildcard ../*.c) ../if_perl.xs $(wildcard ../globals.h)
+               --add-comments --keyword=_ --keyword=N_ $(wildcard ../*.c) ../if_perl.xs ../GvimExt/gvimext.cpp $(wildcard ../globals.h) ../if_py_both.h
 
 $(LANGUAGES):
        $(XGETTEXT) --default-domain=$(PACKAGE) \
-               --add-comments --keyword=_ --keyword=N_ $(wildcard ../*.c) ../if_perl.xs $(wildcard ../globals.h)
+               --add-comments --keyword=_ --keyword=N_ $(wildcard ../*.c) ../if_perl.xs ../GvimExt/gvimext.cpp $(wildcard ../globals.h) ../if_py_both.h
        $(MV) $(PACKAGE).po $(PACKAGE).pot
        $(CP) $@.po $@.po.orig
        $(MV) $@.po $@.po.old

diff --git a/src/po/Make_ming.mak b/src/po/Make_ming.mak
index eea106ede3685ef1b83db859e29379c6b44e48ce..cd84c1b49d4c5324f96a35c5948c94286c832afe 100644 (file)
--- a/src/po/Make_ming.mak
+++ b/src/po/Make_ming.mak
@@ -11,7 +11,11 @@
 #
 
 ifndef VIMRUNTIME
+ifeq (sh.exe, $(SHELL))
 VIMRUNTIME = ..\..\runtime
+else
+VIMRUNTIME = ../../runtime
+endif
 endif
 
 LANGUAGES = \
@@ -100,14 +104,27 @@ PACKAGE = vim
 #GETTEXT_PATH = C:/gettext-0.10.35-w32/win32/Release/
 #GETTEXT_PATH = C:/cygwin/bin/
 
+ifeq (sh.exe, $(SHELL))
 MSGFMT = set OLD_PO_FILE_INPUT=yes && $(GETTEXT_PATH)msgfmt -v
 XGETTEXT = set OLD_PO_FILE_INPUT=yes && set OLD_PO_FILE_OUTPUT=yes && $(GETTEXT_PATH)xgettext
 MSGMERGE = set OLD_PO_FILE_INPUT=yes && set OLD_PO_FILE_OUTPUT=yes && $(GETTEXT_PATH)msgmerge
+else
+MSGFMT = LANG=C OLD_PO_FILE_INPUT=yes $(GETTEXT_PATH)msgfmt -v
+XGETTEXT = LANG=C OLD_PO_FILE_INPUT=yes OLD_PO_FILE_OUTPUT=yes $(GETTEXT_PATH)xgettext
+MSGMERGE = LANG=C OLD_PO_FILE_INPUT=yes OLD_PO_FILE_OUTPUT=yes $(GETTEXT_PATH)msgmerge
+endif
 
+ifeq (sh.exe, $(SHELL))
 MV = move
 CP = copy
 RM = del
 MKD = mkdir
+else
+MV = mv -f
+CP = cp -f
+RM = rm -f
+MKD = mkdir -p
+endif
 
 .SUFFIXES:
 .SUFFIXES: .po .mo .pot
@@ -120,11 +137,11 @@ all: $(MOFILES)
 
 first_time:
        $(XGETTEXT) --default-domain=$(LANGUAGE) \
-               --add-comments --keyword=_ --keyword=N_ $(wildcard ../*.c) ../if_perl.xs $(wildcard ../globals.h)
+               --add-comments --keyword=_ --keyword=N_ $(wildcard ../*.c) ../if_perl.xs ../GvimExt/gvimext.cpp $(wildcard ../globals.h) ../if_py_both.h
 
 $(LANGUAGES):
        $(XGETTEXT) --default-domain=$(PACKAGE) \
-               --add-comments --keyword=_ --keyword=N_ $(wildcard ../*.c) ../if_perl.xs $(wildcard ../globals.h)
+               --add-comments --keyword=_ --keyword=N_ $(wildcard ../*.c) ../if_perl.xs ../GvimExt/gvimext.cpp $(wildcard ../globals.h) ../if_py_both.h
        $(MV) $(PACKAGE).po $(PACKAGE).pot
        $(CP) $@.po $@.po.orig
        $(MV) $@.po $@.po.old
@@ -136,10 +153,18 @@ install:
        $(MKD) $(VIMRUNTIME)\lang\$(LANGUAGE)\LC_MESSAGES
        $(CP) $(LANGUAGE).mo $(VIMRUNTIME)\lang\$(LANGUAGE)\LC_MESSAGES\$(PACKAGE).mo
 
+ifeq (sh.exe, $(SHELL))
 install-all: all
        FOR %%l IN ($(LANGUAGES)) DO @IF NOT EXIST $(VIMRUNTIME)\lang\%%l $(MKD) $(VIMRUNTIME)\lang\%%l
        FOR %%l IN ($(LANGUAGES)) DO @IF NOT EXIST $(VIMRUNTIME)\lang\%%l\LC_MESSAGES $(MKD) $(VIMRUNTIME)\lang\%%l\LC_MESSAGES
        FOR %%l IN ($(LANGUAGES)) DO @$(CP) %%l.mo $(VIMRUNTIME)\lang\%%l\LC_MESSAGES\$(PACKAGE).mo
+else
+install-all: all
+       for TARGET in $(LANGUAGES); do \
+               $(MKD) $(VIMRUNTIME)/lang/$$TARGET/LC_MESSAGES ; \
+               $(CP) $$TARGET.mo $(VIMRUNTIME)/lang/$$TARGET/LC_MESSAGES/$(PACKAGE).mo ; \
+       done
+endif
 
 clean:
        $(RM) *.mo

diff --git a/src/po/Make_mvc.mak b/src/po/Make_mvc.mak
index 9deba79746d3178df8961b7205ced2a16f54044e..85013f497e60ad8a5bc913d6b2c1011cd4b09572 100644 (file)
--- a/src/po/Make_mvc.mak
+++ b/src/po/Make_mvc.mak
@@ -117,7 +117,7 @@ INSTALLDIR = $(VIMRUNTIME)\lang\$(LANGUAGE)\LC_MESSAGES
 all: $(MOFILES)
 
 files:
-       $(LS) $(LSFLAGS) ..\*.c ..\if_perl.xs ..\globals.h > .\files
+       $(LS) $(LSFLAGS) ..\*.c ..\if_perl.xs ..\GvimExt\gvimext.cpp ..\globals.h ..\if_py_both.h > .\files
 
 first_time: files
        set OLD_PO_FILE_INPUT=yes

diff --git a/src/version.c b/src/version.c
index 552de7778ddec05e906253ce59f4eae8fb390f8e..59ecefecf3768fdb95f4dcb22a541aabe1379da5 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -761,6 +761,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1252,
 /**/
     1251,
 /**/