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 #12426)

diff --git a/src/po/Make_all.mak b/src/po/Make_all.mak
index 89cbb151bba40f57eb717b9c584e095783f31fa9..7a6144e64c95acddfe3fcf062ddfa5f505057751 100644 (file)
--- 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
+

diff --git a/src/po/Make_cyg.mak b/src/po/Make_cyg.mak
index 0fe7f92952eeb140c09cb6931055494e3c442b9c..2969d1e872b621bc94889484b4c4190c3c8992cf 100644 (file)
--- 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) \

diff --git a/src/po/Make_ming.mak b/src/po/Make_ming.mak
index 5e9428f6474f91ee56fb0f21e27114d6ec5ed920..1912bc51ad0b05e4dab27de121fad07e536fdf6a 100644 (file)
--- 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) \

diff --git a/src/po/Make_mvc.mak b/src/po/Make_mvc.mak
index 801a43694f99345f8ba4d8193fd4a4e748090428..bdb6dcce49a90f8c61d7dffa9fc39beb0ff1feb2 100644 (file)
--- 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 @@ $(PACKAGE).pot: 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

diff --git a/src/po/Makefile b/src/po/Makefile
index fbe474b949c28027f847a38cb5f20cfc0d2225e5..2b17fead3871ebb1ac2d76b5588869d88b513138 100644 (file)
--- 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)

diff --git a/src/version.c b/src/version.c
index c07afca3b7be4d037a92796e8e8320c012cca9f7..9ea324fea04e48763e006c08fd807de6fde623db 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -695,6 +695,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1574,
 /**/
     1573,
 /**/