1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
|
To: vim_dev@googlegroups.com
Subject: Patch 8.1.0610
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------
Patch 8.1.0610
Problem: MS-Windows ctags file list differs from Unix.
Solution: Define TAGS_FILES in the common makefile. (partly by Ken Takata)
Files: src/Make_all.mak, src/Makefile, src/Make_mvc.mak,
src/Make_cyg_ming.mak
*** ../vim-8.1.0609/src/Make_all.mak 2018-12-13 22:17:52.869941530 +0100
--- src/Make_all.mak 2018-12-19 21:00:47.826888113 +0100
***************
*** 1,5 ****
#
! # Common Makefile, defines the list of tests to run.
#
# Individual tests, including the ones part of test_alot.
--- 1,5 ----
#
! # Common Makefile, defines the list of tests to run and other things.
#
# Individual tests, including the ones part of test_alot.
***************
*** 210,212 ****
--- 210,224 ----
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
*** ../vim-8.1.0609/src/Makefile 2018-12-15 15:39:25.328984639 +0100
--- src/Makefile 2018-12-19 21:02:16.222281920 +0100
***************
*** 1573,1580 ****
# 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 = \
--- 1575,1580 ----
***************
*** 1656,1664 ****
$(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 \
--- 1656,1661 ----
***************
*** 2094,2105 ****
# Motif and Athena GUI
# You can ignore error messages for missing files.
tags TAGS: notags
! $(TAGPRG) $(TAGS_SRC) $(TAGS_INCL)
# 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) |\
awk 'BEGIN{printf("syntax keyword Type\t")}\
{printf("%s ", $$1)}END{print ""}' > $@
echo "syn keyword Constant OK FAIL TRUE FALSE MAYBE" >> $@
--- 2091,2102 ----
# Motif and Athena GUI
# You can ignore error messages for missing files.
tags TAGS: notags
! $(TAGPRG) $(TAGS_FILES)
# Make a highlight file for types. Requires Exuberant ctags and awk
types: types.vim
! 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" >> $@
*** ../vim-8.1.0609/src/Make_mvc.mak 2018-12-13 22:17:52.869941530 +0100
--- src/Make_mvc.mak 2018-12-19 21:02:37.846134088 +0100
***************
*** 1270,1277 ****
tags: notags
! $(CTAGS) *.c *.cpp *.h
! if exist auto\if_perl.c $(CTAGS) --append=yes auto\if_perl.c
notags:
- if exist tags del tags
--- 1270,1276 ----
tags: notags
! $(CTAGS) $(TAGS_FILES)
notags:
- if exist tags del tags
*** ../vim-8.1.0609/src/Make_cyg_ming.mak 2018-12-13 22:17:52.869941530 +0100
--- src/Make_cyg_ming.mak 2018-12-19 21:02:28.958194833 +0100
***************
*** 983,993 ****
$(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
!
notags:
-$(DEL) tags
--- 983,989 ----
$(MAKE) -C GvimExt -f Make_ming.mak CROSS=$(CROSS) CROSS_COMPILE=$(CROSS_COMPILE) CXX='$(CXX)' STATIC_STDCPLUS=$(STATIC_STDCPLUS)
tags: notags
! $(CTAGS) $(TAGS_FILES)
notags:
-$(DEL) tags
*** ../vim-8.1.0609/src/version.c 2018-12-19 20:48:43.344066228 +0100
--- src/version.c 2018-12-19 21:04:20.741432814 +0100
***************
*** 801,802 ****
--- 801,804 ----
{ /* Add new patch number below this line */
+ /**/
+ 610,
/**/
--
This planet has -- or rather had -- a problem, which was this: most
of the people living on it were unhappy for pretty much of the time.
Many solutions were suggested for this problem, but most of these
were largely concerned with the movements of small green pieces of
paper, which is odd because on the whole it wasn't the small green
pieces of paper that were unhappy.
-- Douglas Adams, "The Hitchhiker's Guide to the Galaxy"
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|
