Skip to content

Commit 0138062

Browse files
brammoolbrammool
committed
patch 7.4.992
Problem: Makefiles for MS-Windows in src/po are outdated. Solution: Make them work. (Ken Takata, Taro Muraoka)
1 parent 096c8bb commit 0138062

6 files changed

Lines changed: 105 additions & 15 deletions

File tree

‎src/po/Make_cyg.mak‎

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ ifndef VIMRUNTIME
1212
VIMRUNTIME = ../../runtime
1313
endif
1414

15-
LANGUAGES = af \
15+
LANGUAGES = \
16+
af \
1617
ca \
1718
cs \
1819
cs.cp1250 \
@@ -25,12 +26,16 @@ LANGUAGES = af \
2526
ga \
2627
it \
2728
ja \
29+
ja.euc-jp \
2830
ja.sjis \
2931
ko \
3032
ko.UTF-8 \
33+
nb \
34+
nl \
3135
no \
3236
pl \
3337
pl.cp1250 \
38+
pl.UTF-8 \
3439
pt_BR \
3540
ru \
3641
ru.cp1251 \
@@ -41,12 +46,13 @@ LANGUAGES = af \
4146
uk.cp1251 \
4247
vi \
4348
zh_CN \
44-
zh_CN.UTF-8 \
4549
zh_CN.cp936 \
50+
zh_CN.UTF-8 \
4651
zh_TW \
4752
zh_TW.UTF-8 \
4853

49-
MOFILES = af.mo \
54+
MOFILES = \
55+
af.mo \
5056
ca.mo \
5157
cs.cp1250.mo \
5258
cs.mo \
@@ -58,13 +64,17 @@ MOFILES = af.mo \
5864
fr.mo \
5965
ga.mo \
6066
it.mo \
67+
ja.euc-jp.mo \
6168
ja.mo \
6269
ja.sjis.mo \
6370
ko.mo \
6471
ko.UTF-8.mo \
72+
nb.mo \
73+
nl.mo \
6574
no.mo \
6675
pl.cp1250.mo \
6776
pl.mo \
77+
pl.UTF-8.mo \
6878
pt_BR.mo \
6979
ru.cp1251.mo \
7080
ru.mo \
@@ -74,11 +84,11 @@ MOFILES = af.mo \
7484
uk.cp1251.mo \
7585
uk.mo \
7686
vi.mo \
77-
zh_CN.UTF-8.mo \
78-
zh_CN.cp936.mo \
7987
zh_CN.mo \
80-
zh_TW.UTF-8.mo \
88+
zh_CN.cp936.mo \
89+
zh_CN.UTF-8.mo \
8190
zh_TW.mo \
91+
zh_TW.UTF-8.mo \
8292

8393
PACKAGE = vim
8494

@@ -135,6 +145,8 @@ install: $(MOFILES)
135145
$(CP) $$TARGET.mo $(VIMRUNTIME)/lang/$$TARGET/LC_MESSAGES/$(PACKAGE).mo ; \
136146
done
137147

148+
install-all: install
149+
138150
clean:
139151
$(RM) *.mo
140152
$(RM) *.pot

‎src/po/Make_ming.mak‎

Lines changed: 39 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,15 @@
1010
# language (xx) and add it to the next three lines.
1111
#
1212

13+
ifndef VIMRUNTIME
14+
VIMRUNTIME = ..\..\runtime
15+
endif
16+
1317
LANGUAGES = \
1418
af \
1519
ca \
1620
cs \
21+
cs.cp1250 \
1722
de \
1823
en_GB \
1924
eo \
@@ -23,23 +28,35 @@ LANGUAGES = \
2328
ga \
2429
it \
2530
ja \
31+
ja.euc-jp \
32+
ja.sjis \
2633
ko \
34+
ko.UTF-8 \
35+
nb \
36+
nl \
2737
no \
2838
pl \
39+
pl.cp1250 \
40+
pl.UTF-8 \
2941
pt_BR \
3042
ru \
43+
ru.cp1251 \
3144
sk \
45+
sk.cp1250 \
3246
sv \
3347
uk \
48+
uk.cp1251 \
3449
vi \
3550
zh_CN \
36-
zh_CN.UTF-8\
51+
zh_CN.cp936 \
52+
zh_CN.UTF-8 \
3753
zh_TW \
3854
zh_TW.UTF-8 \
3955

