forked from aniani/vim
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)
This commit is contained in:
parent
d97fbf171e
commit
8889a5c305
@ -128,11 +128,11 @@ all: $(MOFILES)
|
|||||||
|
|
||||||
first_time:
|
first_time:
|
||||||
$(XGETTEXT) --default-domain=$(LANGUAGE) \
|
$(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):
|
$(LANGUAGES):
|
||||||
$(XGETTEXT) --default-domain=$(PACKAGE) \
|
$(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
|
$(MV) $(PACKAGE).po $(PACKAGE).pot
|
||||||
$(CP) $@.po $@.po.orig
|
$(CP) $@.po $@.po.orig
|
||||||
$(MV) $@.po $@.po.old
|
$(MV) $@.po $@.po.old
|
||||||
|
@ -11,7 +11,11 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
ifndef VIMRUNTIME
|
ifndef VIMRUNTIME
|
||||||
|
ifeq (sh.exe, $(SHELL))
|
||||||
VIMRUNTIME = ..\..\runtime
|
VIMRUNTIME = ..\..\runtime
|
||||||
|
else
|
||||||
|
VIMRUNTIME = ../../runtime
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
LANGUAGES = \
|
LANGUAGES = \
|
||||||
@ -100,14 +104,27 @@ PACKAGE = vim
|
|||||||
#GETTEXT_PATH = C:/gettext-0.10.35-w32/win32/Release/
|
#GETTEXT_PATH = C:/gettext-0.10.35-w32/win32/Release/
|
||||||
#GETTEXT_PATH = C:/cygwin/bin/
|
#GETTEXT_PATH = C:/cygwin/bin/
|
||||||
|
|
||||||
|
ifeq (sh.exe, $(SHELL))
|
||||||
MSGFMT = set OLD_PO_FILE_INPUT=yes && $(GETTEXT_PATH)msgfmt -v
|
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
|
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
|
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
|
MV = move
|
||||||
CP = copy
|
CP = copy
|
||||||
RM = del
|
RM = del
|
||||||
MKD = mkdir
|
MKD = mkdir
|
||||||
|
else
|
||||||
|
MV = mv -f
|
||||||
|
CP = cp -f
|
||||||
|
RM = rm -f
|
||||||
|
MKD = mkdir -p
|
||||||
|
endif
|
||||||
|
|
||||||
.SUFFIXES:
|
.SUFFIXES:
|
||||||
.SUFFIXES: .po .mo .pot
|
.SUFFIXES: .po .mo .pot
|
||||||
@ -120,11 +137,11 @@ all: $(MOFILES)
|
|||||||
|
|
||||||
first_time:
|
first_time:
|
||||||
$(XGETTEXT) --default-domain=$(LANGUAGE) \
|
$(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):
|
$(LANGUAGES):
|
||||||
$(XGETTEXT) --default-domain=$(PACKAGE) \
|
$(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
|
$(MV) $(PACKAGE).po $(PACKAGE).pot
|
||||||
$(CP) $@.po $@.po.orig
|
$(CP) $@.po $@.po.orig
|
||||||
$(MV) $@.po $@.po.old
|
$(MV) $@.po $@.po.old
|
||||||
@ -136,10 +153,18 @@ install:
|
|||||||
$(MKD) $(VIMRUNTIME)\lang\$(LANGUAGE)\LC_MESSAGES
|
$(MKD) $(VIMRUNTIME)\lang\$(LANGUAGE)\LC_MESSAGES
|
||||||
$(CP) $(LANGUAGE).mo $(VIMRUNTIME)\lang\$(LANGUAGE)\LC_MESSAGES\$(PACKAGE).mo
|
$(CP) $(LANGUAGE).mo $(VIMRUNTIME)\lang\$(LANGUAGE)\LC_MESSAGES\$(PACKAGE).mo
|
||||||
|
|
||||||
|
ifeq (sh.exe, $(SHELL))
|
||||||
install-all: all
|
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 $(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 @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
|
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:
|
clean:
|
||||||
$(RM) *.mo
|
$(RM) *.mo
|
||||||
|
@ -117,7 +117,7 @@ INSTALLDIR = $(VIMRUNTIME)\lang\$(LANGUAGE)\LC_MESSAGES
|
|||||||
all: $(MOFILES)
|
all: $(MOFILES)
|
||||||
|
|
||||||
files:
|
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
|
first_time: files
|
||||||
set OLD_PO_FILE_INPUT=yes
|
set OLD_PO_FILE_INPUT=yes
|
||||||
|
@ -761,6 +761,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
1252,
|
||||||
/**/
|
/**/
|
||||||
1251,
|
1251,
|
||||||
/**/
|
/**/
|
||||||
|
Loading…
x
Reference in New Issue
Block a user