Skip to content

Comments

make tags fixes#717

Merged
methane merged 2 commits intopython:masterfrom
dzeban:fix-make-tags
Mar 24, 2017
Merged

make tags fixes#717
methane merged 2 commits intopython:masterfrom
dzeban:fix-make-tags

Conversation

@dzeban
Copy link
Contributor

@dzeban dzeban commented Mar 19, 2017

This PR introduces 2 fixes (in corresponding commits) for make tags:

  1. Fix warnings because of searching for C sources and headers in "Grammar" and "Mac" directories
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
  1. Fix failure when ctags is configured with non-default tags filename (like ".tags").
sort: cannot read: tags: No such file or directory
Makefile:1570: recipe for target 'tags' failed
make: *** [tags] Error 2

@the-knights-who-say-ni
Copy link

the-knights-who-say-ni commented Mar 19, 2017

Hello, and thanks for your contribution!

I'm a bot set up to make sure that the project can legally accept your contribution by verifying you have signed the PSF contributor agreement (CLA).

Unfortunately we couldn't find an account corresponding to your GitHub username on bugs.python.org (b.p.o) to verify you have signed the CLA. This is necessary for legal reasons before we can look at your contribution. Please follow these steps to help rectify the issue:

  1. If you don't have an account on b.p.o, please create one
  2. Make sure your GitHub username is listed in "Your Details" at b.p.o
  3. If you have not already done so, please sign the PSF contributor agreement. The "bugs.python.org username " requested by the form is the "Login name" field under "Your Details".
  4. If you just signed the CLA, please wait at least one US business day and then check "Your Details" on bugs.python.org to see if your account has been marked as having signed the CLA (the delay is due to a person having to manually check your signed CLA)
  5. Reply here saying you have completed the above steps

Thanks again to your contribution and we look forward to looking at it!

@brettcannon
Copy link
Member

brettcannon commented Mar 19, 2017

The Travis failures were probably due to GH-697 which has now been fixed in GH-718. Please rebase your branch to pick up the change.

dzeban added 2 commits March 19, 2017 23:09
@dzeban
Fix make tags warnings
c433bad 
`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`.
@dzeban
Fix make tags fail on non-default tag names
a5b11ae 
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.
@zhangyangyu
Copy link
Member

zhangyangyu commented Mar 20, 2017

Ohh, nice. I am a heavy user of make TAGS and always see the warnings.

@dzeban
Copy link
Contributor Author

dzeban commented Mar 20, 2017

@brettcannon Thanks for pointing - I've rebased it.

@dzeban
Copy link
Contributor Author

dzeban commented Mar 20, 2017

Also, I've signed CLA. @Mariatta, could you, please, verify and change that red CLA label?

@methane methane merged commit 8a543c0 into python:master Mar 24, 2017
@vstinner vstinner mentioned this pull request Apr 28, 2017
Merged
vstinner added a commit that referenced this pull request Apr 28, 2017
@vstinner
Fix "make tags" command (#1337)
5f4056a 
Backport enhancements from master, commits:

* 9c4bfa6: "make tags": remove -t
  option of ctags. The option was kept for backward compatibility,
  but it was completly removed recently. Patch written by Stéphane
  Wirtel.
* cf0ac6a: Fix "make tags": set
  locale to C to call sort
* 8a543c0: `make tags` fixes (GH-717)
vstinner added a commit that referenced this pull request Nov 30, 2017
@vstinner
[3.6] make tags: index also Modules/_ctypes/ (#4648) (#4659)
29cb50b 
* `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 8a543c0)

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

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

(cherry picked from commit 3be3b97)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@methane methane methane approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@dzeban @the-knights-who-say-ni @brettcannon @zhangyangyu @methane @Mariatta