0
0
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00

patch 8.1.0610: MS-Windows ctags file list differs from Unix

Problem:    MS-Windows ctags file list differs from Unix.
Solution:   Define TAGS_FILES in the common makefile. (partly by Ken Takata)
This commit is contained in:
Bram Moolenaar
2018-12-19 21:05:57 +01:00
parent 9d5c84a08f
commit 6dc6703295
5 changed files with 20 additions and 16 deletions

View File

@@ -1,5 +1,5 @@
#
# Common Makefile, defines the list of tests to run.
# Common Makefile, defines the list of tests to run and other things.
#
# Individual tests, including the ones part of test_alot.
@@ -210,3 +210,15 @@ NEW_TESTS = \
test_alot_latin \
test_alot_utf8 \
test_alot
# Argument for running ctags.
TAGS_FILES = \
*.c \
*.cpp \
*.h \
auto/*.c \
libvterm/src/*.c \
libvterm/src/*.h \
libvterm/include/*.h \
xdiff/*.c \
xdiff/*.h

View File

@@ -983,11 +983,7 @@ GvimExt/gvimext.dll: GvimExt/gvimext.cpp GvimExt/gvimext.rc GvimExt/gvimext.h
$(MAKE) -C GvimExt -f Make_ming.mak CROSS=$(CROSS) CROSS_COMPILE=$(CROSS_COMPILE) CXX='$(CXX)' STATIC_STDCPLUS=$(STATIC_STDCPLUS)
tags: notags
$(CTAGS) *.c *.cpp *.h
ifdef PERL
$(CTAGS) --append=yes auto$(DIRSLASH)if_perl.c
endif
$(CTAGS) $(TAGS_FILES)
notags:
-$(DEL) tags

View File

@@ -1270,8 +1270,7 @@ GvimExt/gvimext.dll: GvimExt/gvimext.cpp GvimExt/gvimext.rc GvimExt/gvimext.h
tags: notags
$(CTAGS) *.c *.cpp *.h
if exist auto\if_perl.c $(CTAGS) --append=yes auto\if_perl.c
$(CTAGS) $(TAGS_FILES)
notags:
- if exist tags del tags

View File

@@ -1573,8 +1573,6 @@ include Make_all.mak
# ALL_GUI_SRC: all GUI files for Unix
#
# SRC: files used for current configuration
# TAGS_SRC: source files used for make tags
# TAGS_INCL: include files used for make tags
# ALL_SRC: source files used for make depend and make lint
BASIC_SRC = \
@@ -1656,9 +1654,6 @@ SRC = $(BASIC_SRC) \
$(WORKSHOP_SRC) \
$(WSDEBUG_SRC)
TAGS_SRC = *.c *.cpp $(PERL_SRC) $(TERM_SRC) $(XDIFF_SRC)
TAGS_INCL = *.h $(TERM_DEPS) $(XDIFF_INCL)
EXTRA_SRC = hangulin.c if_lua.c if_mzsch.c auto/if_perl.c if_perlsfio.c \
if_python.c if_python3.c if_tcl.c if_ruby.c \
gui_beval.c workshop.c wsdebug.c integration.c \
@@ -2094,12 +2089,12 @@ notags:
# Motif and Athena GUI
# You can ignore error messages for missing files.
tags TAGS: notags
$(TAGPRG) $(TAGS_SRC) $(TAGS_INCL)
$(TAGPRG) $(TAGS_FILES)
# Make a highlight file for types. Requires Exuberant ctags and awk
types: types.vim
types.vim: $(TAGS_SRC) $(TAGS_INCL)
ctags --c-kinds=gstu -o- $(TAGS_SRC) $(TAGS_INCL) |\
types.vim: $(TAGS_FILES)
ctags --c-kinds=gstu -o- $(TAGS_FILES) |\
awk 'BEGIN{printf("syntax keyword Type\t")}\
{printf("%s ", $$1)}END{print ""}' > $@
echo "syn keyword Constant OK FAIL TRUE FALSE MAYBE" >> $@

View File

@@ -799,6 +799,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
610,
/**/
609,
/**/