To: vim_dev@googlegroups.com Subject: Patch 9.0.1574 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 9.0.1574 Problem: MS-Windows: list of translation input files incomplete. Solution: Move the list of files to a common file. (closes #12426) Files: src/po/Makefile, src/po/Make_all.mak, src/po/Make_cyg.mak, src/po/Make_ming.mak, src/po/Make_mvc.mak *** ../vim-9.0.1573/src/po/Makefile 2023-05-10 14:47:46.536046589 +0100 --- src/po/Makefile 2023-05-23 15:19:31.262759889 +0100 *************** *** 3,9 **** # Include stuff found by configure. include ../auto/config.mk ! # get LANGUAGES, MOFILES, MOCONVERTED and CHECKFILES include Make_all.mak # Note: ja.sjis, *.cp1250 and zh_CN.cp936 are only for MS-Windows, they are --- 3,9 ---- # Include stuff found by configure. include ../auto/config.mk ! # 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,216 **** 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) --- 203,208 ---- *** ../vim-9.0.1573/src/po/Make_all.mak 2023-03-16 21:01:16.333965399 +0000 --- src/po/Make_all.mak 2023-05-23 15:19:42.406776264 +0100 *************** *** 180,182 **** --- 180,190 ---- zh_TW.UTF-8.ck \ zh_TW.ck \ + PO_VIM_INPUTLIST = \ + ../../runtime/optwin.vim \ + ../../runtime/defaults.vim + + PO_VIM_JSLIST = \ + optwin.js \ + defaults.js + *** ../vim-9.0.1573/src/po/Make_cyg.mak 2020-09-04 12:49:12.000000000 +0100 --- src/po/Make_cyg.mak 2023-05-23 15:26:58.723266975 +0100 *************** *** 63,74 **** 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) \ --- 63,68 ---- *** ../vim-9.0.1573/src/po/Make_ming.mak 2020-09-04 12:49:12.000000000 +0100 --- src/po/Make_ming.mak 2023-05-23 15:20:58.386881641 +0100 *************** *** 18,24 **** endif endif ! # get LANGUAGES, MOFILES and MOCONVERTED include Make_all.mak PACKAGE = vim --- 18,24 ---- endif endif ! # get LANGUAGES, MOFILES, MOCONVERTED and others include Make_all.mak PACKAGE = vim *************** *** 76,87 **** 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) \ --- 76,81 ---- *** ../vim-9.0.1573/src/po/Make_mvc.mak 2020-09-04 12:49:12.000000000 +0100 --- src/po/Make_mvc.mak 2023-05-23 15:21:50.370947894 +0100 *************** *** 10,16 **** VIMRUNTIME = ..\..\runtime !endif ! # get LANGUAGES, MOFILES and MOCONVERTED !include Make_all.mak PACKAGE = vim --- 10,16 ---- VIMRUNTIME = ..\..\runtime !endif ! # get LANGUAGES, MOFILES, MOCONVERTED and others !include Make_all.mak PACKAGE = vim *************** *** 53,73 **** gvim.desktop.in \ vim.desktop.in ! PO_VIM_INPUTLIST = \ ! ..\..\runtime\optwin.vim ! ! PO_VIM_JSLIST = \ ! optwin.js ! ! files: $(PO_INPUTLIST) $(PO_VIM_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 $(VIM) -u NONE --not-a-term -S fixfilenames.vim $(LANGUAGE).pot $(PO_VIM_INPUTLIST) $(RM) *.js --- 53,66 ---- gvim.desktop.in \ vim.desktop.in ! files: $(PO_INPUTLIST) $(LS) $(LSFLAGS) $(PO_INPUTLIST) > .\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 $(PO_VIM_JSLIST) $(VIM) -u NONE --not-a-term -S fixfilenames.vim $(LANGUAGE).pot $(PO_VIM_INPUTLIST) $(RM) *.js *************** *** 75,81 **** $(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 $(MV) $(PACKAGE).po $(PACKAGE).pot $(VIM) -u NONE --not-a-term -S fixfilenames.vim $(PACKAGE).pot $(PO_VIM_INPUTLIST) $(RM) *.js --- 68,74 ---- $(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 $(PO_VIM_JSLIST) $(MV) $(PACKAGE).po $(PACKAGE).pot $(VIM) -u NONE --not-a-term -S fixfilenames.vim $(PACKAGE).pot $(PO_VIM_INPUTLIST) $(RM) *.js *** ../vim-9.0.1573/src/version.c 2023-05-23 14:48:39.108607655 +0100 --- src/version.c 2023-05-23 15:24:54.551151479 +0100 *************** *** 697,698 **** --- 697,700 ---- { /* Add new patch number below this line */ + /**/ + 1574, /**/ -- hundred-and-one symptoms of being an internet addict: 57. You begin to wonder how on earth your service provider is allowed to call 200 hours per month "unlimited." /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// \\\ \\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///