Mercurial > vim
changeset 32485:2fc568b082ef v9.0.1574
patch 9.0.1574: MS-Windows: list of translation input files incomplete
Commit: https://github.com/vim/vim/commit/167fb6d39b23e0967dabc523ce190e7447114e69
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue May 23 15:27:51 2023 +0100
patch 9.0.1574: MS-Windows: list of translation input files incomplete
Problem: MS-Windows: list of translation input files incomplete.
Solution: Move the list of files to a common file. (closes https://github.com/vim/vim/issues/12426)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Tue, 23 May 2023 16:30:04 +0200 |
| parents | 13063b80f88a |
| children | 856f7bfbdc4e |
| files | src/po/Make_all.mak src/po/Make_cyg.mak src/po/Make_ming.mak src/po/Make_mvc.mak src/po/Makefile src/version.c |
| diffstat | 6 files changed, 16 insertions(+), 33 deletions(-) [+] |
line wrap: on
line diff
--- a/src/po/Make_all.mak +++ b/src/po/Make_all.mak @@ -180,3 +180,11 @@ CHECKFILES = \ zh_TW.UTF-8.ck \ zh_TW.ck \ +PO_VIM_INPUTLIST = \ + ../../runtime/optwin.vim \ + ../../runtime/defaults.vim + +PO_VIM_JSLIST = \ + optwin.js \ + defaults.js +
--- a/src/po/Make_cyg.mak +++ b/src/po/Make_cyg.mak @@ -63,12 +63,6 @@ PO_INPUTLIST = \ gvim.desktop.in \ vim.desktop.in -PO_VIM_INPUTLIST = \ - ../../runtime/optwin.vim - -PO_VIM_JSLIST = \ - optwin.js - first_time: $(PO_INPUTLIST) $(PO_VIM_INPUTLIST) $(VIM) -u NONE --not-a-term -S tojavascript.vim $(LANGUAGE).pot $(PO_VIM_INPUTLIST) $(XGETTEXT) --default-domain=$(LANGUAGE) \
--- a/src/po/Make_ming.mak +++ b/src/po/Make_ming.mak @@ -18,7 +18,7 @@ VIMRUNTIME = ../../runtime endif endif -# get LANGUAGES, MOFILES and MOCONVERTED +# get LANGUAGES, MOFILES, MOCONVERTED and others include Make_all.mak PACKAGE = vim @@ -76,12 +76,6 @@ PO_INPUTLIST = \ gvim.desktop.in \ vim.desktop.in -PO_VIM_INPUTLIST = \ - ../../runtime/optwin.vim - -PO_VIM_JSLIST = \ - optwin.js - first_time: $(PO_INPUTLIST) $(PO_VIM_INPUTLIST) $(VIM) -u NONE --not-a-term -S tojavascript.vim $(LANGUAGE).pot $(PO_VIM_INPUTLIST) $(XGETTEXT) --default-domain=$(LANGUAGE) \
--- a/src/po/Make_mvc.mak +++ b/src/po/Make_mvc.mak @@ -10,7 +10,7 @@ VIMRUNTIME = ..\..\runtime !endif -# get LANGUAGES, MOFILES and MOCONVERTED +# get LANGUAGES, MOFILES, MOCONVERTED and others !include Make_all.mak PACKAGE = vim @@ -53,21 +53,14 @@ PO_INPUTLIST = \ gvim.desktop.in \ vim.desktop.in -PO_VIM_INPUTLIST = \ - ..\..\runtime\optwin.vim - -PO_VIM_JSLIST = \ - optwin.js - -files: $(PO_INPUTLIST) $(PO_VIM_INPUTLIST) +files: $(PO_INPUTLIST) $(LS) $(LSFLAGS) $(PO_INPUTLIST) > .\files - echo $(PO_VIM_JSLIST)>> .\files first_time: files $(VIM) -u NONE --not-a-term -S tojavascript.vim $(LANGUAGE).pot $(PO_VIM_INPUTLIST) set OLD_PO_FILE_INPUT=yes set OLD_PO_FILE_OUTPUT=yes - $(XGETTEXT) --default-domain=$(LANGUAGE) --add-comments --keyword=_ --keyword=N_ --keyword=NGETTEXT:1,2 --files-from=.\files + $(XGETTEXT) --default-domain=$(LANGUAGE) --add-comments --keyword=_ --keyword=N_ --keyword=NGETTEXT:1,2 --files-from=.\files $(PO_VIM_JSLIST) $(VIM) -u NONE --not-a-term -S fixfilenames.vim $(LANGUAGE).pot $(PO_VIM_INPUTLIST) $(RM) *.js @@ -75,7 +68,7 @@ first_time: files $(VIM) -u NONE --not-a-term -S tojavascript.vim $(PACKAGE).pot $(PO_VIM_INPUTLIST) set OLD_PO_FILE_INPUT=yes set OLD_PO_FILE_OUTPUT=yes - $(XGETTEXT) --default-domain=$(PACKAGE) --add-comments --keyword=_ --keyword=N_ --keyword=NGETTEXT:1,2 --files-from=.\files + $(XGETTEXT) --default-domain=$(PACKAGE) --add-comments --keyword=_ --keyword=N_ --keyword=NGETTEXT:1,2 --files-from=.\files $(PO_VIM_JSLIST) $(MV) $(PACKAGE).po $(PACKAGE).pot $(VIM) -u NONE --not-a-term -S fixfilenames.vim $(PACKAGE).pot $(PO_VIM_INPUTLIST) $(RM) *.js
--- a/src/po/Makefile +++ b/src/po/Makefile @@ -3,7 +3,7 @@ # Include stuff found by configure. include ../auto/config.mk -# get LANGUAGES, MOFILES, MOCONVERTED and CHECKFILES +# get LANGUAGES, MOFILES, MOCONVERTED and others include Make_all.mak # Note: ja.sjis, *.cp1250 and zh_CN.cp936 are only for MS-Windows, they are @@ -203,14 +203,6 @@ PO_INPUTLIST = \ gvim.desktop.in \ vim.desktop.in -PO_VIM_INPUTLIST = \ - ../../runtime/optwin.vim \ - ../../runtime/defaults.vim - -PO_VIM_JSLIST = \ - optwin.js \ - defaults.js - $(PACKAGE).pot: $(PO_INPUTLIST) $(PO_VIM_INPUTLIST) # Convert the Vim scripts to (what looks like) Javascript $(VIM) -u NONE --not-a-term -S tojavascript.vim $(PACKAGE).pot $(PO_VIM_INPUTLIST)