diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-09-01 18:41:26 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-09-01 18:41:26 +0200 |
| commit | 9ac9dfa9e2b20659e5806982f027fa4fd637c3c7 (patch) | |
| tree | 42e48c9bc4c3c62c34c814580beac69c4a15d5b9 | |
| parent | 2c809b7c7d2bb5e4b7fd09c3d312cadecf0c1ff0 (diff) | |
| download | vim-9ac9dfa9e2b20659e5806982f027fa4fd637c3c7.zip | |
patch 8.0.1032: "make tags" doesn't work well on MS-Windows
Problem: "make tags" doesn't work well on MS-Windows.
Solution: Add or fix tags target. (Ken Takata)
| -rw-r--r-- | src/Make_cyg_ming.mak | 10 | ||||
| -rw-r--r-- | src/Make_mvc.mak | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 15 insertions, 2 deletions
diff --git a/src/Make_cyg_ming.mak b/src/Make_cyg_ming.mak index 52db56138..de2c5df52 100644 --- a/src/Make_cyg_ming.mak +++ b/src/Make_cyg_ming.mak @@ -76,6 +76,10 @@ endif # Set to yes to enable terminal support. TERMINAL=no +ifndef CTAGS +# this assumes ctags is Exuberant ctags +CTAGS = ctags -I INIT+ --fields=+S +endif # Link against the shared version of libstdc++ by default. Set # STATIC_STDCPLUS to "yes" to link against static version instead. @@ -885,6 +889,12 @@ xxd/xxd.exe: xxd/xxd.c 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 if_perl.xs + +notags: + -$(DEL) tags + clean: -$(DEL) $(OUTDIR)$(DIRSLASH)*.o -$(DEL) $(OUTDIR)$(DIRSLASH)*.res diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak index c8c1d1173..33d6dcbf2 100644 --- a/src/Make_mvc.mak +++ b/src/Make_mvc.mak @@ -344,7 +344,8 @@ FEATURES = HUGE !endif !ifndef CTAGS -CTAGS = ctags +# this assumes ctags is Exuberant ctags +CTAGS = ctags -I INIT+ --fields=+S !endif !ifndef CSCOPE @@ -1220,7 +1221,7 @@ GvimExt/gvimext.dll: GvimExt/gvimext.cpp GvimExt/gvimext.rc GvimExt/gvimext.h tags: notags - $(CTAGS) *.c *.cpp *.h if_perl.xs proto\*.pro + $(CTAGS) *.c *.cpp *.h if_perl.xs notags: - if exist tags del tags diff --git a/src/version.c b/src/version.c index 4eff42970..beb8ee720 100644 --- a/src/version.c +++ b/src/version.c @@ -770,6 +770,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1032, +/**/ 1031, /**/ 1030, |