aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-30 04:44:14 -04:00
Code Activity

patch 7.4.992

Browse Source 
Problem:    Makefiles for MS-Windows in src/po are outdated.
Solution:   Make them work. (Ken Takata, Taro Muraoka)
This commit is contained in:
Bram Moolenaar
2015-12-29 16:04:42 +01:00
parent 096c8bb40d
commit 013806229a
6 changed files with 105 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/po/Make_cyg.mak
View File

@@ -12,7 +12,8 @@ ifndef VIMRUNTIME
VIMRUNTIME = ../../runtime VIMRUNTIME = ../../runtime
endif endif
LANGUAGES = af \ LANGUAGES = \
af \
ca \ ca \
cs \ cs \
cs.cp1250 \ cs.cp1250 \
@@ -25,12 +26,16 @@ LANGUAGES = af \
ga \ ga \
it \ it \
ja \ ja \
ja.euc-jp \
ja.sjis \ ja.sjis \
ko \ ko \
ko.UTF-8 \ ko.UTF-8 \
nb \
nl \
no \ no \
pl \ pl \
pl.cp1250 \ pl.cp1250 \
pl.UTF-8 \
pt_BR \ pt_BR \
ru \ ru \
ru.cp1251 \ ru.cp1251 \
@@ -41,12 +46,13 @@ LANGUAGES = af \
uk.cp1251 \ uk.cp1251 \
vi \ vi \
zh_CN \ zh_CN \
zh_CN.UTF-8 \
zh_CN.cp936 \ zh_CN.cp936 \
zh_CN.UTF-8 \
zh_TW \ zh_TW \
zh_TW.UTF-8 \ zh_TW.UTF-8 \
MOFILES = af.mo \ MOFILES = \
af.mo \
ca.mo \ ca.mo \
cs.cp1250.mo \ cs.cp1250.mo \
cs.mo \ cs.mo \
@@ -58,13 +64,17 @@ MOFILES = af.mo \
fr.mo \ fr.mo \
ga.mo \ ga.mo \
it.mo \ it.mo \
ja.euc-jp.mo \
ja.mo \ ja.mo \
ja.sjis.mo \ ja.sjis.mo \
ko.mo \ ko.mo \
ko.UTF-8.mo \ ko.UTF-8.mo \
nb.mo \
nl.mo \
no.mo \ no.mo \
pl.cp1250.mo \ pl.cp1250.mo \
pl.mo \ pl.mo \
pl.UTF-8.mo \
pt_BR.mo \ pt_BR.mo \
ru.cp1251.mo \ ru.cp1251.mo \
ru.mo \ ru.mo \
@@ -74,11 +84,11 @@ MOFILES = af.mo \
uk.cp1251.mo \ uk.cp1251.mo \
uk.mo \ uk.mo \
vi.mo \ vi.mo \
zh_CN.UTF-8.mo \
zh_CN.cp936.mo \
zh_CN.mo \ zh_CN.mo \
zh_TW.UTF-8.mo \ zh_CN.cp936.mo \
zh_CN.UTF-8.mo \
zh_TW.mo \ zh_TW.mo \
zh_TW.UTF-8.mo \
PACKAGE = vim PACKAGE = vim
@@ -135,6 +145,8 @@ install: $(MOFILES)
$(CP) $$TARGET.mo $(VIMRUNTIME)/lang/$$TARGET/LC_MESSAGES/$(PACKAGE).mo ; \ $(CP) $$TARGET.mo $(VIMRUNTIME)/lang/$$TARGET/LC_MESSAGES/$(PACKAGE).mo ; \
done done
install-all: install
clean: clean:
$(RM) *.mo $(RM) *.mo
$(RM) *.pot $(RM) *.pot

45
src/po/Make_ming.mak
View File

