Mercurial > vim
changeset 12748:f48a1c8c5961 v8.0.1252
patch 8.0.1252: incomplete translations makefile for MinGW/Cygwin
commit https://github.com/vim/vim/commit/8889a5c305e69aa49fd08036e624e365097a5b7b
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Nov 2 19:27:36 2017 +0100
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)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Thu, 02 Nov 2017 19:30:07 +0100 |
| parents | 8ff75dee2bdb |
| children | 8b706a156136 |
| files | src/po/Make_cyg.mak src/po/Make_ming.mak src/po/Make_mvc.mak src/version.c |
| diffstat | 4 files changed, 32 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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
--- a/src/po/Make_mvc.mak +++ b/src/po/Make_mvc.mak @@ -117,7 +117,7 @@ INSTALLDIR = $(VIMRUNTIME)\lang\$(LANGUA 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