4056
MOFILES = \
4157
af.mo \
4258
ca.mo \
59+
cs.cp1250.mo \
4360
cs.mo \
4461
de.mo \
4562
en_GB.mo \
@@ -49,20 +66,31 @@ MOFILES = \
4966
fr.mo \
5067
ga.mo \
5168
it.mo \
69+
ja.euc-jp.mo \
5270
ja.mo \
71+
ja.sjis.mo \
5372
ko.mo \
73+
ko.UTF-8.mo \
74+
nb.mo \
75+
nl.mo \
5476
no.mo \
77+
pl.cp1250.mo \
5578
pl.mo \
79+
pl.UTF-8.mo \
5680
pt_BR.mo \
81+
ru.cp1251.mo \
5782
ru.mo \
83+
sk.cp1250.mo \
5884
sk.mo \
5985
sv.mo \
86+
uk.cp1251.mo \
6087
uk.mo \
6188
vi.mo \
62-
zh_CN.UTF-8.mo \
6389
zh_CN.mo \
64-
zh_TW.UTF-8.mo \
90+
zh_CN.cp936.mo \
91+
zh_CN.UTF-8.mo \
6592
zh_TW.mo \
93+
zh_TW.UTF-8.mo \
6694

6795
PACKAGE = vim
6896

@@ -72,9 +100,9 @@ PACKAGE = vim
72100
#GETTEXT_PATH = C:/gettext-0.10.35-w32/win32/Release/
73101
#GETTEXT_PATH = C:/cygwin/bin/
74102

75-
MSGFMT = $(GETTEXT_PATH)msgfmt
76-
XGETTEXT = $(GETTEXT_PATH)xgettext
77-
MSGMERGE = $(GETTEXT_PATH)msgmerge
103+
MSGFMT = set OLD_PO_FILE_INPUT=yes && $(GETTEXT_PATH)msgfmt -v
104+
XGETTEXT = set OLD_PO_FILE_INPUT=yes && set OLD_PO_FILE_OUTPUT=yes && $(GETTEXT_PATH)xgettext
105+
MSGMERGE = set OLD_PO_FILE_INPUT=yes && set OLD_PO_FILE_OUTPUT=yes && $(GETTEXT_PATH)msgmerge
78106

79107
MV = move
80108
CP = copy
@@ -108,6 +136,11 @@ install:
108136
$(MKD) $(VIMRUNTIME)\lang\$(LANGUAGE)\LC_MESSAGES
109137
$(CP) $(LANGUAGE).mo $(VIMRUNTIME)\lang\$(LANGUAGE)\LC_MESSAGES\$(PACKAGE).mo
110138

139+
install-all: all
140+
FOR %%l IN ($(LANGUAGES)) DO @IF NOT EXIST $(VIMRUNTIME)\lang\%%l $(MKD) $(VIMRUNTIME)\lang\%%l
141+
FOR %%l IN ($(LANGUAGES)) DO @IF NOT EXIST $(VIMRUNTIME)\lang\%%l\LC_MESSAGES $(MKD) $(VIMRUNTIME)\lang\%%l\LC_MESSAGES
142+
FOR %%l IN ($(LANGUAGES)) DO @$(CP) %%l.mo $(VIMRUNTIME)\lang\%%l\LC_MESSAGES\$(PACKAGE).mo
143+
111144
clean:
112145
$(RM) *.mo
113146
$(RM) *.pot

‎src/po/Make_mvc.mak‎

Lines changed: 40 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,15 @@
66
# Please read README_mvc.txt before using this file.
77
#
88

9+
!ifndef VIMRUNTIME
10+
VIMRUNTIME = ..\..\runtime
11+
!endif
12+
913
LANGUAGES = \
1014
af \
1115
ca \
1216
cs \
17+
cs.cp1250 \
1318
de \
1419
en_GB \
1520
eo \
@@ -19,23 +24,35 @@ LANGUAGES = \
1924
ga \
2025
it \
2126
ja \
27+
ja.euc-jp \
28+
ja.sjis \
2229
ko \
30+
ko.UTF-8 \
31+
nb \
32+
nl \
2333
no \
2434
pl \
35+
pl.cp1250 \
36+
pl.UTF-8 \
2537
pt_BR \
2638
ru \
39+
ru.cp1251 \
2740
sk \
41+
sk.cp1250 \
2842
sv \
2943
uk \
44+
uk.cp1251 \
3045
vi \
3146
zh_CN \
47+
zh_CN.cp936 \
3248
zh_CN.UTF-8 \
3349
zh_TW \
3450
zh_TW.UTF-8 \
3551