@@ -10,10 +10,15 @@
# language (xx) and add it to the next three lines. # language (xx) and add it to the next three lines.
# #
ifndef VIMRUNTIME
VIMRUNTIME = ..\..\runtime
endif
LANGUAGES = \ LANGUAGES = \
af \ af \
ca \ ca \
cs \ cs \
cs.cp1250 \
de \ de \
en_GB \ en_GB \
eo \ eo \
@@ -23,23 +28,35 @@ LANGUAGES = \
ga \ ga \
it \ it \
ja \ ja \
ja.euc-jp \
ja.sjis \
ko \ ko \
ko.UTF-8 \
nb \
nl \
no \ no \
pl \ pl \
pl.cp1250 \
pl.UTF-8 \
pt_BR \ pt_BR \
ru \ ru \
ru.cp1251 \
sk \ sk \
sk.cp1250 \
sv \ sv \
uk \ uk \
uk.cp1251 \
vi \ vi \
zh_CN \ zh_CN \
zh_CN.UTF-8\ zh_CN.cp936 \
zh_CN.UTF-8 \
zh_TW \ zh_TW \
zh_TW.UTF-8 \ zh_TW.UTF-8 \
MOFILES = \ MOFILES = \
af.mo \ af.mo \
ca.mo \ ca.mo \
cs.cp1250.mo \
cs.mo \ cs.mo \
de.mo \ de.mo \
en_GB.mo \ en_GB.mo \
@@ -49,20 +66,31 @@ MOFILES = \
fr.mo \ fr.mo \
ga.mo \ ga.mo \
it.mo \ it.mo \
ja.euc-jp.mo \
ja.mo \ ja.mo \
ja.sjis.mo \
ko.mo \ ko.mo \
ko.UTF-8.mo \
nb.mo \
nl.mo \
no.mo \ no.mo \
pl.cp1250.mo \
pl.mo \ pl.mo \
pl.UTF-8.mo \
pt_BR.mo \ pt_BR.mo \
ru.cp1251.mo \
ru.mo \ ru.mo \
sk.cp1250.mo \
sk.mo \ sk.mo \
sv.mo \ sv.mo \
uk.cp1251.mo \
uk.mo \ uk.mo \
vi.mo \ vi.mo \
zh_CN.UTF-8.mo \
zh_CN.mo \ zh_CN.mo \
zh_TW.UTF-8.mo \ zh_CN.cp936.mo \
zh_CN.UTF-8.mo \
zh_TW.mo \ zh_TW.mo \
zh_TW.UTF-8.mo \
PACKAGE = vim PACKAGE = vim
@@ -72,9 +100,9 @@ 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/
MSGFMT = $(GETTEXT_PATH)msgfmt MSGFMT = set OLD_PO_FILE_INPUT=yes && $(GETTEXT_PATH)msgfmt -v
XGETTEXT = $(GETTEXT_PATH)xgettext XGETTEXT = set OLD_PO_FILE_INPUT=yes && set OLD_PO_FILE_OUTPUT=yes && $(GETTEXT_PATH)xgettext
MSGMERGE = $(GETTEXT_PATH)msgmerge MSGMERGE = set OLD_PO_FILE_INPUT=yes && set OLD_PO_FILE_OUTPUT=yes && $(GETTEXT_PATH)msgmerge
MV = move MV = move
CP = copy CP = copy
@@ -108,6 +136,11 @@ 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
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
clean: clean:
$(RM) *.mo $(RM) *.mo
$(RM) *.pot $(RM) *.pot

43
src/po/Make_mvc.mak
View File

