mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 18:59:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

[3.6] make tags: index also Modules/_ctypes/ (#4648) (#4659)

Browse source 
* `make tags` fixes (GH-717)

* Fix `make tags` warnings

`make tags` target tries to find C sources and headers in "Grammar" and
"Mac" folders and generates these warnings:

    ctags: Warning: cannot open source file "Grammar/*.[ch]" : No such file or directory
    ctags: Warning: cannot open source file "Mac/*.[ch]" : No such file or directory

This commit changes $SRCDIRS variable in configure.ac to remote these
directories. This variable is used only for tags generation.

Also, "configure" was regenerated with `autoreconf`.

* Fix `make tags` fail on non-default tag names

When ctags overrides default tags filename (e.g. `-f .tags`) `make tags`
is failed because it assumes to see default `tags` filename:

    sort: cannot read: tags: No such file or directory

This commit explicitly specifies "tags" filename for tags generation.

(cherry picked from commit 8a543c0bc7)

* make tags: index also Modules/_ctypes/ (#4648)

Avoid also "cd $(srcdir)" to not change the current directory.

(cherry picked from commit 3be3b97a97)
This commit is contained in:
Victor Stinner 2017-11-30 23:34:21 +01:00 • committed by GitHub
parent 8cd31082fb
commit 29cb50ba34
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Makefile.pre.in
View file

@ -1599,10 +1599,9 @@ autoconf:
# Create a tags file for vi
tags::
cd $(srcdir); \
ctags -w Include/*.h; \
for i in $(SRCDIRS); do ctags -w -a $$i/*.[ch]; \
done; \
ctags -w $(srcdir)/Include/*.h
for i in $(SRCDIRS); do ctags -f tags -w -a $(srcdir)/$$i/*.[ch]; done
ctags -f tags -w -a $(srcdir)/Modules/_ctypes/*.[ch]
LC_ALL=C sort -o tags tags
# Create a tags file for GNU Emacs

2
configure vendored
View file

@ -16553,7 +16553,7 @@ do
done
SRCDIRS="Parser Grammar Objects Python Modules Mac Programs"
SRCDIRS="Parser Objects Python Modules Programs"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for build directories" >&5
$as_echo_n "checking for build directories... " >&6; }
for dir in $SRCDIRS; do

2
configure.ac
View file

@ -5302,7 +5302,7 @@ do
done
AC_SUBST(SRCDIRS)
SRCDIRS="Parser Grammar Objects Python Modules Mac Programs"
SRCDIRS="Parser Objects Python Modules Programs"
AC_MSG_CHECKING(for build directories)
for dir in $SRCDIRS; do
if test ! -d $dir; then