Skip to content

Commit 8889a5c

Browse files
committed
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)
1 parent d97fbf1 commit 8889a5c

4 files changed

Lines changed: 32 additions & 5 deletions

File tree

src/po/Make_cyg.mak

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,11 +128,11 @@ all: $(MOFILES)
128128

129129
first_time:
130130
$(XGETTEXT) --default-domain=$(LANGUAGE) \
131-
--add-comments --keyword=_ --keyword=N_ $(wildcard ../*.c) ../if_perl.xs $(wildcard ../globals.h)
131+
--add-comments --keyword=_ --keyword=N_ $(wildcard ../*.c) ../if_perl.xs ../GvimExt/gvimext.cpp $(wildcard ../globals.h) ../if_py_both.h
132132

133133
$(LANGUAGES):
134134
$(XGETTEXT) --default-domain=$(PACKAGE) \
135-
--add-comments --keyword=_ --keyword=N_ $(wildcard ../*.c) ../if_perl.xs $(wildcard ../globals.h)
135+
--add-comments --keyword=_ --keyword=N_ $(wildcard ../*.c) ../if_perl.xs ../GvimExt/gvimext.cpp $(wildcard ../globals.h) ../if_py_both.h
136136
$(MV) $(PACKAGE).po $(PACKAGE).pot
137137
$(CP) $@.po $@.po.orig
138138
$(MV) $@.po $@.po.old

src/po/Make_ming.mak

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,11 @@
1111
#
1212

1313
ifndef VIMRUNTIME
14+
ifeq (sh.exe, $(SHELL))
1415
VIMRUNTIME = ..\..\runtime
16+
else
17+
VIMRUNTIME = ../../runtime
18+
endif
1519
endif
1620

1721
LANGUAGES = \
@@ -100,14 +104,27 @@ PACKAGE = vim
100104
#GETTEXT_PATH = C:/gettext-0.10.35-w32/win32/Release/
101105
#GETTEXT_PATH = C:/cygwin/bin/
102106

107+
ifeq (sh.exe, $(SHELL))
103108
MSGFMT = set OLD_PO_FILE_INPUT=yes && $(GETTEXT_PATH)msgfmt -v
104109
XGETTEXT = set OLD_PO_FILE_INPUT=yes && set OLD_PO_FILE_OUTPUT=yes && $(GETTEXT_PATH)xgettext
105110
MSGMERGE = set OLD_PO_FILE_INPUT=yes && set OLD_PO_FILE_OUTPUT=yes && $(GETTEXT_PATH)msgmerge
111+
else
112+
MSGFMT = LANG=C OLD_PO_FILE_INPUT=yes $(GETTEXT_PATH)msgfmt -v
113+
XGETTEXT = LANG=C OLD_PO_FILE_INPUT=yes OLD_PO_FILE_OUTPUT=yes $(GETTEXT_PATH)xgettext
114+
MSGMERGE = LANG=C OLD_PO_FILE_INPUT=yes OLD_PO_FILE_OUTPUT=yes $(GETTEXT_PATH)msgmerge
115+
endif
106116

117+
ifeq (sh.exe, $(SHELL))
107118
MV = move
108119
CP = copy
109120
RM = del
110121
MKD = mkdir
122+
else
123+
MV = mv -f
124+
CP = cp -f
125+
RM = rm -f
126+
MKD = mkdir -p
127+
endif
111128

112129
.SUFFIXES:
113130
.SUFFIXES: .po .mo .pot
@@ -120,11 +137,11 @@ all: $(MOFILES)
120137

121138
first_time:
122139
$(XGETTEXT) --default-domain=$(LANGUAGE) \
123-
--add-comments --keyword=_ --keyword=N_ $(wildcard ../*.c) ../if_perl.xs $(wildcard ../globals.h)
140+
--add-comments --keyword=_ --keyword=N_ $(wildcard ../*.c) ../if_perl.xs ../GvimExt/gvimext.cpp $(wildcard ../globals.h) ../if_py_both.h
124141

125142
$(LANGUAGES):
126143
$(XGETTEXT) --default-domain=$(PACKAGE) \
127-
--add-comments --keyword=_ --keyword=N_ $(wildcard ../*.c) ../if_perl.xs $(wildcard ../globals.h)
144+
--add-comments --keyword=_ --keyword=N_ $(wildcard ../*.c) ../if_perl.xs ../GvimExt/gvimext.cpp $(wildcard ../globals.h) ../if_py_both.h
128145
$(MV) $(PACKAGE).po $(PACKAGE).pot
129146
$(CP) $@.po $@.po.orig
130147
$(MV) $@.po $@.po.old
@@ -136,10 +153,18 @@ install:
136153
$(MKD) $(VIMRUNTIME)\lang\$(LANGUAGE)\LC_MESSAGES
137154
$(CP) $(LANGUAGE).mo $(VIMRUNTIME)\lang\$(LANGUAGE)\LC_MESSAGES\$(PACKAGE).mo
138155

156+
ifeq (sh.exe, $(SHELL))
139157
install-all: all
140158
FOR %%l IN ($(LANGUAGES)) DO @IF NOT EXIST $(VIMRUNTIME)\lang\%%l $(MKD) $(VIMRUNTIME)\lang\%%l
141159
FOR %%l IN ($(LANGUAGES)) DO @IF NOT EXIST $(VIMRUNTIME)\lang\%%l\LC_MESSAGES $(MKD) $(VIMRUNTIME)\lang\%%l\LC_MESSAGES
142160
FOR %%l IN ($(LANGUAGES)) DO @$(CP) %%l.mo $(VIMRUNTIME)\lang\%%l\LC_MESSAGES\$(PACKAGE).mo
161+
else
162+
install-all: all
163+
for TARGET in $(LANGUAGES); do \
164+
$(MKD) $(VIMRUNTIME)/lang/$$TARGET/LC_MESSAGES ; \
165+
$(CP) $$TARGET.mo $(VIMRUNTIME)/lang/$$TARGET/LC_MESSAGES/$(PACKAGE).mo ; \
166+
done
167+
endif
143168

144169
clean:
145170
$(RM) *.mo

src/po/Make_mvc.mak

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ INSTALLDIR = $(VIMRUNTIME)\lang\$(LANGUAGE)\LC_MESSAGES
117117
all: $(MOFILES)
118118

119119
files:
120-
$(LS) $(LSFLAGS) ..\*.c ..\if_perl.xs ..\globals.h > .\files
120+
$(LS) $(LSFLAGS) ..\*.c ..\if_perl.xs ..\GvimExt\gvimext.cpp ..\globals.h ..\if_py_both.h > .\files
121121

122122
first_time: files
123123
set OLD_PO_FILE_INPUT=yes

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -761,6 +761,8 @@ static char *(features[]) =
761761

762762
static int included_patches[] =
763763
{ /* Add new patch number below this line */
764+
/**/
765+
1252,
764766
/**/
765767
1251,
766768
/**/

0 commit comments

Comments
 (0)