@@ -6,10 +6,15 @@
# Please read README_mvc.txt before using this file. # Please read README_mvc.txt before using this file.
# #
!ifndef VIMRUNTIME
VIMRUNTIME = ..\..\runtime
!endif
LANGUAGES = \ LANGUAGES = \
af \ af \
ca \ ca \
cs \ cs \
cs.cp1250 \
de \ de \
en_GB \ en_GB \
eo \ eo \
@@ -19,16 +24,27 @@ LANGUAGES = \
ga \ ga \
it \ it \
ja \ ja \
ja.euc-jp \
ja.sjis \
ko \ ko \
ko.UTF-8 \
nb \
nl \
no \ no \
pl \ pl \
pl.cp1250 \
pl.UTF-8 \
pt_BR \ pt_BR \
ru \ ru \
ru.cp1251 \
sk \ sk \
sk.cp1250 \
sv \ sv \
uk \ uk \
uk.cp1251 \
vi \ vi \
zh_CN \ zh_CN \
zh_CN.cp936 \
zh_CN.UTF-8 \ zh_CN.UTF-8 \
zh_TW \ zh_TW \
zh_TW.UTF-8 \ zh_TW.UTF-8 \
@@ -36,6 +52,7 @@ LANGUAGES = \
MOFILES = \ MOFILES = \
af.mo \ af.mo \
ca.mo \ ca.mo \
cs.cp1250.mo \
cs.mo \ cs.mo \
de.mo \ de.mo \
en_GB.mo \ en_GB.mo \
@@ -45,27 +62,38 @@ MOFILES = \
fr.mo \ fr.mo \
ga.mo \ ga.mo \
it.mo \ it.mo \
ja.euc-jp.mo \
ja.mo \ ja.mo \
ja.sjis.mo \
ko.mo \ ko.mo \
ko.UTF-8.mo \
nb.mo \
nl.mo \
no.mo \ no.mo \
pl.cp1250.mo \
pl.mo \ pl.mo \
pl.UTF-8.mo \
pt_BR.mo \ pt_BR.mo \
ru.cp1251.mo \
ru.mo \ ru.mo \
sk.cp1250.mo \
sk.mo \ sk.mo \
sv.mo \ sv.mo \
uk.cp1251.mo \
uk.mo \ uk.mo \
vi.mo \ vi.mo \
zh_CN.UTF-8.mo \
zh_CN.mo \ zh_CN.mo \
zh_TW.UTF-8.mo \ zh_CN.cp936.mo \
zh_CN.UTF-8.mo \
zh_TW.mo \ zh_TW.mo \
zh_TW.UTF-8.mo \
PACKAGE = vim PACKAGE = vim
# Correct the following line for the directory where gettext et al is installed # Correct the following line for the directory where gettext et al is installed
GETTEXT_PATH = H:\gettext.0.14.4\bin GETTEXT_PATH = H:\gettext.0.14.4\bin
MSGFMT = $(GETTEXT_PATH)\msgfmt MSGFMT = $(GETTEXT_PATH)\msgfmt -v
XGETTEXT = $(GETTEXT_PATH)\xgettext XGETTEXT = $(GETTEXT_PATH)\xgettext
MSGMERGE = $(GETTEXT_PATH)\msgmerge MSGMERGE = $(GETTEXT_PATH)\msgmerge
@@ -83,6 +111,7 @@ INSTALLDIR = $(VIMRUNTIME)\lang\$(LANGUAGE)\LC_MESSAGES
.SUFFIXES: .po .mo .pot .SUFFIXES: .po .mo .pot
.po.mo: .po.mo:
set OLD_PO_FILE_INPUT=yes
$(MSGFMT) -o $@ $< $(MSGFMT) -o $@ $<
all: $(MOFILES) all: $(MOFILES)
@@ -91,9 +120,13 @@ files:
$(LS) $(LSFLAGS) ..\*.c ..\if_perl.xs ..\globals.h > .\files $(LS) $(LSFLAGS) ..\*.c ..\if_perl.xs ..\globals.h > .\files
first_time: files first_time: files
set OLD_PO_FILE_INPUT=yes
set OLD_PO_FILE_OUTPUT=yes
$(XGETTEXT) --default-domain=$(LANGUAGE) --add-comments --keyword=_ --keyword=N_ --files-from=.\files $(XGETTEXT) --default-domain=$(LANGUAGE) --add-comments --keyword=_ --keyword=N_ --files-from=.\files
$(LANGUAGES): files $(LANGUAGES): files
set OLD_PO_FILE_INPUT=yes
set OLD_PO_FILE_OUTPUT=yes
$(XGETTEXT) --default-domain=$(PACKAGE) --add-comments --keyword=_ --keyword=N_ --files-from=.\files $(XGETTEXT) --default-domain=$(PACKAGE) --add-comments --keyword=_ --keyword=N_ --files-from=.\files
$(MV) $(PACKAGE).po $(PACKAGE).pot $(MV) $(PACKAGE).po $(PACKAGE).pot
$(CP) $@.po $@.po.orig $(CP) $@.po $@.po.orig
@@ -105,6 +138,10 @@ install:
if not exist $(INSTALLDIR) $(MKD) $(INSTALLDIR) if not exist $(INSTALLDIR) $(MKD) $(INSTALLDIR)
$(CP) $(LANGUAGE).mo $(INSTALLDIR)\$(PACKAGE).mo $(CP) $(LANGUAGE).mo $(INSTALLDIR)\$(PACKAGE).mo
install-all: all
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
clean: clean:
$(RM) *.mo $(RM) *.mo
$(RM) *.pot $(RM) *.pot

3
src/po/README_mingw.txt
View File

@@ -86,6 +86,9 @@ the same as in the Unix case, only the commands change):
This will create the xx\LC_MESSAGES directory (if it does not exist) and This will create the xx\LC_MESSAGES directory (if it does not exist) and
will copy vim.po to it. will copy vim.po to it.
You can also use the following command to install all languages:
make -f Make_ming.mak install-all
(6) Another extra step ;-)). The command: (6) Another extra step ;-)). The command:

3
src/po/README_mvc.txt
View File

@@ -111,6 +111,9 @@ Install your translation with the following command:
This will create the xx\LC_MESSAGES directory in runtime\lang if it does not This will create the xx\LC_MESSAGES directory in runtime\lang if it does not
already exist. already exist.
You can also use the following command to install all languages:
nmake -f make_mvc.mak install-all
vim:tw=78: vim:tw=78:

2
src/version.c
View File

@@ -741,6 +741,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 */
/**/
992,
/**/ /**/
991, 991,
/**/ /**/