3652
MOFILES = \
3753
af.mo \
3854
ca.mo \
55+
cs.cp1250.mo \
3956
cs.mo \
4057
de.mo \
4158
en_GB.mo \
@@ -45,27 +62,38 @@ MOFILES = \
4562
fr.mo \
4663
ga.mo \
4764
it.mo \
65+
ja.euc-jp.mo \
4866
ja.mo \
67+
ja.sjis.mo \
4968
ko.mo \
69+
ko.UTF-8.mo \
70+
nb.mo \
71+
nl.mo \
5072
no.mo \
73+
pl.cp1250.mo \
5174
pl.mo \
75+
pl.UTF-8.mo \
5276
pt_BR.mo \
77+
ru.cp1251.mo \
5378
ru.mo \
79+
sk.cp1250.mo \
5480
sk.mo \
5581
sv.mo \
82+
uk.cp1251.mo \
5683
uk.mo \
5784
vi.mo \
58-
zh_CN.UTF-8.mo \
5985
zh_CN.mo \
60-
zh_TW.UTF-8.mo \
86+
zh_CN.cp936.mo \
87+
zh_CN.UTF-8.mo \
6188
zh_TW.mo \
89+
zh_TW.UTF-8.mo \
6290

6391
PACKAGE = vim
6492

6593
# Correct the following line for the directory where gettext et al is installed
6694
GETTEXT_PATH = H:\gettext.0.14.4\bin
6795

68-
MSGFMT = $(GETTEXT_PATH)\msgfmt
96+
MSGFMT = $(GETTEXT_PATH)\msgfmt -v
6997
XGETTEXT = $(GETTEXT_PATH)\xgettext
7098
MSGMERGE = $(GETTEXT_PATH)\msgmerge
7199

@@ -83,6 +111,7 @@ INSTALLDIR = $(VIMRUNTIME)\lang\$(LANGUAGE)\LC_MESSAGES
83111
.SUFFIXES: .po .mo .pot
84112

85113
.po.mo:
114+
set OLD_PO_FILE_INPUT=yes
86115
$(MSGFMT) -o $@ $<
87116

88117
all: $(MOFILES)
@@ -91,9 +120,13 @@ files:
91120
$(LS) $(LSFLAGS) ..\*.c ..\if_perl.xs ..\globals.h > .\files
92121

93122
first_time: files
123+
set OLD_PO_FILE_INPUT=yes
124+
set OLD_PO_FILE_OUTPUT=yes
94125
$(XGETTEXT) --default-domain=$(LANGUAGE) --add-comments --keyword=_ --keyword=N_ --files-from=.\files
95126

96127
$(LANGUAGES): files
128+
set OLD_PO_FILE_INPUT=yes
129+
set OLD_PO_FILE_OUTPUT=yes
97130
$(XGETTEXT) --default-domain=$(PACKAGE) --add-comments --keyword=_ --keyword=N_ --files-from=.\files
98131
$(MV) $(PACKAGE).po $(PACKAGE).pot
99132
$(CP) $@.po $@.po.orig
@@ -105,6 +138,10 @@ install:
105138
if not exist $(INSTALLDIR) $(MKD) $(INSTALLDIR)
106139
$(CP) $(LANGUAGE).mo $(INSTALLDIR)\$(PACKAGE).mo
107140

141+
install-all: all
142+
FOR %%l IN ($(LANGUAGES)) DO @IF NOT EXIST $(VIMRUNTIME)\lang\%%l\LC_MESSAGES $(MKD) $(VIMRUNTIME)\lang\%%l\LC_MESSAGES
143+
FOR %%l IN ($(LANGUAGES)) DO @$(CP) %%l.mo $(VIMRUNTIME)\lang\%%l\LC_MESSAGES\$(PACKAGE).mo
144+
108145
clean:
109146
$(RM) *.mo
110147
$(RM) *.pot

‎src/po/README_mingw.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,9 @@ the same as in the Unix case, only the commands change):
8686

8787
This will create the xx\LC_MESSAGES directory (if it does not exist) and
8888
will copy vim.po to it.
89+
You can also use the following command to install all languages:
90+
91+
make -f Make_ming.mak install-all
8992

9093
(6) Another extra step ;-)). The command:
9194

‎src/po/README_mvc.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,9 @@ Install your translation with the following command:
111111

112112
This will create the xx\LC_MESSAGES directory in runtime\lang if it does not
113113
already exist.
114+
You can also use the following command to install all languages:
115+
116+
nmake -f make_mvc.mak install-all
114117

115118

116119
vim:tw=78:

‎src/version.c‎

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

742742
static int included_patches[] =
743743
{ /* Add new patch number below this line */
744+
/**/
745+
992,
744746
/**/
745747
991,
746748
/**/

0 commit comments

Comments
 (0)