mirror of
				https://github.com/vim/vim.git
				synced 2025-11-03 09:44:48 -05:00 
			
		
		
		
	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)
This commit is contained in:
		@@ -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
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -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) \
 | 
			
		||||
 
 | 
			
		||||
@@ -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) \
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 
 | 
			
		||||
@@ -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)
 | 
			
		||||
 
 | 
			
		||||
@@ -695,6 +695,8 @@ static char *(features[]) =
 | 
			
		||||
 | 
			
		||||
static int included_patches[] =
 | 
			
		||||
{   /* Add new patch number below this line */
 | 
			
		||||
/**/
 | 
			
		||||
    1574,
 | 
			
		||||
/**/
 | 
			
		||||
    1573,
 | 
			
		||||
/**/
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user